dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,959 Commits 9 Branches 19 Tags
403db40a7fab6f895b2bc0d6439b445a96cbcbd0
Commit Graph

69 Commits

Author SHA1 Message Date
rGaillard
91c932f9f9 // Improve BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 13:34:53 +00:00
mDeflotte
8dc8455e78 // fix bug with missing $context->cart and $context->customer durring payment process 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13089 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 17:15:44 +00:00
fGaillard
1c6357c1d9 [*] TR : #PSTEST-553 : Replaced can't with cannot 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12796 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:54:32 +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
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
d920df5f2a // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12652 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 16:24:01 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
rMalie
494205d52e // Fix PrestaShopException typo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:53:19 +00:00
mDeflotte
a812a474f6 [-] BO : #PSTEST-217 - Add a translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12015 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 17:01:20 +00:00
rMalie
07207496d7 // Rename correctly all hooks 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 15:52:40 +00:00
fBrignoli
4bd908d20a [*] PDF : PDF could now be returned as a string 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11579 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 10:54:58 +00:00
aFolletete
92805dc869 [+] BO : on order edition, you can add a discount 
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-18 17:18:54 +00:00
aFolletete
d446d77261 // fix bug on Cart rule update in validateOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11326 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 17:13:48 +00:00
aFolletete
4b4a4bbfce // fix notice error on payment validation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11324 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:44:48 +00:00
aFolletete
6f03353f96 [*] BO : no payment is registered on order creation for check and bankwire payment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11296 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 10:10:48 +00:00
vChabot
659cc9235a // payment module install doesn't need to add entries in module_group table (already done in Module::install()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11171 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:31:52 +00:00
fBrignoli
67643cfc29 [-] FO : Unable to checkout 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11072 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 10:24:56 +00:00
vChabot
af70df72ce // Adding the OrderCarrier class to handle carriers in an order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 15:12:23 +00:00
lLefevre
a73e408196 [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 17:22:47 +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
394206e9ef // id_warehouse is now on the order details and not on orders table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 14:31:26 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:45:52 +00:00
mDeflotte
642d9b4648 // Revert 10430 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10439 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 15:25:47 +00:00
fBrignoli
312d93a601 // deprecated function replaced 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10424 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 14:29:12 +00:00
rMalie
9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +00:00
mDeflotte
0ce1e22813 // BugFix with opc and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 10:42:14 +00:00
mDeflotte
8add301ef3 // Bug with sql query to duplicate product from the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10308 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 08:12:48 +00:00
dMetzger
a98752eb22 // Vouchers are shrinkable again (must be tested more thoroughly) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10292 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:53:31 +00:00
rGaillard
e4096bf943 // Constructor of OrderDetail correctly call parent constructor 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:51:33 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:13:31 +00:00
fBrignoli
015ff89c4b [*] CO : Order amount informations (tax_excl & tax_incl) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9919 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-07 10:16:12 +00:00
fSerny
86e51ee01a // Fix on Module API for retrocompatibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9793 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 12:42:48 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:49:01 +00:00
dMetzger
953cb8b872 // Retro compatibility for Discount 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9789 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:47:01 +00:00
rGaillard
903d9b783a [+] BO: Add BackOffice orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 09:18:45 +00:00
dMetzger
486622522c [+] Project : Vouchers are now replaced by cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 18:50:42 +00:00
vSchoener
2804ac0d2a [+] CORE: Add a way to add easily transaction details (last method changed) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9663 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-27 00:58:24 +00:00
rMalie
fb601c96f8 // Little fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9606 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-24 15:47:09 +00:00
vSchoener
cef6e4f65a [-] CORE: Refactoring of the ValidateOrder method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9479 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 16:33:07 +00:00
mDeflotte
886fcda18e // Decrement stock available on order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9430 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-18 15:43:28 +00:00
rMalie
45645f1f50 // Merge -> revision 9352 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-14 08:20:54 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
rMalie
b4d436ca21 // Merge -> revision 9061 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 15:21:55 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:48:07 +00:00
rMalie
3620f0837f // Merge -> 8910 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:25 +00:00
fBrignoli
f8989018a7 // Tax::initializeAddress =>Address::initialize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8700 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 15:43:12 +00:00
fBrignoli
facb2318e5 [*] BO : Taxes are now historized 
[*] BO : Taxes are no longer stored in the order details row



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8556 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 09:06:20 +00:00
rMalie
0c7d567451 // Fix carrier bug for virtual products during payment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8368 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-06 13:34:44 +00:00
rMalie
79fd72e461 // Merge -> revision 8342 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-05 14:56:02 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-03 17:21:32 +00:00