diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index 939ff2eda..ae6a612e5 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -675,21 +675,14 @@ $('#payment_amount').val(jsonSummary.summary.total_price); if (jsonSummary.summary.is_advance_payment_active) { - $('#advance_payment_amount').html(formatCurrency(parseFloat(jsonSummary.summary.advance_payment_amount_ti), currency_format, currency_sign, currency_blank)); + $('#advance_payment_amount').html(formatCurrency(parseFloat(jsonSummary.summary.advance_payment_amount_with_tax), currency_format, currency_sign, currency_blank)); $('#advance_payment_amount_block').show(); } else { $('#advance_payment_amount_block').hide(); } // toggle payment fields - let isFreeOrder = false; - if (jsonSummary.summary.is_advance_payment_active && jsonSummary.summary.advance_payment_amount_with_tax == 0) { - isFreeOrder = true; - } else if (jsonSummary.summary.total_price == 0) { - isFreeOrder = true; - } - - if (isFreeOrder) { + if (jsonSummary.summary.total_price == 0) { // if free order $('#send_email_to_customer, [name="is_full_payment"], #payment_amount, #payment_type, #payment_module_name, #payment_transaction_id').closest('.form-group').hide(200); } else { $('#send_email_to_customer, [name="is_full_payment"], #payment_amount, #payment_type, #payment_module_name, #payment_transaction_id').closest('.form-group').show(200); @@ -1199,12 +1192,21 @@ } $('#order_message').val(jsonSummary.order_message); $('#payment_amount').siblings('.input-group-addon').html(currency_sign); + $('#payment_amount').val(jsonSummary.summary.total_price); if (jsonSummary.summary.is_advance_payment_active) { $('#advance_payment_amount').html(formatCurrency(parseFloat(jsonSummary.summary.advance_payment_amount_with_tax), currency_format, currency_sign, currency_blank)); $('#advance_payment_amount_block').show(); } else { $('#advance_payment_amount_block').hide(); } + + // toggle payment fields + if (jsonSummary.summary.total_price == 0) { // if free order + $('#send_email_to_customer, [name="is_full_payment"], #payment_amount, #payment_type, #payment_module_name, #payment_transaction_id').closest('.form-group').hide(200); + } else { + $('#send_email_to_customer, [name="is_full_payment"], #payment_amount, #payment_type, #payment_module_name, #payment_transaction_id').closest('.form-group').show(200); + } + resetBind(); } @@ -1622,12 +1624,20 @@ $(document).on('change', 'input[name="is_full_payment"]', function() { if (parseInt($('input[name="is_full_payment"]:checked').val())) { $('#payment_amount').attr('disabled', true); + + $('#payment_type, #payment_transaction_id').closest('.form-group').show(200); } else { $('#payment_amount').attr('disabled', false); + + managePaymentOptions(); } }); $(document).on('keyup', '#payment_amount', function() { + managePaymentOptions(); + }); + + function managePaymentOptions() { let paymentAmount = parseFloat($('#payment_amount').val().trim()); if (paymentAmount != 0) { @@ -1635,7 +1645,7 @@ } else { $('#payment_type, #payment_transaction_id').closest('.form-group').hide(200); } - }); + } function updateServiceProducts(element) { @@ -2161,11 +2171,11 @@
{l s='Advance payment amount: '} - {displayPrice price=$advance_payment_amount_ti currency=$currency->id} + {displayPrice price=$advance_payment_amount_with_tax currency=$currency->id}
{l s='Select or type the payment method using which booking will be created.'}