40 Commits

Author SHA1 Message Date
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
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
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
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
13e85738e6 Merge branch 'ticket-9260' 2016-09-05 10:37:24 +02:00
Marion Muszynski
5a8d3eb781 small fix 2016-08-31 15:35:09 +02:00
Marion Muszynski
bb5ff6ba97 fix conflicts 2016-08-31 11:04:16 +02:00
Marion Muszynski
0dde6b5611 fix for old sales 2016-08-30 13:55:47 +02:00
Marion Muszynski
a96b0018c0 upload vp miniature in adminCategory 2016-08-30 13:47:42 +02:00
Marion Muszynski
343fc553aa modif for prod 2016-08-23 15:21:43 +02:00
Rodney Figaro
2a2949882d display informations on sizes in product details 2016-08-23 10:33:48 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
f4f144057d modif date calcul method to include we and check if the last day is a business day 2016-07-25 12:05:57 +02:00
Marion Muszynski
6e14b286c2 update css 2016-07-15 10:21:24 +02:00
Marion Muszynski
02af220b58 showing delivery delay estimation on product tpl 2016-07-13 16:37:00 +02:00
Marion Muszynski
ced379c219 ecotax sentence 2016-06-24 14:34:15 +02:00
Srv Bebeboutik
3b72e67b19 fix from prod 2016-06-24 10:09:27 +02:00
Dylan Travers
1e674c4adf Add 'X item(s) in stock' from ticket n°9890 2016-06-14 10:40:57 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
700c5dc9e0 css modif 2016-06-01 12:51:53 +02:00
Marion Muszynski
71ba5e170a small update 2016-06-01 12:47:48 +02:00
Marion Muszynski
d59e49e3ba update scrollbar color and more 2016-06-01 12:43:12 +02:00
Marion Muszynski
ed9658e97e comment facebook like 2016-05-31 16:33:28 +02:00
Marion Muszynski
183ad376d0 modif for delay flag 2016-05-10 16:13:48 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2033c1e937 update flag position 2016-04-29 16:14:41 +02:00
Marion Muszynski
f4597e397e modif flag expe in product tpl 2016-04-29 16:04:17 +02:00
Marion Muszynski
9f104f2c8f modif tpl product 2016-04-27 16:35:02 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
2217bf5414 modif tpl 2016-04-26 17:01:44 +02:00
Marion Muszynski
e85ce5fb93 modif next for thumb 2016-04-26 16:52:04 +02:00
Marion Muszynski
82a536aa5f modif tpl 2016-04-26 16:43:28 +02:00
Marion Muszynski
5b40878629 modif tpl 2016-04-26 16:39:06 +02:00
Marion Muszynski
cbf6deeb91 begin new product tpl 2016-04-26 16:19:40 +02:00
Srv Bebeboutik
85c9a39043 https on facebook 2016-04-04 11:44:49 +02:00
Srv Bebeboutik
241f738908 updateprod 2016-02-09 10:46:07 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00