Marion Muszynski
3894ee9acd
Merge branch 'ticket-12487-HTTPS3'
2017-04-24 15:21:42 +02:00
Marion Muszynski
d3a23e7f90
add str replace for img in descriptions
2017-04-24 15:20:41 +02:00
Marion Muszynski
90dd61b5bb
add multilang on category img thumbs
2017-04-18 12:48:42 +02:00
Marion Muszynski
8f62586369
fix conflict
2017-04-11 12:08:19 +02:00
Marion Muszynski
2837aea4a5
addition of picto for random product
2017-02-21 11:49:55 +01:00
Marion Muszynski
842d90ba05
change redirect to home when customer is logged
2017-02-01 12:24:39 +01:00
Marion Muszynski
14582e4e0f
change delay name of socol carriers when its delivered in Belgium
2017-01-27 10:45:48 +01:00
Marion Muszynski
9b2f18c2ef
fix wsu laposte, addition in adminLogistics and ajax for MR
2017-01-12 13:03:48 +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
22b9815c1c
changement ant_configuration to store carrier conf in db Configuration
2017-01-09 15:02:14 +01:00
Marion Muszynski
46e655751d
fix value for prod
2017-01-06 16:47:55 +01:00
Marion Muszynski
cd4aa777d5
value for dev
2017-01-06 16:32:55 +01:00
Marion Muszynski
6cc03d0287
restriction with carrier priority
2017-01-06 16:25:08 +01:00
Marion Muszynski
d329b24250
fix trad 2
2016-12-21 12:53:59 +01:00
Marion Muszynski
a13396baa8
restriction for delivery to ceuta and melina
2016-12-15 12:02:32 +01:00
Marion Muszynski
6964d4fb69
fix
2016-12-02 12:06:52 +01:00
Marion Muszynski
ec7d73696b
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 15:34:34 +01:00
Marion Muszynski
2dceab8015
fix for classic sale
2016-11-21 15:26:46 +01:00
Marion Muszynski
a224bfd940
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 13:01:13 +01:00
Marion Muszynski
c2b5077efe
fix
2016-11-21 12:56:12 +01:00
Marion Muszynski
66bdae1aef
prevent combination of sale exp classic and sale exp before noel
2016-11-21 12:45:20 +01:00
Marion Muszynski
8ec2a6ba21
Merge branch 'ticket-10657-PhileaMulti'
2016-11-21 10:18:38 +01:00
Marion Muszynski
f5a841a2f1
adjust for exp Noel
2016-11-18 17:26:53 +01:00
Marion Muszynski
d9fbfc438a
small fix
2016-11-18 12:24:37 +01:00
Marion Muszynski
4ac4753900
begining of updatings
2016-11-18 09:50:04 +01:00
Marion Muszynski
31ea35e160
selection only a specific category_family
2016-11-16 15:50:39 +01:00
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
