dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,386 Commits 9 Branches 19 Tags
9b0086777ebddfe6cfcce18bf94de732b8081b83
Commit Graph

128 Commits

Author SHA1 Message Date
mDeflotte
ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:58:02 +00:00
fBrignoli
2e1afd8b8b [-] PDF : Bug Fixed #PSCFV-168 - Invoice discount & shipping are now correctly displayed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15313 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:22:22 +00:00
aFolletete
47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO) 
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:29:46 +00:00
mDeflotte
ca6c08c36c [-] BO : #PSCFV-2276 - Fix bug on changing status of a order with virtual products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15140 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 07:45:22 +00:00
tDidierjean
503bb511d9 [-] Classes : fix #PSCFV-2185 - bad handling of order states for merchandise returns 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15036 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 11:48:40 +00:00
tDidierjean
0c2a5f508b [-] FO : fix bug #PSCFV-737 - cannot download virtual file from order history 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14997 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-02 12:55:53 +00:00
mDeflotte
2e7052d283 [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14979 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 13:40:46 +00:00
tDidierjean
8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 13:23:02 +00:00
mDeflotte
3eeb6640fa // Order::getHistory() Fix cache problem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14783 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 08:47:29 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
bMancone
285becae29 // Fixed stock_available when ordering products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:39:15 +00:00
mDeflotte
813415a344 // Add missing parameter 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14634 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 14:25:00 +00:00
mDeflotte
58ef5e6e9b [-] FO : #PSCFI-5322 - Order::hasBeenDelivered and Order::hasBeenPaid don't work for all order states 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14629 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 13:40:29 +00:00
mDeflotte
9b4aad56a9 [-] BO : #PSFV-797 - Fix bug with order invoice pdf and customized products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14608 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:22:47 +00:00
mDeflotte
99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products 
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:02:18 +00:00
mDeflotte
33caf31dc3 [-] Project : #PSFV-753 - OrderPayment::payment_method must be a genericName and not a name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14388 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-30 14:43:44 +00:00
mDeflotte
4fd68f7666 [-] FO : #PSFV-717 - Bad parameter used 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14351 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 07:27:05 +00:00
tDidierjean
ee8c55d9f8 [-] Classes : PSTEST-1104 - mail for product download is not sent when command state is updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14335 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-28 13:28:16 +00:00
rMalie
f785a54836 // Fix multi shop share order in order invoices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14233 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-23 09:31:04 +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
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +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
rMalie
b24dcffc9c // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:39:44 +00:00
aFolletete
cb7965c53f // Fixed bug #PSTEST-752 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13564 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:22:17 +00:00
aKorczak
5dc30e0954 //missing code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13508 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:25:18 +00:00
aKorczak
8967020600 //missing code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13506 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:12:48 +00:00
aKorczak
884f9d4948 //norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13505 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:06:43 +00:00
aKorczak
69e55b06df [-] WS : Add tax for orders inside order_details api entity 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13504 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:05:57 +00:00
dMetzger
2c7720ab08 // You shall not DIE! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:14:01 +00:00
mMarinetti
166d540dbd // die2exception 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13441 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:49:27 +00:00
mDeflotte
a17726f8ea [-] BO : #PSFV-503 - Fix bug with image generation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13368 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 17:31:39 +00:00
fSerny
da7ff75852 [+] BO : New hooks added (helpers + order history) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13349 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:54:50 +00:00
aFolletete
11a74c652a // clean code && fix norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13081 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 15:31:59 +00:00
aFolletete
5615dca5c1 [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class 
[~] Deprecated : OrderHistory::getLastOrderState()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12898 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 14:34:17 +00:00
dMetzger
8a4b9f7afe [-] FO : free gift fixed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12726 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 17:17:18 +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
33cf4fab23 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12687 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 15:51:47 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 17:41:02 +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
bMancone
1db3cf3fd5 // Fixed norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12428 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 12:57:15 +00:00
bMancone
ca23737c04 // #PSTEST-473 Fixed OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12427 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 11:34:46 +00:00
bMancone
57b0bd86d4 // #PSTEST-473 Fixed OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12426 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 11:29:19 +00:00
bMancone
7492cd60f8 // Fixed OrderHistory for Packs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12343 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 10:11:24 +00:00
bMancone
c0523a2f74 // Improved Pack management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12317 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-10 15:40:46 +00:00
bMancone
4af34a28b3 // updated stock for Pack 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12292 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 18:23:01 +00:00
aFolletete
9b780a4df3 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12284 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 16:59:03 +00:00
fBrignoli
8e277e6e17 [-] FO : Bug Fixed #PSFV-315 - Incorrect products prices in order history 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12267 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 14:09:15 +00:00
aFolletete
925c1245e3 [-] Classes : fixed bug #PSFV-328 - Round error while editing order in back office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12243 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-06 16:41:50 +00:00
aFolletete
a1eb20009a // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12209 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 16:34:01 +00:00
mDeflotte
a880921e7a // BugFix : Order states deleted are visible on the list of the order form 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12196 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 14:48:17 +00:00