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
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
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
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
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
742a8d1ca9
fix conflicts
2016-08-31 13:36:10 +02:00
Marion Muszynski
2dd1baef49
adding reassurance sentences for es
2016-08-31 13:32:59 +02:00
Marion Muszynski
bb5ff6ba97
fix conflicts
2016-08-31 11:04:16 +02:00
Marion Muszynski
93e464c78b
Merge branch 'ticket_9890' into develop
2016-08-26 17:16:42 +02:00
Marion Muszynski
0f85417eaf
modif css
2016-08-26 17:16:18 +02:00
Marion Muszynski
c45e018298
Merge branch 'ticket_9890' into develop
2016-08-26 17:08:53 +02:00
Marion Muszynski
bab94ab68b
fix and modif css
2016-08-26 17:08:28 +02:00
Marion Muszynski
e02097858b
fix css conflicts
2016-08-23 12:31:28 +02:00
Rodney Figaro
2a2949882d
display informations on sizes in product details
2016-08-23 10:33:48 +02:00
Marion Muszynski
8053859bf4
fix
2016-07-29 13:32:38 +02:00
Marion Muszynski
2ab551f44a
fix conflict
2016-07-27 16:31:59 +02:00
