dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,405 Commits 9 Branches 19 Tags
02cdbcd2cd3f81ca693f205d5f57c401ea5eb708
Commit Graph

108 Commits

Author SHA1 Message Date
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
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
e5cad60084 [-] BO : #PSCFI-4484 - Add historisation of the order status 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12082 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 16:06:18 +00:00
aFolletete
bc631a0e42 [-] BO : fixed bug on Delivery slip generation in AdminDeliverySlip 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12023 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 18:16:09 +00:00
aFolletete
8fa12fda5b [-] BO : fixed bug on Invoice generation in AdminInvoices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12021 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 17:30:11 +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
rMalie
50e4dff4e5 // Refactoring of Hook class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11998 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 14:42:05 +00:00
aFolletete
3da78b569d [-] Classes : fixed little bug on getShipping method on Order class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11840 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 13:59:12 +00:00
aFolletete
d010933362 [-] BO : fixed bug on product addition 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11838 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 13:46:42 +00:00
aFolletete
45cc1929d4 // add delivery slip 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 21:21:41 +00:00
fSerny
560903fefe [-] BO : Credit slips now appear in document section 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11653 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 18:02:04 +00:00
fSerny
71f2f43ca6 [*] BO : Partial refund now handle quantity 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11624 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 15:57:30 +00:00
bMancone
c197093143 // Fixed getCartProducts() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11615 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 15:04:26 +00:00
vChabot
2a5faa0271 // Improvement : target blank on PDF 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 13:38:00 +00:00
rGaillard
739e51ce9a // Add specific_price management for backoffice order && fix installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 17:16:46 +00:00
bMancone
0d0f43f783 // Orders : fixed stock (available quantity & Stock) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 14:24:34 +00:00
bMancone
09c22d9083 // OrderHistory : fixed r11441 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11471 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 11:10:52 +00:00
mMarinetti
e813ea996d // minor notice fix when new order, related to OrderHistory::getLastOrderState() returning false instead of an object 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11441 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 19:04:56 +00:00
aFolletete
5d7a120e50 // management of discount addition when no invoice on current order 
// update the discount form when new invoice is created

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11389 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 18:24:03 +00:00
mDeflotte
016e7b268f // Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11385 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 17:26:17 +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