dMetzger
|
8f6c9671f5
|
// Replaced array_uintersect by a custom function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15150 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-10 09:09:03 +00:00 |
|
dMetzger
|
cdcf54b40e
|
// Debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15102 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-09 13:28:26 +00:00 |
|
fBrignoli
|
5776e365de
|
[-] FO : Invalid voucher name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15087 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-09 08:41:26 +00:00 |
|
dMetzger
|
14896df71e
|
[-] FO : cart rules did not use specific prices in the calculations #PSCFV-702
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14999 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-02 13:01:02 +00:00 |
|
mDeflotte
|
19961a5438
|
[-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-19 09:39:14 +00:00 |
|
dMetzger
|
21e4d3f45a
|
[-] 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
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14597 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-12 09:31:53 +00:00 |
|
dMetzger
|
46ed8664a4
|
[-] FO : fixed infinite loop in free shipping cart rule #PSTEST-1138
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14561 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-04-10 16:57:50 +00:00 |
|
bMancone
|
564d9e2183
|
// Fixed #PSTEST-953
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14363 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-29 14:27:34 +00:00 |
|
rGaillard
|
82e0beb63d
|
// Fix backOffice order cart rules management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14201 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-15 14:42:57 +00:00 |
|
dMetzger
|
800a95b583
|
[-] FO : customer discounts page fixed with cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14162 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-14 14:59:08 +00:00 |
|
lLefevre
|
0e9e23aaae
|
// Fix update english key of translations in all files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-14 12:25:51 +00:00 |
|
rMalie
|
48e9590cf4
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-09 09:19:30 +00:00 |
|
dMetzger
|
d5c2094706
|
// Temp fix for cart rule and multi-shipping - not fully functionnal yet but still better than before
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-01 09:45:39 +00:00 |
|
mDeflotte
|
12b15722d5
|
// Normalization: replacing spaces by tabulations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13635 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-27 15:43:43 +00:00 |
|
dMetzger
|
319309528a
|
[-] FO : automatic refresh of the cart when a cart rule is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13577 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 18:24:23 +00:00 |
|
rMalie
|
2454cd7863
|
// Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 16:33:10 +00:00 |
|
dMetzger
|
be71b2ddb1
|
[-] FO : cart rule fix (product restrictions mixing attributes and other criteria)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13567 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-23 15:54:05 +00:00 |
|
dMetzger
|
609a45f25b
|
[*] 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)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 17:04:41 +00:00 |
|
dMetzger
|
ec0798fe8a
|
[-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-13 17:47:40 +00:00 |
|
fBrignoli
|
f4d3ca50f1
|
// norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13137 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-08 15:34:20 +00:00 |
|
dMetzger
|
e22f837ebc
|
[-] BO : cart rule with attributes filter and reduction on the selection of products fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13047 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 17:00:47 +00:00 |
|
dMetzger
|
48e590a257
|
// 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
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13039 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 16:29:47 +00:00 |
|
dMetzger
|
33df5d5ea7
|
[*] BO : reduction on a selection of products finalized
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13038 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 16:26:49 +00:00 |
|
dMetzger
|
744bf28826
|
[*] BO : shop restriction added to the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13032 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 14:57:39 +00:00 |
|
dMetzger
|
9fa90c4183
|
[-] BO : wrong error message was displayed on cart rules deletion PSTEST-644
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12998 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-03 16:17:02 +00:00 |
|
fBrignoli
|
3f67f95a5c
|
// norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12911 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-01 15:56:39 +00:00 |
|
fBrignoli
|
d89dbcecc3
|
// code review
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12910 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-01 15:54:57 +00:00 |
|
dMetzger
|
f1dece04f2
|
[-] BO : partial use fixed for cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12762 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-27 15:56:57 +00:00 |
|
dMetzger
|
ff44291d38
|
[-] FO : uncombinable cart rules are not combinable anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 15:17:23 +00:00 |
|
dMetzger
|
b274997203
|
[-] BO : voucher creation in the order detail fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12718 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 14:34:58 +00:00 |
|
dMetzger
|
b39c0061a7
|
[*] BO : new dimension added to the product filter in the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12714 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 13:30:16 +00:00 |
|
rMalie
|
c994c25fe1
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-25 14:40:12 +00:00 |
|
mDeflotte
|
0dda375bd6
|
// Fixing bug in the cartrule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12271 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-09 15:27:09 +00:00 |
|
vSchoener
|
fbbca19d52
|
[-] Fix Bug #PSTEST-148 for any Divide operation when a variable is equal to 0
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11684 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-22 20:58:01 +00:00 |
|
mDeflotte
|
520867e0fe
|
// Replacing some "4 spaces" by a unique tabulation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11587 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-22 12:43:31 +00:00 |
|
rMalie
|
1d2f9e44c4
|
// Improve collections : where() method reworked (prototype changed) + validation of fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-19 16:57:28 +00:00 |
|
aFolletete
|
073e0fbbc4
|
// clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11325 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-17 16:53:50 +00:00 |
|
mDeflotte
|
1d393f8e97
|
// BugFix : Adding some backquote to protect SQL reserved word
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11294 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-16 09:57:03 +00:00 |
|
rMalie
|
13a70e1044
|
[*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 13:24:03 +00:00 |
|
rMalie
|
b8f5b693b9
|
// Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11157 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-12 21:06:59 +00:00 |
|
rMalie
|
fddf4fb89b
|
[*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-12 18:10:38 +00:00 |
|
rMalie
|
d0c1239c17
|
// Remove $this->table and $this->identifier from objectModels + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11076 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-09 14:05:24 +00:00 |
|
rMalie
|
3d1176686f
|
// Fix collection in cartRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11018 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-07 09:11:43 +00:00 |
|
rMalie
|
f55a9e04b9
|
[*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:41:34 +00:00 |
|
rMalie
|
86683a963e
|
// Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:56:03 +00:00 |
|
rMalie
|
1cce2fd6cb
|
// Fix collections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10893 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 09:05:45 +00:00 |
|
aFolletete
|
911c8ad6c4
|
// Comment useless line in order to clean this
// Add table and identifier to CartRule class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10889 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-03 09:56:38 +00:00 |
|
rMalie
|
d76998340a
|
// Use Collection instead of HydrateCollection in several places
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10860 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 15:20:47 +00:00 |
|
mDeflotte
|
5f3d417441
|
// Fix some problems with getPackageShippingCost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10850 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 10:48:26 +00:00 |
|
aFolletete
|
8bbd830446
|
// fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 17:25:27 +00:00 |
|