Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
5192561bac
|
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
|
2017-01-11 15:33:44 +01:00 |
|
Marion Muszynski
|
dce506d50b
|
Merge branch 'ticket-12199-PopupAddToCart' into develop
|
2017-01-09 11:11:23 +01:00 |
|
Marion Muszynski
|
92bb810bb7
|
fix top again
|
2017-01-09 11:11:05 +01:00 |
|
Marion Muszynski
|
f62b3b6993
|
Merge branch 'ticket-12199-PopupAddToCart' into develop
|
2017-01-09 10:44:30 +01:00 |
|
Marion Muszynski
|
13f86ed0f5
|
fix top of add to cart popup
|
2017-01-09 10:44:12 +01:00 |
|
Marion Muszynski
|
4f3b7c2b15
|
Merge branch 'ticket-12122-ModifNewStatus' into develop
|
2016-12-23 14:00:01 +01:00 |
|
Marion Muszynski
|
9d79455930
|
fix trad
|
2016-12-21 12:50:35 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
f26aaab52b
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 12:07:40 +01:00 |
|
Marion Muszynski
|
655a7515d7
|
remove other personal datas
|
2016-12-06 12:07:23 +01:00 |
|
Marion Muszynski
|
908f81cea3
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 11:53:59 +01:00 |
|
Marion Muszynski
|
a509d4f0ab
|
remove personal data in ga module
|
2016-12-06 11:53:34 +01:00 |
|
Marion Muszynski
|
4164ff25fb
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 11:49:19 +01:00 |
|
Marion Muszynski
|
22d5994ee4
|
remove console log
|
2016-12-06 11:48:56 +01:00 |
|
Marion Muszynski
|
e43c69b94b
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 11:22:42 +01:00 |
|
Marion Muszynski
|
82fdce66ce
|
remove personal data from url before sending to GA
|
2016-12-06 11:22:25 +01:00 |
|
Marion Muszynski
|
f7882c7c7f
|
Merge branch 'ticket-11902-AddTagManager' into develop
|
2016-11-30 14:16:04 +01:00 |
|
Marion Muszynski
|
d3564a0a5e
|
addition of goggle tag manager code
|
2016-11-30 14:15:48 +01:00 |
|
Marion Muszynski
|
b8e6780110
|
Merge branch 'ticket-11784-QtyInShoppingCart' into develop
|
2016-11-28 12:02:59 +01:00 |
|
Marion Muszynski
|
51e0ed8589
|
fix bug update product quantity in cart
|
2016-11-28 12:02:39 +01:00 |
|
Marion Muszynski
|
19b28d1e13
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:56:48 +01:00 |
|
Marion Muszynski
|
420f2d870c
|
fix trad
|
2016-11-25 10:56:23 +01:00 |
|
Marion Muszynski
|
fb7a9616ff
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:53:08 +01:00 |
|
Marion Muszynski
|
5d963638fa
|
fix
|
2016-11-25 10:52:50 +01:00 |
|
Marion Muszynski
|
3a630a0d93
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:49:27 +01:00 |
|
Marion Muszynski
|
0e6992f29b
|
changement delivery date estimation
|
2016-11-25 10:49:10 +01:00 |
|
Marion Muszynski
|
7295412f54
|
Merge branch 'ticket-10657-SentenceBoxAddToCart' into develop
|
2016-11-24 12:14:06 +01:00 |
|
Marion Muszynski
|
ef27ddd7af
|
changement sentences according delivery delay
|
2016-11-24 11:59:20 +01:00 |
|
Marion Muszynski
|
40960bf54e
|
Merge branch 'fix-AideContact' into develop
|
2016-11-15 10:29:12 +01:00 |
|
Marion Muszynski
|
684d096c48
|
modif css and redirection to the good form
|
2016-11-15 10:28:52 +01:00 |
|
Marion Muszynski
|
2645434803
|
openning to customers
|
2016-11-14 14:38:23 +01:00 |
|
Marion Muszynski
|
e996d5fcf6
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:43:51 +01:00 |
|
Marion Muszynski
|
57c1043e3a
|
small fix
|
2016-11-07 15:43:36 +01:00 |
|
Marion Muszynski
|
9b4f712659
|
Merge branch 'ticket-11513-newDelay' into develop
|
2016-11-07 15:42:14 +01:00 |
|
Marion Muszynski
|
962fac493e
|
fixin product tpl
|
2016-11-07 15:41:52 +01:00 |
|
Marion Muszynski
|
853ae921ec
|
fix conflict
|
2016-11-07 15:30:22 +01:00 |
|
Marion Muszynski
|
ef7467f787
|
addition of a new delay for xmas
|
2016-11-07 15:28:43 +01:00 |
|
Marion Muszynski
|
10c666cc1b
|
Merge branch 'ticket-ChangeDeliveryAddress'
|
2016-11-07 10:59:02 +01:00 |
|
Marion Muszynski
|
3946f6ceac
|
fix conflict
|
2016-11-02 12:43:27 +01:00 |
|
Marion Muszynski
|
ede0f691a8
|
fix conflicts
|
2016-11-02 12:11:44 +01:00 |
|
Marion Muszynski
|
4ad4ae47bc
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-24 18:34:13 +02:00 |
|
Marion Muszynski
|
cb3e299efc
|
addition of multi product choice
|
2016-10-24 18:33:51 +02:00 |
|
Marion Muszynski
|
179771c5df
|
Merge branch 'fix-paypal' into develop
|
2016-10-18 13:02:52 +02:00 |
|
Marion Muszynski
|
5f8d23c3b1
|
open save paypal
|
2016-10-18 13:02:35 +02:00 |
|
Marion Muszynski
|
1f5d683f4b
|
fix conflict
|
2016-10-18 12:58:26 +02:00 |
|
Marion Muszynski
|
1abe8d0fbd
|
hide paypal billing
|
2016-10-17 17:37:23 +02:00 |
|
Marion Muszynski
|
72a789159a
|
Merge branch 'ticket-ChangeDeliveryAddress' into develop
|
2016-10-13 15:53:46 +02:00 |
|
Marion Muszynski
|
e8bb0d7eac
|
css addition and fixes
|
2016-10-13 15:53:23 +02:00 |
|