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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac committed 2013-08-01 11:48:50 +02:00
2 parents 184a1c561c dfb1924884
commit 3e75881bdc
2 files changed
+2 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
</td> </td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="center"> <td class="center">
<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) && !$form_id) || isset($change_ranges)} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone])} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" /> <input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) && !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone])} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />
</td> </td>
{/foreach} {/foreach}
</tr> </tr>
controllers/admin/AdminCarrierWizardController.php
+1 -5
View File
@@ -62,19 +62,15 @@ class AdminCarrierWizardControllerCore extends AdminController
'steps' => array( 'steps' => array(
array( array(
'title' => $this->l('General settings'), 'title' => $this->l('General settings'),
'desc' => $this->l('General settings'),
), ),
array( array(
'title' => $this->l('Shipping locations and costs'), 'title' => $this->l('Shipping locations and costs'),
'desc' => $this->l('Shipping locations and costs'),
), ),
array( array(
'title' => $this->l('Size, weight, and group access'), 'title' => $this->l('Size, weight, and group access'),
'desc' => $this->l('Size, weight, and group access'),
), ),
array( array(
'title' => $this->l('Summary'), 'title' => $this->l('Summary'),
'desc' => $this->l('Summary'),
), ),
)); ));
@@ -677,7 +673,7 @@ class AdminCarrierWizardControllerCore extends AdminController
// Set flag deteled to true for historization // Set flag deteled to true for historization
$current_carrier->deleted = true; $current_carrier->deleted = true;
$current_carrier->update(); $current_carrier->update();
// Fill the new carrier object // Fill the new carrier object
$this->copyFromPost($carrier, $this->table); $this->copyFromPost($carrier, $this->table);
$carrier->position = $current_carrier->position; $carrier->position = $current_carrier->position;