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

1534 Commits

Author SHA1 Message Date
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
rMalie 131efc02f8 // Merge AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12888 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 10:14:46 +00:00
rMalie 846eb566c8 // Fix adminhome and clean Dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12883 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 09:56:02 +00:00
rMalie 1435f340ef // Revert unfinished job on collections 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 09:55:41 +00:00
rMalie 9739089c32 [*] classes : new module architecture 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12872 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 16:57:19 +00:00
vChabot b36be68154 // order_by improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12868 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:33:10 +00:00
vChabot 781e4ec0e5 // norm fix 
// rename Shop::has_dependency() in Shop::hasDependency()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:28:43 +00:00
vChabot 34d6f4b9cb // norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12859 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:15:01 +00:00
vChabot 8c45f904a0 [*] BO : you can set positions to categories using multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:11:27 +00:00
aFolletete 22483a0320 [-] Classes : fixed bug #PSTEST-549 - Clean useless code 
[-] BO : fixed bug on sorting feature on AdminOrdersController
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12850 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 14:34:59 +00:00
mDeflotte 2d4a9167fa // Bug Fix : use the PS_COUNTRY_DEFAULT to calculate shipping fees 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12837 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 10:50:24 +00:00
mDeflotte f567b36d0f // Fix bug with product ordering by manufaturer name on the function Tools::getProductsOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12824 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:30:49 +00:00
mDeflotte 0b3984f8ca [-] BO : #PSTEST-595 - Fix Bug with image uploading 
[-] BO : #PSTEST-596 - Fix Bug with image uploading
[-] BO : #PSTEST-597 - Fix Bug with image uploading

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12822 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:26:33 +00:00
mDeflotte 0bbdc8a47b // Fix bug with product ordering by manufaturer name on the function Tools::getProductOrder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12821 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 08:17:24 +00:00
rMalie 2c7cd17ecb // Tab::getIdFromClassName() is now not sensible to case 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12804 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 14:09:34 +00:00
rMalie e5d5443cbe // Fix assignements in if() on AdminTab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12803 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 14:08:36 +00:00
rGaillard 099d5165ba // Fix PSTEST-396 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12797 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 13:21:12 +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
bMancone 78087fee18 // Fixed #PSTEST-598 #PSTEST-599 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12791 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:24:25 +00:00
mBertholino 8b74487eac [*] BO : A new method in Employee class has been written "getEmployeesByProfile". it returns an array of employees who has the given profile. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12787 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 10:16:09 +00:00
rGaillard fdb2f11885 // Fix PSTEST-364 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12785 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 10:12:06 +00:00
bMancone d8f2908666 // SupplyOrder form updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12784 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 10:11:36 +00:00
mDeflotte 11566e2577 [-] BO : #PSTEST-590 - Fix bug with undefined smarty variable "HOOK_EXTRACARRIER_ADDR" + By default use the default country of the shop to calculate shipping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12775 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 08:07:49 +00:00
mMarinetti c23f882426 // code review of AdminGroupShop - norms 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12764 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 16:00:15 +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
mDeflotte d1882d8e77 // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12754 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 13:53:42 +00:00
rMalie 3fab234cd9 // Fix Db->query (property value is set) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12751 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 13:39:35 +00:00
rMalie cd726ecb4e // Fix restriction on CMS categories #PSFV-403 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12743 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 09:59:13 +00:00
vAugagneur 35e6143f5b [-] BO : fixed sav display message in hard coded html span #PSTEST-545 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12741 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 09:33:48 +00:00
fBrignoli ac0a5b465d [-] Installer : Currency not installed when offline 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12729 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 17:31:19 +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
rMalie 52cb7b0bea // Fix Controller->addCss(), CSS of theme are called before CSS of modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12723 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 16:27:41 +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
rMalie 2159489ad2 // Add more informations on deprecated data 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12716 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 14:10:31 +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 840d0476c3 // Fix Exception in autoload 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12712 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 13:15:42 +00:00
rGaillard 735b3c07c0 // Small fixes on AdminProduct tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12711 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 12:50:41 +00:00
rMalie 1aea427aaa // Fix potential issue on autoload if class_index is corrupted 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12710 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 12:49:22 +00:00
mDeflotte cf85d8a712 [-] BO : #PSTEST-586 - Bad table name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12709 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 10:47:03 +00:00
bMancone c05495eade // Stock : general improvements 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12700 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 19:05:06 +00:00
fGaillard a15c3ce6eb [-] MO : MailAlerts module upgraded for PrestaShop 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12688 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 16:04:31 +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 6e008f47d9 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 14:45:32 +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
tDidierjean bd7ba6969b [-] BO : fix regression on product image upload 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12679 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 14:21:53 +00:00
jBreux 8c25b56777 [*] Project : Add possibility to use admin controllers in modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12678 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 14:12:36 +00:00
mDeflotte 1d7aa16dc4 // Fix bug with object model validation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12666 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 09:11:30 +00:00
rMalie 1c0f430600 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12658 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 17:30:33 +00:00
bMancone f846de7436 // Fixed #PSTEST-456 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 17:22:49 +00:00