Marion Muszynski
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|
Marion Muszynski
|
5159283a8a
|
making order choice required
|
2017-02-07 16:34:03 +01:00 |
|
Marion Muszynski
|
1c36dc6731
|
fix conflicts
|
2017-01-24 12:35:45 +01:00 |
|
Marion Muszynski
|
9fe2c90d1c
|
revert changement
|
2017-01-24 12:34:44 +01:00 |
|
Marion Muszynski
|
e02f19c21b
|
fix conflict
|
2017-01-24 11:30:02 +01:00 |
|
Marion Muszynski
|
4eaa76f76a
|
hide relay select for widget socol
|
2017-01-24 11:27:47 +01:00 |
|
Marion Muszynski
|
63a0b72670
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 15:11:06 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
eaf807cff3
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 11:28:51 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +01:00 |
|
Marion Muszynski
|
1bd6618395
|
Merge branch 'ticket-12204-ImportEan' into develop
|
2017-01-17 13:25:53 +01:00 |
|
Marion Muszynski
|
217c96b383
|
fix css 2
|
2017-01-13 12:47:30 +01:00 |
|
Marion Muszynski
|
17bf597781
|
fix css
|
2017-01-13 12:42:49 +01:00 |
|
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
|
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
|
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 |
|