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
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
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
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
