186 Commits

Author SHA1 Message Date
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
b5f2e365ad fix conflicts 2016-12-12 16:09:07 +01:00
Marion Muszynski
809cc513a4 addition of delivery info in product tpl mobile version 2016-12-12 15:45:59 +01:00
Marion Muszynski
8c5dec2293 beginning 2016-12-09 15:26:22 +01:00
Marion Muszynski
ee8cd5807a remove background of vp logo in product tpl 2016-12-07 15:39:03 +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
2c3293199c Merge branch 'fix-fatal-mobile' into develop 2016-11-28 10:05:59 +01:00
Marion Muszynski
cfdab3cc09 error cause of id_product for product_id 2016-11-25 18:50:38 +01:00
Marion Muszynski
ddad6db847 fix tpl order-detail 2016-11-25 18:45:07 +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
94cbb73027 Merge branch 'fix-AideContact' into develop 2016-11-15 11:49:19 +01:00
Marion Muszynski
4f9add049e addition redirect to all forms 2016-11-15 11:48:52 +01:00
Marion Muszynski
a839bafd66 addition of redirection to the good form 2016-11-15 10:43:45 +01:00
Marion Muszynski
40497ffb14 fix conflict 2016-11-14 14:20:50 +01:00
Marion Muszynski
a5629eb2c7 adjusting mobile version 2016-11-14 14:19:28 +01:00
Marion Muszynski
04b5314a96 change logo width on mobile version 2016-11-10 12:30:51 +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
c7579d79aa Merge branch 'ticket-GAnalytics-mobile' into develop 2016-10-19 16:23:35 +02:00
Marion Muszynski
ab39335846 integration of enhanced ecommerce on mobile version 2016-10-19 16:23:01 +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
8729c7a6aa fix conflict 2016-10-11 11:49:33 +02:00
Marion Muszynski
1ff084929e fix conflict 2016-10-11 11:41:40 +02:00
Marion Muszynski
a93a5b14f2 modif css 2016-10-11 11:40:18 +02:00
Marion Muszynski
541a0ed663 fix conflict 2016-10-05 11:27:50 +02:00
Marion Muszynski
6ec5d67fa3 fix conflict 2016-09-28 11:50:08 +02:00
Marion Muszynski
5fb300b503 modif css 2016-09-28 11:47:25 +02:00
Marion Muszynski
2f21284be4 fix conflict 2016-09-27 10:34:47 +02:00