Commit Graph

69 Commits

Author SHA1 Message Date
mDeflotte
21ed1ef008 // Fix bug with gift products and multishipping 2012-05-21 17:31:43 +00:00
dMetzger
7d21b72d65 // Norm 2012-05-21 17:09:21 +00:00
dMetzger
1a420b5b4e [-] FO : wrong calcul of the free shipping in multi-shipping 2012-05-21 17:08:16 +00:00
dMetzger
712b2d0a6d // Code cleaning and small fixes 2012-05-21 15:17:21 +00:00
dMetzger
fa1b31698c // variable misnamed 2012-05-21 14:28:34 +00:00
dMetzger
c75f93d63e [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue() 2012-05-21 14:19:54 +00:00
dMetzger
442c27830d [-] FO : fixed a great part of the cart rules with multi-shipping 2012-05-21 13:15:15 +00:00
dMetzger
d6a120cfc0 [*] FO : cart summary is adapted to cart rules with a special "friendly" display 2012-05-19 13:26:21 +00:00
dMetzger
3fa704538b // Cart rule autoadd fixed 2012-05-19 12:03:13 +00:00
fBrignoli
79b2993a8a [*] PDF : Cart rules are now displayed as a "product line" 2012-05-11 09:17:54 +00:00
dMetzger
d9b0c80fa4 // Replaced array_uintersect by a custom function 2012-05-10 09:09:03 +00:00
dMetzger
efe152b26c // Debug 2012-05-09 13:28:26 +00:00
fBrignoli
a9cd86b808 [-] FO : Invalid voucher name 2012-05-09 08:41:26 +00:00
dMetzger
87cb20570d [-] FO : cart rules did not use specific prices in the calculations #PSCFV-702 2012-05-02 13:01:02 +00:00
mDeflotte
da3dedaf75 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart 2012-04-19 09:39:14 +00:00
dMetzger
c109e53f8a [-] FO : fixed bug where you couldn't get a free product with a cart rule if you already had the same product in your cart #PSTEST-1063 2012-04-12 09:31:53 +00:00
dMetzger
b11d832d84 [-] FO : fixed infinite loop in free shipping cart rule #PSTEST-1138 2012-04-10 16:57:50 +00:00
bMancone
c4bb0c2a14 // Fixed #PSTEST-953 2012-03-29 14:27:34 +00:00
rGaillard
3be00c8e6f // Fix backOffice order cart rules management 2012-03-15 14:42:57 +00:00
dMetzger
e9c3b1f7d4 [-] FO : customer discounts page fixed with cart rules 2012-03-14 14:59:08 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
d14913d8e6 // Normalize 2012-03-09 09:19:30 +00:00
dMetzger
46d18352b2 // Temp fix for cart rule and multi-shipping - not fully functionnal yet but still better than before 2012-03-01 09:45:39 +00:00
mDeflotte
0b2468b6f4 // Normalization: replacing spaces by tabulations 2012-02-27 15:43:43 +00:00
dMetzger
4200ad049f [-] FO : automatic refresh of the cart when a cart rule is added 2012-02-23 18:24:23 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
dMetzger
29975dbeed [-] FO : cart rule fix (product restrictions mixing attributes and other criteria) 2012-02-23 15:54:05 +00:00
dMetzger
839db43450 [*] BO : you can now choose the combination of the free product of a cart rule
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)
2012-02-20 17:04:41 +00:00
dMetzger
156fe371bb [-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715 2012-02-13 17:47:40 +00:00
fBrignoli
1e82f49c7f // norm 2012-02-08 15:34:20 +00:00
dMetzger
824e2d5070 [-] BO : cart rule with attributes filter and reduction on the selection of products fixed 2012-02-06 17:00:47 +00:00
dMetzger
01a39d9996 // Fixed small bug which occured when you refreshed a reduction on a selection of product on an order that did not match the selection anymore 2012-02-06 16:29:47 +00:00
dMetzger
1fdc93166e [*] BO : reduction on a selection of products finalized 2012-02-06 16:26:49 +00:00
dMetzger
2afdad6597 [*] BO : shop restriction added to the cart rules 2012-02-06 14:57:39 +00:00
dMetzger
7cf888cff8 [-] BO : wrong error message was displayed on cart rules deletion PSTEST-644 2012-02-03 16:17:02 +00:00
fBrignoli
4c97888a66 // norm 2012-02-01 15:56:39 +00:00
fBrignoli
f50513227f // code review 2012-02-01 15:54:57 +00:00
dMetzger
84ab7f1fc3 [-] BO : partial use fixed for cart rules 2012-01-27 15:56:57 +00:00
dMetzger
153cb616bc [-] FO : uncombinable cart rules are not combinable anymore 2012-01-26 15:17:23 +00:00
dMetzger
18a040a30a [-] BO : voucher creation in the order detail fixed 2012-01-26 14:34:58 +00:00
dMetzger
126ea0267a [*] BO : new dimension added to the product filter in the cart rules 2012-01-26 13:30:16 +00:00
rMalie
ccbf3acc8d // Normalize 2012-01-25 14:40:12 +00:00
mDeflotte
370bccfb3a // Fixing bug in the cartrule 2012-01-09 15:27:09 +00:00
vSchoener
f9bf0deba4 [-] Fix Bug #PSTEST-148 for any Divide operation when a variable is equal to 0 2011-12-22 20:58:01 +00:00
mDeflotte
d993fba6a0 // Replacing some "4 spaces" by a unique tabulation 2011-12-22 12:43:31 +00:00
rMalie
63e7c275f1 // Improve collections : where() method reworked (prototype changed) + validation of fields 2011-12-19 16:57:28 +00:00
aFolletete
0ee826d901 // clean code 2011-12-17 16:53:50 +00:00
mDeflotte
0342aa3b7a // BugFix : Adding some backquote to protect SQL reserved word 2011-12-16 09:57:03 +00:00
rMalie
8fa5ffc681 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead 2011-12-15 13:24:03 +00:00
rMalie
c18e998ede // Format definitions 2011-12-12 21:06:59 +00:00