Marion Muszynski
fa2db797b8
Merge branch 'ticket-12962-LandingPage' into develop
2017-04-28 11:05:31 +02:00
Marion Muszynski
de1c8e211e
addition of new landing page on home
2017-04-28 11:05:12 +02:00
Marion Muszynski
35e33703b7
fix conflicts
2017-04-13 12:32:44 +02:00
Marion Muszynski
66b25a2e07
remove quantity delete from cart and blockcart
2017-04-13 12:12:46 +02:00
Marion Muszynski
8f62586369
fix conflict
2017-04-11 12:08:19 +02:00
Marion Muszynski
e7d37116b3
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
2017-03-27 12:42:36 +02:00
Marion Muszynski
b390e60aaa
changement img for qty up and down
2017-03-27 12:42:16 +02:00
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
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
e016c0057a
fix conflicts
2017-02-27 11:03:20 +01:00
Marion Muszynski
3f23070f12
fix css tooltip
2017-02-23 15:21:42 +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
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
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
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
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
10c666cc1b
Merge branch 'ticket-ChangeDeliveryAddress'
2016-11-07 10:59:02 +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
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
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
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
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
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
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
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
