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
Marion Muszynski
6711926ac3
fix conflicts
2016-07-25 15:26:26 +02:00
Marion Muszynski
f1769755de
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-25 11:18:16 +02:00
Marion Muszynski
dd6a758e32
modif css
2016-07-25 11:17:40 +02:00
Marion Muszynski
a2e67137bf
Merge branch 'ticket-payboxAgreement' into develop
2016-07-18 11:45:49 +02:00
Marion Muszynski
fb51c877c4
suite save paybox info
2016-07-18 11:45:18 +02:00
Marion Muszynski
a21a7bbc0e
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-15 12:28:47 +02:00
Marion Muszynski
b8a4934278
adding delivery date estimation
2016-07-15 12:26:58 +02:00
Marion Muszynski
205a9c0aa2
Merge branch 'ticket-deliveryDelay_cart' into develop
2016-07-15 10:33:34 +02:00
Marion Muszynski
e07186fe27
modif css
2016-07-15 10:32:16 +02:00
Marion Muszynski
ba60aeacb9
Merge branch 'ticket-deliveryDelay_product' into develop
2016-07-15 10:21:51 +02:00
Marion Muszynski
6e14b286c2
update css
2016-07-15 10:21:24 +02:00
Marion Muszynski
7fe43c37b0
fix conflict
2016-07-13 16:38:47 +02:00
Marion Muszynski
02af220b58
showing delivery delay estimation on product tpl
2016-07-13 16:37:00 +02:00
Marion Muszynski
370fb8dd18
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:39:52 +02:00
Marion Muszynski
e33d2da73d
adjusting for delivery delay part
2016-07-13 15:35:00 +02:00
Marion Muszynski
951ffd3e4b
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:17:13 +02:00
Marion Muszynski
dee3c2ba2c
ajusting css
2016-07-13 15:16:48 +02:00
Marion Muszynski
98b264471c
Merge branch 'ticket-blockOrderSummary' into develop
2016-07-13 15:10:48 +02:00
Marion Muszynski
67314cbf25
hide bestsellers at payment step
2016-07-13 15:09:33 +02:00
Marion Muszynski
489b94cff5
suite block order summary
2016-07-12 14:50:52 +02:00
Marion Muszynski
281e562edf
Merge branch 'ticket-10377' into develop
2016-07-06 11:18:41 +02:00
