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

//small fix when multi-store is enable on carrier wizard

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-09 10:58:07 +02:00
parent 1571dd60c8
commit a5be1f147f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+1 -1
View File
@@ -21,7 +21,7 @@
</tr> </tr>
<tr class="fees_all"> <tr class="fees_all">
<td class="border_top border_bottom border_bold"><span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span></td> <td class="border_top border_bottom border_bold"><span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span></td>
<td></td> <td><input type="checkbox" onclick="checkAllZones(this);" ></td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="center border_top border_bottom {if $range.id_range != 0} validated {/if}" > <td class="center border_top border_bottom {if $range.id_range != 0} validated {/if}" >
<input type="text" {if isset($form_id) && !$form_id} disabled="disabled"{/if} {if $range.id_range == 0} style="display:none"{/if} /><span class="currency_sign" {if $range.id_range == 0} style="display:none" {/if}>&nbsp; {$currency_sign}</span> <input type="text" {if isset($form_id) && !$form_id} disabled="disabled"{/if} {if $range.id_range == 0} style="display:none"{/if} /><span class="currency_sign" {if $range.id_range == 0} style="display:none" {/if}>&nbsp; {$currency_sign}</span>
controllers/admin/AdminCarrierWizardController.php
+2 -5
View File
@@ -883,16 +883,13 @@ class AdminCarrierWizardControllerCore extends AdminController
1 => array('name', 'delay', 'grade', 'url'), 1 => array('name', 'delay', 'grade', 'url'),
2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'), 2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'),
3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'), 3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'),
4 => array(),
); );
if (Shop::isFeatureActive()) if (Shop::isFeatureActive())
{ {
$multistore_field = array(array('shop')); $multistore_field = array(array('shop'));
$tmp = $step_fields; array_splice($step_fields, 1, 0, $multistore_field);
$step_fields = array(1 => $tmp[1]) + $multistore_field;
array_shift($tmp);
foreach ($tmp as $row)
$step_field[] = $row;
} }
$rules = Carrier::getValidationRules('Carrier'); $rules = Carrier::getValidationRules('Carrier');