Marion Muszynski
6e48dd3722
Merge branch 'ticket-10393' into develop
2017-01-10 11:22:30 +01:00
Marion Muszynski
1146df59c8
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
2017-01-09 12:04:13 +01:00
Marion Muszynski
a29a54f41e
addition of new discount of 5 for missing product
2017-01-09 12:03:58 +01:00
Marion Muszynski
f62b3b6993
Merge branch 'ticket-12199-PopupAddToCart' into develop
2017-01-09 10:44:30 +01:00
Marion Muszynski
228798b4e1
upgrade limit max char for order messages
2017-01-09 10:16:10 +01:00
Marion Muszynski
d148fffa70
Merge branch 'ticket-11201-SlowCategoryCreation'
2016-12-26 11:43:23 +01:00
Marion Muszynski
a965103db4
continuing changement
2016-12-23 13:04:16 +01:00
Marion Muszynski
9a9d363b87
Merge branch 'ticket-11208-FactureCadeau' into develop
2016-12-21 12:24:48 +01:00
Marion Muszynski
2b30de1cce
changement, deletion of pdf overrided
2016-12-21 12:24:31 +01:00
Marion Muszynski
79a1d1ec71
Merge branch 'ticket-11201-SlowCategoryCreation' into develop
2016-12-15 17:12:09 +01:00
Marion Muszynski
9500f86e9d
changement
2016-12-15 11:47:40 +01:00
Marion Muszynski
3756a2d4b7
modification regenerateTree to limit to active categories
2016-12-14 18:12:08 +01:00
Marion Muszynski
715db47da4
add manually generation of ntree
2016-12-14 10:28:03 +01:00
Marion Muszynski
a4752145fa
fix conflicts
2016-12-07 14:36:59 +01:00
Marion Muszynski
192cd79a6b
continuing packs
2016-12-02 15:34:57 +01:00
Marion Muszynski
8c087ed509
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-28 11:02:22 +01:00
Marion Muszynski
f773e845aa
addition of pack id in cart quantities to check pack availability
2016-11-28 11:01:38 +01:00
Marion Muszynski
73f0233a89
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 13:05:14 +01:00
Marion Muszynski
bed6cbcd76
fix missing var
2016-11-23 13:04:37 +01:00
Marion Muszynski
6f2b7f8732
Merge branch 'ticket-10657-PhileaPacks' into develop
2016-11-23 12:57:51 +01:00
Marion Muszynski
5578bac1ae
addition for packs management
2016-11-23 12:57:33 +01:00
Marion Muszynski
fce88331a3
fix conflict
2016-11-16 15:55:07 +01:00
Marion Muszynski
31ea35e160
selection only a specific category_family
2016-11-16 15:50:39 +01:00
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
a80ce2855a
fix when sale is in multi families
2016-10-14 16:31:09 +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
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
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
58d2b92b0c
continuing braderie upgrade
2016-09-20 14:49:02 +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
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
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
Rodney Figaro
4808607e56
add purchase guide module - backoffice only
2016-08-30 18:10:44 +02:00
Rodney Figaro
69f6d0dcd0
add column ecotax if any in the PDF invoices
2016-08-23 17:37:35 +02:00
Marion Muszynski
30b39b5776
fix conflicts
2016-06-08 10:53:07 +02:00
Marion Muszynski
7ad38029da
adding filter
2016-06-06 17:27:09 +02:00
Marion Muszynski
b332800b77
new fields in product db
2016-06-06 14:35:07 +02:00
Srv Bebeboutik
7085c1b80a
update from prod
2016-06-06 12:35:00 +02:00
Marion Muszynski
72545630a3
fix conflicts
2016-06-06 11:32:25 +02:00
