dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16216 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-04 14:24:56 +00:00
parent 8f02c15e0b
commit 4d56b1a250
3 changed files with 113 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+4 -1
View File
@@ -126,7 +126,10 @@ class AdminCarriersControllerCore extends AdminController
'cast' => 'intval',
'type' => 'select',
'identifier' => 'id_carrier',
'list' => Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)
'list' => array(
-1 => array('id_carrier' => -1, 'name' => $this->l('Best price')),
-2 => array('id_carrier' => -2, 'name' => $this->l('Best grade'))) +
Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)
),
'PS_CARRIER_DEFAULT_SORT' => array(
'title' => $this->l('Sort by:'),