Commit Graph

99 Commits

Author SHA1 Message Date
Damien Metzger
57727a4cfa [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 2013-01-15 20:08:38 +01:00
Rémi Gaillard
091459bde6 [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger
7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger
6970bf57d9 [-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet 2012-12-20 17:13:11 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
dMetzger
c65753bc35 [-] FO : wrong cache ID fixed #PSCFV-5537 2012-11-13 15:52:31 +00:00
rGaillard
fc19914c85 [-] Core: Fix cache issue and order slip pdf generation 2012-10-22 12:40:15 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
3751fd2f8b [-] FO: Fix #PSCFV-4992 2012-10-16 09:58:54 +00:00
rGaillard
c4f8f03614 [-] FO: Fix #PSCFV-4814 cart rule not combinables 2012-10-15 15:31:04 +00:00
rGaillard
fedb5f583c [-] FO: Improve memory use with cart rules 2012-10-12 10:06:07 +00:00
dMetzger
e12895686c [-] FO : fixed warning when a discount wasn't associated to any reduction type (shipping, currency, percentage) 2012-08-06 09:47:53 +00:00
fBrignoli
610b4f718b // missing comas #PSCFV-3464 2012-08-02 13:24:33 +00:00
mDeflotte
ce886cbde6 [-] FO : #PSCFV-3268 - Fix bug with cache and cart rule discount calculation 2012-08-02 09:07:18 +00:00
dMetzger
f1270e3ab0 [-] BO : cart rules are now cleaned when a component of a product rule (like a product, a category, a supplier...) is deleted 2012-07-24 13:11:56 +00:00
mDeflotte
f4fa8bd1b1 [-] FO : #PSCFV-3268 - Fix bug with cache cartrule badly fill
// This fix is not "clean". It would be intersting to take more time to found a better solution
2012-07-24 13:08:44 +00:00
dMetzger
d130fd6061 // Improvement of the fix of a previous bug #PSCFV-2804 2012-07-11 12:43:28 +00:00
dMetzger
b4015b78e4 [*] FO : better management in the priority between the cart rules #PSCFV-2804 2012-07-11 10:07:16 +00:00
dMetzger
5a484d8903 [*] BO : added a new Validate method "isPercentage" 2012-07-09 13:05:31 +00:00
dMetzger
3db62e9551 [-] BO : Fixed SQL crash with an empty shop list #PSCFV-2946 2012-07-05 14:18:22 +00:00
dMetzger
900c10120d [-] FO : potential divide by zero removed #PSCFV-2787 2012-06-11 14:36:16 +00:00
rGaillard
79f64b39f6 // Miss commit... 2012-05-25 17:14:43 +00:00
rGaillard
d3dbc5ba12 [-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505 2012-05-25 17:12:55 +00:00
dMetzger
7f77efd003 // Fixed cart rules analysis for empty carts 2012-05-25 11:37:43 +00:00
dMetzger
e28de3094c // Oups 2012-05-22 13:16:41 +00:00
dMetzger
e5c8aa309e // Autoassignation of the cart rule when log out 2012-05-22 10:20:36 +00:00
dMetzger
0c5c1ae90f // Cart display for free shipping 2012-05-21 18:53:30 +00:00
mDeflotte
6d94e08afc // Fix bug with gift products and multishipping 2012-05-21 17:31:43 +00:00
dMetzger
05d37b2c87 // Norm 2012-05-21 17:09:21 +00:00
dMetzger
21dfaf816b [-] FO : wrong calcul of the free shipping in multi-shipping 2012-05-21 17:08:16 +00:00
dMetzger
0da69c8dbe // Code cleaning and small fixes 2012-05-21 15:17:21 +00:00
dMetzger
3a9557dc9e // variable misnamed 2012-05-21 14:28:34 +00:00
dMetzger
aaf437a3e0 [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue() 2012-05-21 14:19:54 +00:00
dMetzger
a28d21c046 [-] FO : fixed a great part of the cart rules with multi-shipping 2012-05-21 13:15:15 +00:00
dMetzger
2c30a0e3f3 [*] FO : cart summary is adapted to cart rules with a special "friendly" display 2012-05-19 13:26:21 +00:00
dMetzger
b64e6a05cc // Cart rule autoadd fixed 2012-05-19 12:03:13 +00:00
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