antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-01-17 10:06:49 +01:00
commit 07603dfa84
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/admin.js
View File

@ -650,8 +650,9 @@ function selectCheckbox(obj)
function toogleShippingCost(obj) function toogleShippingCost(obj)
{ {
generateDiscount = $(obj).parent().find('#generateDiscount').attr("checked"); generateDiscount = $(obj).parent().find('#generateDiscount').attr("checked");
generateDiscount2 = $(obj).parent().find('#generateDiscount2').attr("checked");
generateCreditSlip = $(obj).parent().find('#generateCreditSlip').attr("checked"); generateCreditSlip = $(obj).parent().find('#generateCreditSlip').attr("checked");
if (generateDiscount != true && generateCreditSlip != true) if (generateDiscount != true && generateCreditSlip != true && generateDiscount2 != true)
{ {
$(obj).parent().find('#spanShippingBack input[type=checkbox]').attr("checked", false); $(obj).parent().find('#spanShippingBack input[type=checkbox]').attr("checked", false);
$(obj).parent().find('#spanShippingBack').css('display', 'none'); $(obj).parent().find('#spanShippingBack').css('display', 'none');