Marion Muszynski
|
53c3eb2a12
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:49:56 +02:00 |
|
Marion Muszynski
|
9fabb9b7af
|
fix
|
2016-07-27 17:49:29 +02:00 |
|
Marion Muszynski
|
c21b4b906c
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:46:04 +02:00 |
|
Marion Muszynski
|
d2452448fc
|
fix label in config module
|
2016-07-27 17:45:44 +02:00 |
|
Marion Muszynski
|
2210cf508e
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:43:09 +02:00 |
|
Marion Muszynski
|
fbd9dafcac
|
modif url product
|
2016-07-27 17:42:44 +02:00 |
|
Marion Muszynski
|
90b790bcab
|
Merge branch 'ticket-criteo' into develop
|
2016-07-25 16:40:58 +02:00 |
|
Marion Muszynski
|
fe32da2f12
|
add module criteo_bbb
|
2016-07-25 16:40:22 +02:00 |
|
Marion Muszynski
|
02f21d3b21
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 14:31:54 +02:00 |
|
Marion Muszynski
|
1694bf54d1
|
standardization date estimation part 2
|
2016-07-25 14:31:22 +02:00 |
|
Marion Muszynski
|
2b47a5c932
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:48:41 +02:00 |
|
Marion Muszynski
|
8ca7d2b05b
|
standardization date estimation
|
2016-07-25 12:48:21 +02:00 |
|
Marion Muszynski
|
2ca8f150ca
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 12:23:11 +02:00 |
|
Marion Muszynski
|
bb0cd59d0b
|
adjusting date delivery
|
2016-07-25 12:22:50 +02:00 |
|
Marion Muszynski
|
0ccf7667a6
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-25 12:20:03 +02:00 |
|
Marion Muszynski
|
e69073572e
|
modif date
|
2016-07-25 12:19:36 +02:00 |
|
Marion Muszynski
|
c809342939
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:06:23 +02:00 |
|
Marion Muszynski
|
f4f144057d
|
modif date calcul method to include we and check if the last day is a business day
|
2016-07-25 12:05:57 +02:00 |
|
Marion Muszynski
|
50ddbe95b3
|
comment date estimation, waiting for good calcul method
|
2016-07-25 11:23:29 +02:00 |
|
Marion Muszynski
|
f1769755de
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 11:18:16 +02:00 |
|
Marion Muszynski
|
dd6a758e32
|
modif css
|
2016-07-25 11:17:40 +02:00 |
|
Marion Muszynski
|
1c1485e4d7
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 10:52:06 +02:00 |
|
Marion Muszynski
|
b1ecd00e3e
|
modif for delivery delay
|
2016-07-25 10:51:39 +02:00 |
|
Marion Muszynski
|
a7fdab4e49
|
Merge branch 'ticket-cartValidate' into develop
|
2016-07-21 17:29:40 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
97aa768b07
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 12:58:48 +02:00 |
|
Marion Muszynski
|
5881036918
|
fix
|
2016-07-18 12:58:22 +02:00 |
|
Marion Muszynski
|
a65cb5e4d9
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 12:47:23 +02:00 |
|
Marion Muszynski
|
3eea78480e
|
fixes
|
2016-07-18 12:46:58 +02:00 |
|
Marion Muszynski
|
4fd07ebcd3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 12:12:50 +02:00 |
|
Marion Muszynski
|
46581396ce
|
savecb
|
2016-07-18 12:12:26 +02:00 |
|
Marion Muszynski
|
6c66cfa9d0
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:53:59 +02:00 |
|
Marion Muszynski
|
0b5cb21977
|
small fix
|
2016-07-18 11:53:37 +02:00 |
|
Marion Muszynski
|
a2e67137bf
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:45:49 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Marion Muszynski
|
21f6251aa3
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-15 17:57:12 +02:00 |
|
Marion Muszynski
|
5ae34ea5ab
|
fix
|
2016-07-15 17:56:41 +02:00 |
|
Marion Muszynski
|
354e020c68
|
fix conflict
|
2016-07-15 17:50:32 +02:00 |
|
Marion Muszynski
|
5dbd39aadd
|
first commit to save paybox cards
|
2016-07-15 17:49:13 +02:00 |
|
Marion Muszynski
|
b2658bb5db
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-15 12:50:02 +02:00 |
|
Marion Muszynski
|
5994e715e1
|
fix
|
2016-07-15 12:49:39 +02:00 |
|
Marion Muszynski
|
a21a7bbc0e
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-15 12:28:47 +02:00 |
|
Marion Muszynski
|
b8a4934278
|
adding delivery date estimation
|
2016-07-15 12:26:58 +02:00 |
|
Marion Muszynski
|
205a9c0aa2
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-15 10:33:34 +02:00 |
|
Marion Muszynski
|
e07186fe27
|
modif css
|
2016-07-15 10:32:16 +02:00 |
|
Marion Muszynski
|
ba60aeacb9
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-15 10:21:51 +02:00 |
|
Marion Muszynski
|
6e14b286c2
|
update css
|
2016-07-15 10:21:24 +02:00 |
|
Marion Muszynski
|
64a8296a57
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-13 17:41:53 +02:00 |
|
Marion Muszynski
|
a6ec43bb68
|
showing estimation delivery date in cart
|
2016-07-13 17:40:13 +02:00 |
|
Marion Muszynski
|
7fe43c37b0
|
fix conflict
|
2016-07-13 16:38:47 +02:00 |
|