Marion Muszynski
b915ed8649
Merge branch 'ticket-AideContact-SAV' into develop
2016-11-02 17:04:16 +01:00
Marion Muszynski
5b95689b06
small updating
2016-11-02 17:03:58 +01:00
Marion Muszynski
699ceebbf3
Merge branch 'ticket-AssociateProducts' into develop
2016-10-14 16:31:24 +02:00
Marion Muszynski
a80ce2855a
fix when sale is in multi families
2016-10-14 16:31:09 +02:00
Marion Muszynski
31bea61242
fix conflict
2016-10-06 15:29:09 +02:00
Marion Muszynski
6e515c5207
Merge branch 'ticket-AssociateProducts' into develop
2016-10-05 17:51:08 +02:00
Marion Muszynski
6a415ac50f
modif css
2016-10-05 17:50:45 +02:00
Marion Muszynski
e6fdac5dbe
Merge branch 'ticket-8048'
2016-09-28 16:57:04 +02:00
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
73a3127d3e
Merge branch 'ticket-eanUpgrade' into develop
2016-09-22 11:13:52 +02:00
Marion Muszynski
7a8d2c9339
move of comment block
2016-09-22 11:12:49 +02:00
Marion Muszynski
c049980a9a
up lenght reference of product
2016-09-22 11:02:55 +02:00
Marion Muszynski
385af21769
Merge branch 'ticket-GAnalytics' into develop
2016-09-20 16:47:32 +02:00
Marion Muszynski
430cabc449
Merge branch 'ticket-eanUpgrade' into develop
2016-09-20 14:49:30 +02:00
Marion Muszynski
58d2b92b0c
continuing braderie upgrade
2016-09-20 14:49:02 +02:00
Marion Muszynski
ed769a1749
start of ticket GA Enhanced Ecommerce
2016-09-19 18:47:37 +02:00
Marion Muszynski
5aac7f617b
Merge branch 'ticket-8048' into develop
2016-09-19 12:42:21 +02:00
Marion Muszynski
cf18d95f8b
moving of sale export block to privatesale logisitique
2016-09-14 17:42:08 +02:00
Marion Muszynski
2e7ff69817
addition of date to find the good ps in bulkupdate export part
2016-09-14 17:00:01 +02:00
Marion Muszynski
cf3b0cca11
addition of category thumb checking
2016-09-14 11:03:36 +02:00
Rodney Figaro
5baa5eaf9a
fix : get best sale of the same sale family with label in front
2016-09-13 10:48:36 +02:00
Rodney Figaro
ebb136206a
remove unused code
2016-09-13 09:34:18 +02:00
Rodney Figaro
bdd6aadc71
show best sales of same sale family rather than the same category
2016-09-12 18:08:28 +02:00
Rodney Figaro
48daa71f67
fix db fields requested by one method in productsale, fix arguments in methods in module
2016-09-12 12:12:05 +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
c63eb836ad
table addition to load current order state
2016-09-08 11:52:44 +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
11df31d8bd
Merge branch 'ticket_9890'
2016-08-31 11:56:22 +02:00
Marion Muszynski
ff0d7651bf
fix total product attribute quantities
2016-08-31 11:55:14 +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
35deb50531
Merge branch 'ticket-9728'
2016-08-25 13:05:58 +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
Rodney Figaro
69f6d0dcd0
add column ecotax if any in the PDF invoices
2016-08-23 17:37:35 +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
