dMetzger
|
168bda9273
|
[-] FO : potential divide by zero removed #PSCFV-2787
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15970 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-06-11 14:36:16 +00:00 |
|
rGaillard
|
5a7b603bca
|
// Miss commit...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15701 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 17:14:43 +00:00 |
|
rGaillard
|
b953186dbd
|
[-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15700 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 17:12:55 +00:00 |
|
dMetzger
|
75430a0b30
|
// Fixed cart rules analysis for empty carts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15684 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-25 11:37:43 +00:00 |
|
dMetzger
|
3af54b348e
|
// Oups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15619 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 13:16:41 +00:00 |
|
dMetzger
|
859f360783
|
// Autoassignation of the cart rule when log out
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15610 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-22 10:20:36 +00:00 |
|
dMetzger
|
231a924e31
|
// Cart display for free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 18:53:30 +00:00 |
|
mDeflotte
|
4b1cce7054
|
// Fix bug with gift products and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:31:43 +00:00 |
|
dMetzger
|
19b486d1e4
|
// Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15550 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:09:21 +00:00 |
|
dMetzger
|
fc33b24f3d
|
[-] FO : wrong calcul of the free shipping in multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 17:08:16 +00:00 |
|
dMetzger
|
1d3126f99d
|
// Code cleaning and small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15524 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 15:17:21 +00:00 |
|
dMetzger
|
0ebae2397a
|
// variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15512 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:28:34 +00:00 |
|
dMetzger
|
f5483f787d
|
[-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15510 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 14:19:54 +00:00 |
|
dMetzger
|
c23203018d
|
[-] FO : fixed a great part of the cart rules with multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15494 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-21 13:15:15 +00:00 |
|
dMetzger
|
7fdea61289
|
[*] FO : cart summary is adapted to cart rules with a special "friendly" display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15442 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 13:26:21 +00:00 |
|
dMetzger
|
f907523250
|
// Cart rule autoadd fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15429 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-19 12:03:13 +00:00 |
|
fBrignoli
|
bfa41957e2
|
[*] PDF : Cart rules are now displayed as a "product line"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15207 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-05-11 09:17:54 +00:00 |
|
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 |
|