Marion Muszynski
241e91c05b
Merge branch 'ticket-11985-MondialRelay_part2' into develop
2017-03-21 16:29:36 +01:00
Marion Muszynski
2233093d7e
Mr fancy box css modif
2017-03-21 16:29:14 +01:00
Marion Muszynski
8084e3cf36
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-09 12:48:53 +01:00
Marion Muszynski
862850afa1
fix facebook link
2017-03-09 12:48:38 +01:00
Marion Muszynski
4823dd518b
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-09 11:07:29 +01:00
Marion Muszynski
52a3477a1e
fix //static
2017-03-09 11:07:11 +01:00
Marion Muszynski
ba2adf4ec8
Merge branch 'ticket-12487-HTTPS' into develop
2017-03-09 11:00:36 +01:00
Marion Muszynski
1bd2edfe4d
other fix getpagelink
2017-03-09 11:00:20 +01:00
Marion Muszynski
17c6ac82b6
fix bugs
2017-03-08 16:11:36 +01:00
Marion Muszynski
2e6e1d23ec
start of changement to full https
2017-03-08 16:10:35 +01:00
Marion Muszynski
8bd907d1bd
Merge branch 'ticket-12591-MarketingModifications' into develop
2017-03-07 13:26:08 +01:00
Marion Muszynski
ee271d98c8
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
2017-03-07 13:25:46 +01:00
Marion Muszynski
a6fe73118a
Merge branch 'ticket-12591-MarketingModifications' into develop
2017-03-03 13:21:23 +01:00
Marion Muszynski
92c5988b96
differentiation of url order
2017-03-03 13:21:08 +01:00
Marion Muszynski
0da43afb39
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
2017-03-01 17:24:04 +01:00
Marion Muszynski
1aca7305b8
addition possibility to up/down or remove from blockcart list
2017-03-01 17:23:45 +01:00
Marion Muszynski
7a956baf2e
addition of sentence in blocktext2
2017-03-01 11:34:40 +01:00
Marion Muszynski
c17728cdfe
Merge branch 'ticket-12563-TrustedBadge'
2017-02-27 16:46:39 +01:00
Marion Muszynski
e016c0057a
fix conflicts
2017-02-27 11:03:20 +01:00
Marion Muszynski
197f48052c
Merge branch 'ticket-12563-TrustedBadge' into develop
2017-02-24 18:08:12 +01:00
Marion Muszynski
456c33e769
fix badge to have comment
2017-02-24 18:07:55 +01:00
Marion Muszynski
cac2e4099a
Merge branch 'ticket-12563-TrustedBadge' into develop
2017-02-24 17:28:35 +01:00
Marion Muszynski
5b5e1933c4
changement position of badge
2017-02-24 14:20:53 +01:00
Marion Muszynski
c4edb90c2b
fix js tooltips in product-list
2017-02-23 15:37:06 +01:00
Marion Muszynski
3f23070f12
fix css tooltip
2017-02-23 15:21:42 +01:00
Marion Muszynski
acb257335d
Merge branch 'ticket-12571-randomProduct' into develop
2017-02-21 11:57:25 +01:00
Marion Muszynski
17633b00f8
add picto in categoryscroll
2017-02-21 11:57:07 +01:00
Marion Muszynski
40596721a0
fix conflicts
2017-02-21 11:51:37 +01:00
Marion Muszynski
2837aea4a5
addition of picto for random product
2017-02-21 11:49:55 +01:00
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
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
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
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
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
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
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
Marion Muszynski
385561fc7c
fix conflcit
2016-10-12 12:42:41 +02:00
Marion Muszynski
2769bf42fd
addition of delivery modifier link
2016-10-11 14:47:30 +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
da8f9e0c1f
Merge branch 'ticket-GAnalytics'
2016-10-10 10:38:46 +02:00
Marion Muszynski
5cf27fac91
adjusting carrier name sent to GA
2016-10-10 10:38:22 +02:00
Marion Muszynski
401db0a5b2
Merge branch 'ticket-GAnalytics'
2016-10-10 10:19:57 +02:00
Marion Muszynski
ba150d8ed9
adjusting payment type sent to GA
2016-10-10 10:19:40 +02:00
Marion Muszynski
46deb152f6
Merge branch 'ticket-GAnalytics'
2016-10-07 15:14:07 +02:00
Marion Muszynski
7fb403426b
Merge branch 'ticket-GAnalytics' into develop
2016-10-07 15:11:45 +02:00
Marion Muszynski
88e42535a7
fix redirect
2016-10-07 15:11:25 +02:00
Marion Muszynski
b50bcf4848
fix conflict
2016-10-07 15:05:20 +02:00
Marion Muszynski
0f666b08fc
fix when ga is blocked
2016-10-07 15:03:45 +02:00
Marion Muszynski
797b0e499f
Merge branch 'ticket-GAnalytics'
2016-10-07 13:57:15 +02:00
Marion Muszynski
2b7ee09f88
fix
2016-10-07 13:57:01 +02:00
Marion Muszynski
46cae17534
fix conflict
2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52
fix name of payment type
2016-10-06 15:58:50 +02:00
Marion Muszynski
31bea61242
fix conflict
2016-10-06 15:29:09 +02:00
Marion Muszynski
973fb9bdf1
Merge branch 'ticket-GAnalytics' into develop
2016-10-06 15:25:44 +02:00
Marion Muszynski
016fbd8353
small fix
2016-10-06 15:25:25 +02:00
Marion Muszynski
79b0ca62cd
fix conflict
2016-10-06 11:56:59 +02:00
Marion Muszynski
4f446ca296
continuation of ant_support and sav
2016-10-06 11:55:13 +02:00
Marion Muszynski
541a0ed663
fix conflict
2016-10-05 11:27:50 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +02:00
Marion Muszynski
5355871476
Merge branch 'ticket-8048' into develop
2016-09-28 14:06:59 +02:00
Rodney Figaro
da5a017c06
add scrolling/slide when products have more than 3 accessories
2016-09-28 12:44:25 +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
Marion Muszynski
6f89c44d2c
prepare tests prod
2016-09-27 10:28:39 +02:00
Marion Muszynski
351a9754b6
Merge branch 'fix-cssAddToCart' into develop
2016-09-26 11:10:36 +02:00
Marion Muszynski
f900950891
adjust rose of add to cart button in add to cart box
2016-09-26 11:10:19 +02:00
Marion Muszynski
eb1a6f66d2
Merge branch 'ticket-8048' into develop
2016-09-23 17:54:17 +02:00
Marion Muszynski
8509789d5e
link to product page in other window"
2016-09-23 17:53:49 +02:00
Marion Muszynski
2db3d0c0e0
Merge branch 'ticket-8048' into develop
2016-09-23 15:10:39 +02:00
Marion Muszynski
035a6d1158
modif css
2016-09-23 15:10:12 +02:00
Marion Muszynski
62c434fd57
Merge branch 'ticket-8048' into develop
2016-09-23 14:56:53 +02:00
Rodney Figaro
155bd6a231
fix when no accessories and no family product
2016-09-23 14:51:52 +02:00
Marion Muszynski
808a5a797b
Merge branch 'ticket-GAnalytics' into develop
2016-09-22 16:50:02 +02:00
Marion Muszynski
4799e10e6a
changement transaction sending
2016-09-22 16:49:39 +02:00
Rodney Figaro
c9ad2799d0
move the similar products block into one tab in product details
...
- fix the number of products displayed in the 'best sales for family' case
- replace the slider by an adapted block with visuals differents from the best sales slider.
- adapt the show cart javascript in order to get the correct height of product blocks on which
the user click
- fix selection between accessories and best sales for family in hooks
- add a hook in order to display the correct label in the new tab
- restore olds methods for best sales product. Routines related to the best sales family products have their own methods.
- fix cache generation
2016-09-22 15:14:39 +02:00
Marion Muszynski
e18f56ae11
Merge branch 'ticket-GAnalytics' into develop
2016-09-21 17:07:03 +02:00
Marion Muszynski
6d8bba532d
fix paybox loader
2016-09-21 17:06:43 +02:00
Marion Muszynski
65a3704d28
Merge branch 'ticket-GAnalytics' into develop
2016-09-21 16:42:12 +02:00
Marion Muszynski
076e581fbc
fix conflict
2016-09-21 16:41:53 +02:00
Marion Muszynski
652c5c2278
add waiting box
2016-09-21 16:40:26 +02:00
Marion Muszynski
74678f3a50
fix
2016-09-21 16:28:57 +02:00
Marion Muszynski
b26fefd0f3
fix conflict
2016-09-21 16:24:32 +02:00
Marion Muszynski
2cde4025ac
add loader for paybox direct payment
2016-09-21 16:21:32 +02:00
Marion Muszynski
338da7eb3f
Merge branch 'ticket-GAnalytics' into develop
2016-09-21 16:09:14 +02:00
Marion Muszynski
3b855c7ad9
ec continuation, addition of addToCart event
2016-09-21 16:08:54 +02:00
Marion Muszynski
8df4bed44a
continuation
2016-09-21 14:29:34 +02:00
Marion Muszynski
9673ff3805
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 18:00:48 +02:00
Marion Muszynski
870331cd10
modification to send checkout process to GA
2016-09-20 18:00:18 +02:00
Marion Muszynski
cbcf90c0ec
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:50:04 +02:00
Marion Muszynski
65f7b71332
fix
2016-09-20 16:49:41 +02:00
Marion Muszynski
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
5cf235d874
addition of code ecommerce
2016-09-20 16:47:05 +02:00
Marion Muszynski
a8086dcfdc
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:55:24 +02:00
Marion Muszynski
85cc7b57dc
showing of comments for braderie on product page
2016-09-20 14:55:03 +02:00
Marion Muszynski
ed769a1749
start of ticket GA Enhanced Ecommerce
2016-09-19 18:47:37 +02:00
Marion Muszynski
5aac7f617b
Merge branch 'ticket-8048' into develop
2016-09-19 12:42:21 +02:00
Marion Muszynski
322e3d2729
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:12:56 +02:00
Marion Muszynski
95e044a365
adjusting css
2016-09-15 13:12:38 +02:00
Marion Muszynski
5a9c94e694
Merge branch 'ticket-payboxAgreement' into develop
2016-09-15 13:02:36 +02:00
Marion Muszynski
b83d7b994c
modification in paymentinfo tpl
2016-09-15 13:01:20 +02:00
Marion Muszynski
3e16557de0
Merge branch 'ticket-10883' into develop
2016-09-14 11:04:01 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +02:00
Marion Muszynski
e05ee41c73
Merge branch 'fix-css' into develop
2016-09-12 15:40:41 +02:00
Marion Muszynski
4581e8d20e
fix width of ps description
2016-09-12 15:40:23 +02:00
Marion Muszynski
eb5495cf15
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 14:37:52 +02:00
Marion Muszynski
fca308f3ae
modif css
2016-09-09 14:37:32 +02:00
Marion Muszynski
9e8c06d808
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:14:15 +02:00
Marion Muszynski
1b444a773f
css modif
2016-09-09 13:13:57 +02:00
Marion Muszynski
410ddb43b1
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:10:00 +02:00
Marion Muszynski
3d325dbc7c
small modif
2016-09-09 13:09:43 +02:00
Marion Muszynski
3c7e15e2c3
Merge branch 'ticket-payboxAgreement' into develop
2016-09-09 13:07:18 +02:00
Marion Muszynski
8074d6f063
modif css manage payments
2016-09-09 13:07:01 +02:00
Marion Muszynski
cb3b1de22c
fix to not escape html on vp description
2016-09-09 11:35:36 +02:00
Rodney Figaro
4ac6c52ec4
fix accessories missing after uninstalling the module
2016-09-08 13:24:49 +02:00
Rodney Figaro
9ecf2491c6
add module 'privatesales_similarproduct'
...
In product detail page :
- show slider with product associated accessories if any, above the best selling products slider
- show product's family best selling instead of the accessories, if any
- show no slider if no accessories nor family best selling present
Cache slider templates for :
- associated accessories for each product for every language, if any
- family best selling for each family of the product for every language, if any
Fixes in javascript :
- missing globals variables in module expresscart would the express cart fail when out of stock
- change the express cart displaying when clicking on the cart icon in any footer sliders.
Css :
duplicate all css styles 'best-sellers_block_product' in 'privatesales_similarproduct' so that the latter slider can be adapted if required.
2016-09-08 13:04:14 +02:00
Marion Muszynski
40457d1935
Merge branch 'ticket-10296' into develop
2016-09-07 08:58:24 +02:00
Marion Muszynski
b6dc54c290
addition html2text for emarsys and vp description
2016-09-05 15:45:05 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
c9bdecd1d4
Merge branch 'ticket-9260' into develop
2016-08-31 15:35:29 +02:00
Marion Muszynski
5a8d3eb781
small fix
2016-08-31 15:35:09 +02:00
Marion Muszynski
b677946ca7
Merge branch 'ticket-10527'
2016-08-31 15:18:42 +02:00
Marion Muszynski
0221ccb2e7
Merge branch 'ticket-10527' into develop
2016-08-31 15:17:41 +02:00
Marion Muszynski
144733299c
up reassurance sentence at first place
2016-08-31 15:17:21 +02:00
Marion Muszynski
b809ee0c26
Merge branch 'fix-9890' into develop
2016-08-31 15:03:31 +02:00
Marion Muszynski
6ff4e35f7b
fix css
2016-08-31 15:03:11 +02:00
Marion Muszynski
72a0d2d3d7
Merge branch 'ticket-10527' into develop
2016-08-31 14:57:19 +02:00
