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

//Added currency sign and weigh unit on carrier wizard

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-01 16:03:14 +02:00
1 parent 79a4a84163
commit c0db0bfca9
3 files changed
+28 -8
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
+7 -7
View File
@@ -5,18 +5,18 @@
<td class="range_type"></td> <td class="range_type"></td>
<td class="border_left border_bottom">>=</td> <td class="border_left border_bottom">>=</td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup></td> <td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" value="{$range.delimiter1|string_format:"%.6f"}" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
{foreachelse} {foreachelse}
<td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup></td> <td class="border_bottom center"><input name="range_inf[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
{/foreach} {/foreach}
</tr> </tr>
<tr class="range_sup"> <tr class="range_sup">
<td class="center range_type"></td> <td class="center range_type"></td>
<td class="border_left "><</td> <td class="border_left "><</td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{$range.delimiter2|string_format:"%.6f"}" {/if}/><sup>*</sup></td> <td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" {if isset($form_id) && !$form_id} value="" {else} value="{$range.delimiter2|string_format:"%.6f"}" {/if}/><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
{foreachelse} {foreachelse}
<td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup></td> <td class="center"><input name="range_sup[{$range.id_range|intval}]" type="text" /><sup>*</sup><span class="weight_unit">&nbsp; {$PS_WEIGHT_UNIT}</span><span class="price_unit">&nbsp; {$currency_sign}</span></td>
{/foreach} {/foreach}
</tr> </tr>
<tr class="fees_all"> <tr class="fees_all">
@@ -24,12 +24,12 @@
<td></td> <td></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 != -1} validated {/if}" > <td class="center border_top border_bottom {if $range.id_range != -1} validated {/if}" >
<input type="text" {if isset($form_id) && !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} /> <input type="text" {if isset($form_id) && !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} /><span id="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
{if $range.id_range == -1} <button class="button">{l s="Validate"}</button> {/if} {if $range.id_range == -1} <button class="button">{l s="Validate"}</button> {/if}
</td> </td>
{foreachelse} {foreachelse}
<td class="center border_top border_bottom"> <td class="center border_top border_bottom">
<input style="display:none" type="text" /> <input style="display:none" type="text" /><span id="currency_sign" style="display:none">&nbsp; {$currency_sign}</span>
<button class="button">{l s="Validate"}</button> <button class="button">{l s="Validate"}</button>
</td> </td>
{/foreach} {/foreach}
@@ -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) || (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}" /> <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}" />&nbsp; {$currency_sign}
</td> </td>
{/foreach} {/foreach}
</tr> </tr>
controllers/admin/AdminCarrierWizardController.php
+9 -1
View File
@@ -309,6 +309,10 @@ class AdminCarrierWizardControllerCore extends AdminController
)); ));
$tpl_vars = array(); $tpl_vars = array();
$tpl_vars['PS_WEIGHT_UNIT'] = Configuration::get('PS_WEIGHT_UNIT');
$currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$tpl_vars['currency_sign'] = $currency->sign;
$fields_value = $this->getStepThreeFieldsValues($carrier); $fields_value = $this->getStepThreeFieldsValues($carrier);
$this->getTplRangesVarsAndValues($carrier, $tpl_vars, $fields_value); $this->getTplRangesVarsAndValues($carrier, $tpl_vars, $fields_value);
@@ -537,7 +541,11 @@ class AdminCarrierWizardControllerCore extends AdminController
$template->assign('fields_value', $fields_value); $template->assign('fields_value', $fields_value);
$template->assign('input', array('type' => 'zone', 'name' => 'zones' )); $template->assign('input', array('type' => 'zone', 'name' => 'zones' ));
$currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$template->assign('currency_sign', $currency->sign);
$template->assign('PS_WEIGHT_UNIT', Configuration::get('PS_WEIGHT_UNIT'));
die($template->fetch()); die($template->fetch());
} }
js/admin_carrier_wizard.js
+12
View File
@@ -28,6 +28,7 @@ $(document).ready(function() {
bind_inputs(); bind_inputs();
initCarrierWizard(); initCarrierWizard();
is_freeClick($('input[name="is_free"]:checked')); is_freeClick($('input[name="is_free"]:checked'));
displayRangeType();
}); });
function initCarrierWizard() function initCarrierWizard()
@@ -49,9 +50,17 @@ function initCarrierWizard()
function displayRangeType() function displayRangeType()
{ {
if ($('input[name="shipping_method"]:checked').val() == 1) if ($('input[name="shipping_method"]:checked').val() == 1)
{
string = string_weight; string = string_weight;
$('.weight_unit').show();
$('.price_unit').hide();
}
else else
{
string = string_price; string = string_price;
$('.price_unit').show();
$('.weight_unit').hide();
}
$('.range_type').html(string); $('.range_type').html(string);
} }
@@ -235,7 +244,10 @@ function bind_inputs()
$('tr.fees_all td button').off('click').on('click', function () { $('tr.fees_all td button').off('click').on('click', function () {
index = $(this).parent('td').index(); index = $(this).parent('td').index();
if (validateRange(index)) if (validateRange(index))
{
enableRange(index); enableRange(index);
$('#currency_sign').show();
}
else else
disableRange(index); disableRange(index);
return false; return false;