Commit Graph

60 Commits

Author SHA1 Message Date
fBrignoli
68199f0037 [*] PDF : Cart rules are now displayed as a "product line" 2012-05-11 09:17:54 +00:00
dMetzger
36d969506d // Replaced array_uintersect by a custom function 2012-05-10 09:09:03 +00:00
dMetzger
a945576c0b // Debug 2012-05-09 13:28:26 +00:00
fBrignoli
21fb824367 [-] FO : Invalid voucher name 2012-05-09 08:41:26 +00:00
dMetzger
50b89a63a6 [-] FO : cart rules did not use specific prices in the calculations #PSCFV-702 2012-05-02 13:01:02 +00:00
mDeflotte
0cb73f9e13 [-] 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
e5b665deb7 [-] 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
b510ad3096 [-] FO : fixed infinite loop in free shipping cart rule #PSTEST-1138 2012-04-10 16:57:50 +00:00
bMancone
29eb25facc // Fixed #PSTEST-953 2012-03-29 14:27:34 +00:00
rGaillard
9d758694d4 // Fix backOffice order cart rules management 2012-03-15 14:42:57 +00:00
dMetzger
fec505b178 [-] FO : customer discounts page fixed with cart rules 2012-03-14 14:59:08 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
50a44277db // Normalize 2012-03-09 09:19:30 +00:00
dMetzger
902b0b84ca // 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
bb1ef4b3ed // Normalization: replacing spaces by tabulations 2012-02-27 15:43:43 +00:00
dMetzger
3568be9aa0 [-] FO : automatic refresh of the cart when a cart rule is added 2012-02-23 18:24:23 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
dMetzger
6afc517815 [-] FO : cart rule fix (product restrictions mixing attributes and other criteria) 2012-02-23 15:54:05 +00:00
dMetzger
f01657a576 [*] 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
7279f68e9c [-] 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
5dbafbaedf // norm 2012-02-08 15:34:20 +00:00
dMetzger
f5847d1dbf [-] BO : cart rule with attributes filter and reduction on the selection of products fixed 2012-02-06 17:00:47 +00:00
dMetzger
ce43fd035b // 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
1808add4d8 [*] BO : reduction on a selection of products finalized 2012-02-06 16:26:49 +00:00
dMetzger
dcdc546c93 [*] BO : shop restriction added to the cart rules 2012-02-06 14:57:39 +00:00
dMetzger
277e09ebda [-] BO : wrong error message was displayed on cart rules deletion PSTEST-644 2012-02-03 16:17:02 +00:00
fBrignoli
1e62380355 // norm 2012-02-01 15:56:39 +00:00
fBrignoli
89f732a920 // code review 2012-02-01 15:54:57 +00:00
dMetzger
d1ca2417bf [-] BO : partial use fixed for cart rules 2012-01-27 15:56:57 +00:00
dMetzger
12954750fe [-] FO : uncombinable cart rules are not combinable anymore 2012-01-26 15:17:23 +00:00
dMetzger
96a58849a2 [-] BO : voucher creation in the order detail fixed 2012-01-26 14:34:58 +00:00
dMetzger
817a4e6a6c [*] BO : new dimension added to the product filter in the cart rules 2012-01-26 13:30:16 +00:00
rMalie
b7ba158c07 // Normalize 2012-01-25 14:40:12 +00:00
mDeflotte
acc2985aca // Fixing bug in the cartrule 2012-01-09 15:27:09 +00:00
vSchoener
828b9c0f8a [-] Fix Bug #PSTEST-148 for any Divide operation when a variable is equal to 0 2011-12-22 20:58:01 +00:00
mDeflotte
7de2028f28 // Replacing some "4 spaces" by a unique tabulation 2011-12-22 12:43:31 +00:00
rMalie
b2b678ab3d // Improve collections : where() method reworked (prototype changed) + validation of fields 2011-12-19 16:57:28 +00:00
aFolletete
615b843b07 // clean code 2011-12-17 16:53:50 +00:00
mDeflotte
b4054196f4 // BugFix : Adding some backquote to protect SQL reserved word 2011-12-16 09:57:03 +00:00
rMalie
58d7f37130 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead 2011-12-15 13:24:03 +00:00
rMalie
39b9c7cfa1 // Format definitions 2011-12-12 21:06:59 +00:00
rMalie
1c39ab4685 [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 2011-12-12 18:10:38 +00:00
rMalie
0af197daf3 // Remove $this->table and $this->identifier from objectModels + normalize 2011-12-09 14:05:24 +00:00
rMalie
4266e89a02 // Fix collection in cartRule 2011-12-07 09:11:43 +00:00
rMalie
27b198dcd6 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead. 2011-12-06 15:41:34 +00:00
rMalie
b59ddba454 // Remove $table and $identifier property from all classes, and add static $definition instead 2011-12-05 13:56:03 +00:00
rMalie
53c553fee9 // Fix collections 2011-12-05 09:05:45 +00:00
aFolletete
e1b7cd86af // Comment useless line in order to clean this
// Add table and identifier to CartRule class
2011-12-03 09:56:38 +00:00
rMalie
5259d4e64e // Use Collection instead of HydrateCollection in several places 2011-12-02 15:20:47 +00:00
mDeflotte
0602a2dbdb // Fix some problems with getPackageShippingCost 2011-12-02 10:48:26 +00:00