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

//added label on carrier zones && improve range validation

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-05 16:54:36 +02:00
parent a98740d25c
commit 3a75a783f6
2 changed files with 32 additions and 14 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
+2 -2
View File
@@ -34,9 +34,9 @@
</tr> </tr>
{foreach from=$zones key=i item=zone} {foreach from=$zones key=i item=zone}
<tr class="fees {if $i is odd}alt_row{/if}" data-zoneid="{$zone.id_zone}"> <tr class="fees {if $i is odd}alt_row{/if}" data-zoneid="{$zone.id_zone}">
<td>{$zone.name}</td> <td><label for="zone_{$zone.id_zone}">{$zone.name}</label></td>
<td class="zone"> <td class="zone">
<input class="input_zone" name="zone_{$zone.id_zone}" value="1" type="checkbox" {if isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} checked="checked"{/if}/> <input class="input_zone" id="zone_{$zone.id_zone}" name="zone_{$zone.id_zone}" value="1" type="checkbox" {if isset($fields_value['zones'][$zone.id_zone]) && $fields_value['zones'][$zone.id_zone]} checked="checked"{/if}/>
</td> </td>
{foreach from=$ranges key=r item=range} {foreach from=$ranges key=r item=range}
<td class="center"> <td class="center">
js/admin_carrier_wizard.js
+30 -12
View File
@@ -402,18 +402,31 @@ function validateRange(index)
} }
else if (is_ok && index > 2)//check range only if it's not the first range else if (is_ok && index > 2)//check range only if it's not the first range
{ {
is_ok = false;
$('tr.range_sup td').not('.range_type, .range_sign, tr.range_sup td:last').each( function () $('tr.range_sup td').not('.range_type, .range_sign, tr.range_sup td:last').each( function ()
{ {
index = $(this).index(); is_ok = false;
curent_index = $(this).index();
current_val = $(this).find('input').val(); current_val = $(this).find('input').val();
if ((range_inf >= current_val) && (($('tr.range_inf td:eq('+index+1+')').length && range_inf <= $('tr.range_inf td:eq('+index+1+') input').val()) || !$('tr.range_inf td:eq('+index+1+')').length))
if ((range_sup != current_val) && (range_inf != $('tr.range_inf td:eq('+curent_index+') input').val()))
{ {
if (range_sup >= $('tr.range_inf td:eq('+index+') input').val() && ($('tr.range_inf td:eq('+index+1+')').length && range_sup < $('tr.range_inf td:eq('+index+1+') input').val() || !$('tr.range_inf td:eq('+index+1+')').length )) if ((range_inf >= current_val) && (($('tr.range_inf td:eq('+curent_index+1+')').length && range_inf <= $('tr.range_inf td:eq('+curent_index+1+') input').val()) || !$('tr.range_inf td:eq('+curent_index+1+')').length))
is_ok = true; {
if (range_sup >= $('tr.range_inf td:eq('+curent_index+') input').val() && ($('tr.range_inf td:eq('+curent_index+1+')').length && range_sup < $('tr.range_inf td:eq('+curent_index+1+') input').val() || !$('tr.range_inf td:eq('+index+1+')').length ))
{
if ((range_sup < current_val && range_sup > $('tr.range_inf td:eq('+curent_index+') input').val()) || (range_inf > $('tr.range_inf td:eq('+curent_index+') input').val() && range_inf <= current_val)) //check if ranges is overlapping
is_ok = true;
}
else
is_ok = false;
}
else
is_ok = false;
} }
else
is_ok = false;
}); });
if (!is_ok) if (!is_ok)
{ {
$('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error'); $('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error');
@@ -493,12 +506,6 @@ function checkAllFieldIsNumeric()
}); });
} }
function checkRangeContinuity()
{
}
function rebuildTabindex() function rebuildTabindex()
{ {
i = 1; i = 1;
@@ -527,4 +534,15 @@ function validateAndAddRangeButtonDisplay()
$('.validate_range').show(); $('.validate_range').show();
$('.new_range').hide(); $('.new_range').hide();
} }
}
function repositionRange(current_index, new_index)
{
$('tr.range_sup, tr.range_inf, tr.fees_all, tr.fees, tr.delete_range ').each(function () {
$(this).find('td:eq('+current_index+')').each( function () {
$(this).parent('tr').find('td:eq('+new_index+')').after(this.outerHTML);
$(this).remove();
});
});
} }