antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,411 Commits 124 Branches 0 Tags
Commit Graph

232 Commits

Author SHA1 Message Date
Marion Muszynski
715db47da4 add manually generation of ntree 2016-12-14 10:28:03 +01:00
Marion Muszynski
f4e2256c65 fix conflicts 2016-12-08 15:46:19 +01:00
Marion Muszynski
192cd79a6b continuing packs 2016-12-02 15:34:57 +01:00
Marion Muszynski
6964d4fb69 fix 2016-12-02 12:06:52 +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
bed6cbcd76 fix missing var 2016-11-23 13:04:37 +01:00
Marion Muszynski
5578bac1ae addition for packs management 2016-11-23 12:57:33 +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
5b95689b06 small updating 2016-11-02 17:03:58 +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
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
ed769a1749 start of ticket GA Enhanced Ecommerce 2016-09-19 18:47:37 +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
Rodney Figaro
4808607e56 add purchase guide module - backoffice only 2016-08-30 18:10:44 +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