Marion Muszynski
31bea61242
fix conflict
2016-10-06 15:29:09 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +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
ed769a1749
start of ticket GA Enhanced Ecommerce
2016-09-19 18:47:37 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +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
2d10e1b167
Merge branch 'ticket-9260'
2016-09-05 16:52:19 +02:00
Marion Muszynski
50e0bc4c79
modification to find the right category thumb in productController
2016-09-05 16:22:28 +02:00
Marion Muszynski
17eda01760
modif for children cat
2016-09-05 11:57:43 +02:00
Marion Muszynski
13e85738e6
Merge branch 'ticket-9260'
2016-09-05 10:37:24 +02:00
Marion Muszynski
3d685e10b4
fix addition
2016-09-05 10:24:21 +02:00
Marion Muszynski
0c7aefe613
fix to get sub cat thumb
2016-08-31 12:41:07 +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
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
Marion Muszynski
2ab551f44a
fix conflict
2016-07-27 16:31:59 +02:00
Marion Muszynski
8ca7d2b05b
standardization date estimation
2016-07-25 12:48:21 +02:00
Marion Muszynski
e69073572e
modif date
2016-07-25 12:19:36 +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
a6ec43bb68
showing estimation delivery date in cart
2016-07-13 17:40:13 +02:00
Marion Muszynski
02af220b58
showing delivery delay estimation on product tpl
2016-07-13 16:37:00 +02:00
Marion Muszynski
760bd50c06
adding sentence according delivery delay
2016-06-29 15:52:03 +02:00
Marion Muszynski
20896d3bbf
adding popup error for mobile
2016-06-29 09:59:03 +02:00
Marion Muszynski
8a0b80e15e
pop error cart
2016-06-28 14:45:48 +02:00
Marion Muszynski
77b9c22014
fix conflicts
2016-06-22 15:03:36 +02:00
Srv Bebeboutik
e7e7f8381c
push prod modif carrier
2016-06-20 10:42:30 +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
332ac320fb
modif for prod
2016-06-02 12:19:24 +02:00
Marion Muszynski
d59e49e3ba
update scrollbar color and more
2016-06-01 12:43:12 +02:00
Marion Muszynski
3e0ad8592d
update link
2016-06-01 11:23:37 +02:00
Marion Muszynski
96ca86fe85
modif error message
2016-06-01 10:57:31 +02:00
Marion Muszynski
d63a2d7d5a
addind field to config if delivery of sale is enabled only in fr
2016-05-30 15:42:20 +02:00
Marion Muszynski
eb441d8edf
adding autocomplete postcode
2016-05-19 13:13:47 +02:00
Marion Muszynski
97ef053f1f
update for prod
2016-05-18 10:33:23 +02:00
Marion Muszynski
796b0af17c
modif for update socol address in BO order
2016-05-18 10:30:17 +02:00
Marion Muszynski
adbe272c7b
modif for prod
2016-05-17 16:05:20 +02:00
Marion Muszynski
b7f247729f
modif tpl carrier et css
2016-05-17 15:56:27 +02:00
Marion Muszynski
d571de9d0a
modif for prod
2016-05-17 14:32:35 +02:00
Marion Muszynski
30410a5fc8
supp des fdp fix pour vente consommable
2016-05-17 14:31:41 +02:00
Marion Muszynski
dbb4656f42
adapte carrier for prod
2016-05-13 14:36:51 +02:00
Marion Muszynski
acc8ded407
adapte carrier for dev
2016-05-13 14:19:35 +02:00
Marion Muszynski
7e7feb5a52
ajust css and opti restrict addresses
2016-05-13 13:31:50 +02:00
Marion Muszynski
ffbb3232b9
modif soflex
2016-05-09 17:43:57 +02:00
Marion Muszynski
21f1ada2d1
Merge branch 'ticket-landingpage'
2016-04-20 15:35:16 +02:00
Marion Muszynski
0b0ebcb26f
fix conflict consommables
2016-04-12 15:17:45 +02:00
Marion Muszynski
1d26459616
update landing page for connect button
2016-04-08 15:31:40 +02:00
Marion Muszynski
ba8fa44d2f
fix hook
2016-03-29 17:20:28 +02:00
Marion Muszynski
b763543244
adding ant_alert module
2016-03-29 17:01:26 +02:00
Marion Muszynski
6feaf9ff28
test carrier cost
2016-03-18 15:57:22 +01:00
