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

[-] BO : carrier wizard no fees display

Browse Source
This commit is contained in:
Vincent Augagneur
2013-12-06 10:17:07 +01:00
parent 36a70d83d5
commit c2e0edcc7a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+4 -3
View File
@@ -686,17 +686,18 @@ class AdminCarrierWizardControllerCore extends AdminController
$price_list = array(); $price_list = array();
if (is_array($fees) && count($fees)) if (is_array($fees) && count($fees))
{ {
$price = isset($fee[$key]) ? (float)$fee[$key] : 0;
foreach ($fees as $id_zone => $fee) foreach ($fees as $id_zone => $fee)
{
$price_list[] = array( $price_list[] = array(
'id_range_price' => ($range_type == Carrier::SHIPPING_METHOD_PRICE ? (int)$range->id : null), 'id_range_price' => ($range_type == Carrier::SHIPPING_METHOD_PRICE ? (int)$range->id : null),
'id_range_weight' => ($range_type == Carrier::SHIPPING_METHOD_WEIGHT ? (int)$range->id : null), 'id_range_weight' => ($range_type == Carrier::SHIPPING_METHOD_WEIGHT ? (int)$range->id : null),
'id_carrier' => (int)$carrier->id, 'id_carrier' => (int)$carrier->id,
'id_zone' => (int)$id_zone, 'id_zone' => (int)$id_zone,
'price' => $price, 'price' => isset($fee[$key]) ? (float)$fee[$key] : 0,
); );
}
} }
if (count($price_list) && !$carrier->addDeliveryPrice($price_list, true)) if (count($price_list) && !$carrier->addDeliveryPrice($price_list, true))
return false; return false;
} }
js/admin_carrier_wizard.js
+1 -2
View File
@@ -31,7 +31,6 @@ $(document).ready(function() {
if (parseInt($('input[name="is_free"]:checked').val())) if (parseInt($('input[name="is_free"]:checked').val()))
is_freeClick($('input[name="is_free"]:checked')); is_freeClick($('input[name="is_free"]:checked'));
displayRangeType(); displayRangeType();
checkAllZones();
}); });
function initCarrierWizard() function initCarrierWizard()
@@ -673,7 +672,7 @@ function checkAllZones(elt)
else else
{ {
$('.input_zone').removeAttr('checked'); $('.input_zone').removeAttr('checked');
$('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled').val(''); $('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled');
} }
} }