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

// fix small bug in AdminTaxRulesGroupController

Browse Source
This commit is contained in:
lLefevre
2011-11-30 10:27:21 +00:00
parent e016d4f1e9
commit 925d795721
3 changed files with 15 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/tax_rules/form.tpl
+11 -26
View File
@@ -26,19 +26,14 @@
{extends file="../helper/form/form.tpl"}
{block name="label"}
{if $input.type == 'select' && $input.name == 'country[]'}
<div id="add_new_tax_rule" style="display:none">
<label>{$input.label} </label>
{else}
{if isset($input.label)}
<label
{if $input.name == 'states[]'}
id="state-label" style="display: none;"
{elseif $input.name == 'zipcode'}
id="zipcode-label"
{/if}
>{$input.label} </label>
{/if}
{if isset($input.label)}
<label
{if $input.name == 'states[]'}
id="state-label" style="display: none;"
{elseif $input.name == 'zipcode'}
id="zipcode-label"
{/if}
>{$input.label} </label>
{/if}
{/block}
@@ -50,27 +45,17 @@
>
{/block}
{block name="end_field_block"}
{if $input.type == 'submit'}
</div>
</div>
{else}
</div>
{/if}
{/block}
{block name="script"}
$(document).ready(function() {
$('#country').click(function() {
populateStates($(this).val(), '');
});
$('#tax_rule_form').hide();
$('#desc-tax_rules_group-new').click(function() {
initForm();
$('#add_new_tax_rule').show();
$('#tax_rule_form').slideToggle();
return false;
}, function() {
$('#add_new_tax_rule').hide();
});
});
@@ -118,7 +103,7 @@
dataType: 'json',
data: 'ajaxStates=1&ajaxUpdateTaxRule=1&id_tax_rule='+id_tax_rule,
success: function(data){
$('#add_new_tax_rule').show();
$('#tax_rule_form').show();
$('#id_tax_rule').val(data.id);
$('#country').val(data.id_country);
$('#state').val(data.id_state);
admin-dev/themes/template/tax_rules_group/form.tpl
+3 -130
View File
@@ -25,133 +25,6 @@
*}
{extends file="../helper/form/form.tpl"}
{block name="label"}
{if $input.type == 'select' && $input.name == 'country[]'}
<div id="add_new_tax_rule" style="display:none">
<label>{$input.label} </label>
{else}
{if isset($input.label)}
<label
{if $input.name == 'states[]'}
id="state-label" style="display: none;"
{elseif $input.name == 'zipcode'}
id="zipcode-label"
{/if}
>{$input.label} </label>
{/if}
{/if}
{/block}
{block name="start_field_block"}
<div class="margin-form"
{if $input.name == 'states[]'}
id="state-select" style="display: none;"
{/if}
>
{/block}
{block name="end_field_block"}
{if $input.type == 'submit'}
</div>
{/if}
</div>
{/block}
{block name="script"}
$(document).ready(function() {
$('#country').click(function() {
populateStates($(this).val(), '');
});
$('span.process-icon-new').parent().click(function() {
initForm();
$('#add_new_tax_rule').slideToggle();
});
$('table.tax_rule').find('a.edit').attr('href', '#');
});
function populateStates(id_country, id_state)
{
if ($("#country option:selected").size() > 1)
{
$("#zipcode-label").hide();
$("#zipcode").hide();
$("#state-select").hide();
$("#state-label").hide();
} else {
$.ajax({
url: "ajax.php",
cache: false,
data: "ajaxStates=1&id_country="+id_country+"&id_state="+id_state+"&empty_value={l s='All'}",
success: function(html){
if (html == "false")
{
$("#state-label").hide();
$("#state-select").hide();
$("#states").html('');
}
else
{
$("#state-label").show();
$("#state-select").show();
$("#states").html(html);
}
}
});
$("#zipcode-label").show();
$("#zipcode").show();
}
}
function loadTaxRule(id_tax_rule)
{
$.ajax({
type: 'POST',
url: 'ajax.php',
async: true,
dataType: 'json',
data: 'ajaxStates=1&ajaxUpdateTaxRule=1&id_tax_rule='+id_tax_rule,
success: function(data){
$('#add_new_tax_rule').show();
$('#id_tax_rule').val(data.id);
$('#country').val(data.id_country);
$('#state').val(data.id_state);
zipcode = 0;
if (data.zipcode_from != 0)
{
zipcode = data.zipcode_from;
if (data.zipcode_to != 0)
zipcode = zipcode +"-"+data.zipcode_to
}
$('#zipcode').val(zipcode);
$('#behavior').val(data.behavior);
$('#id_tax').val(data.id_tax);
$('#description').val(data.description);
populateStates(data.id_country, data.id_state);
}
});
}
function initForm()
{
$('#id_tax_rule').val('');
$('#country').val(0);
$('#state').val(0);
$('#zipcode').val(0);
$('#behavior').val(0);
$('#tax').val(0);
$('#description').val('');
populateStates(0,0);
}
{/block}
{block name="after"}
<br />
{/block}