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

[-] BO : Fix #PSTEST-1185

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14828 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-04-23 16:17:20 +00:00
parent f0af3c1212
commit f6cf5fdf88
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShippingController.php
+4 -1
View File
@@ -91,17 +91,20 @@ class AdminShippingControllerCore extends AdminController
public function initContent()
{
$array_carrier = array();
$carriers = Carrier::getCarriers($this->context->language->id, true, false, false, null, Carrier::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE);
foreach ($carriers as $key => $carrier)
if ($carrier['is_free'])
unset($carriers[$key]);
else
$array_carrier[] = $carrier['id_carrier'];
$id_carrier = Tools::getValue('id_carrier');
if (count($carriers))
{
if (!$id_carrier)
$id_carrier = (int)$carriers[0]['id_carrier'];
$id_carrier = (int)$array_carrier[0];
$carrierSelected = new Carrier($id_carrier);
}