Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop

This commit is contained in:
Marion Muszynski 2017-01-17 10:06:49 +01:00
commit 07603dfa84

View File

@ -650,8 +650,9 @@ function selectCheckbox(obj)
function toogleShippingCost(obj)
{
generateDiscount = $(obj).parent().find('#generateDiscount').attr("checked");
generateDiscount2 = $(obj).parent().find('#generateDiscount2').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').css('display', 'none');