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

[-] BO : #PSTEST-977 - Cart rule, hide unavailable options

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14725 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-04-18 09:59:52 +00:00
parent 78a2af39ab
commit b00a823df1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+1 -1
View File
@@ -89,7 +89,7 @@
</select> </select>
</div> </div>
<div class="clear">&nbsp;</div> <div class="clear">&nbsp;</div>
<div id="gift_attributes_list" {if $gift_product_attribute_select == ''}style="display:none"{/if}> <div id="gift_attributes_list" {if !$hasAttribute}style="display:none"{/if}>
<label>{l s='Available combinations'}</label> <label>{l s='Available combinations'}</label>
<div id="gift_attributes_list_select"> <div id="gift_attributes_list_select">
{$gift_product_attribute_select} {$gift_product_attribute_select}
admin-dev/themes/default/template/controllers/cart_rules/form.js
+8 -4
View File
@@ -112,8 +112,10 @@ function toggleApplyDiscount(percent, amount, apply_to)
$('#apply_discount_percent_div').show(400); $('#apply_discount_percent_div').show(400);
if ($('#apply_discount_to_product').attr('checked')) if ($('#apply_discount_to_product').attr('checked'))
toggleApplyDiscountTo(); toggleApplyDiscountTo();
$('#apply_discount_to_cheapest').removeAttr('disabled'); $('#apply_discount_to_cheapest').show();
$('#apply_discount_to_selection').removeAttr('disabled'); $('*[for=apply_discount_to_cheapest]').show();
$('#apply_discount_to_selection').show();
$('*[for=apply_discount_to_selection]').show();
} }
else else
{ {
@@ -126,9 +128,11 @@ function toggleApplyDiscount(percent, amount, apply_to)
$('#apply_discount_amount_div').show(400); $('#apply_discount_amount_div').show(400);
if ($('#apply_discount_to_product').attr('checked')) if ($('#apply_discount_to_product').attr('checked'))
toggleApplyDiscountTo(); toggleApplyDiscountTo();
$('#apply_discount_to_cheapest').attr('disabled', 'disabled'); $('#apply_discount_to_cheapest').hide();
$('*[for=apply_discount_to_cheapest]').hide();
$('#apply_discount_to_cheapest').removeAttr('checked'); $('#apply_discount_to_cheapest').removeAttr('checked');
$('#apply_discount_to_selection').attr('disabled', 'disabled'); $('#apply_discount_to_selection').hide();
$('*[for=apply_discount_to_selection]').hide();
$('#apply_discount_to_selection').removeAttr('checked'); $('#apply_discount_to_selection').removeAttr('checked');
} }
else else