diff --git a/app/views/foodcourt/payments/show.html.erb b/app/views/foodcourt/payments/show.html.erb index d8a1d4b6..1aa59dd2 100755 --- a/app/views/foodcourt/payments/show.html.erb +++ b/app/views/foodcourt/payments/show.html.erb @@ -746,58 +746,60 @@ $(document).ready(function(){ data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:customer_mamber_card_no}, success: function(result){ if(result.status == true){ - swal({ - title: "Information!", - text: result.message, - type: 'success', - html: true, - closeOnConfirm: true, - closeOnCancel: false, - allowOutsideClick: false - }, function (isConfirm) { - $('.confirm').attr("disabled","disabled"); - sub_total = $('#sub-total').text(); - member = $('#membership_id').text(); + sub_total = $('#sub-total').text(); + member = $('#membership_id').text(); - $( "#loading_wrapper").show(); - var sale_id = $('#sale_id').text(); - // var item_row = $('.is_card'); + $( "#loading_wrapper").show(); + var sale_id = $('#sale_id').text(); + // var item_row = $('.is_card'); - // payment - var cash = $('#cash').text(); - var credit = $('#credit').text(); - var card = $('#card').text(); - var kbz_amt = "<%= @kbz_pay_amount %>"; - var is_kbz = false; - if (kbz_amt > 0) { - is_kbz = true - } + // payment + var cash = $('#cash').text(); + var credit = $('#credit').text(); + var card = $('#card').text(); + var kbz_amt = "<%= @kbz_pay_amount %>"; + var is_kbz = false; + if (kbz_amt > 0) { + is_kbz = true + } - var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all'; - // calculate_member_discount(sale_id,tax_type); - /* check credit payment or not*/ - var url = "<%= foodcourt_payment_cash_path %>"; - $.ajax({type: "POST", - url: url, - data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type + "&is_kbz=" + is_kbz+"&account_no="+customer_mamber_card_no, - success:function(result){ - /* start delete receipt no in first bill*/ - if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){ - var receipt_no = ($("#receipt_no").html()).trim(); - deleteReceiptNoInFirstBillData(receipt_no); - } - /* end delete receipt no in first bill*/ - localStorage.removeItem("cash"); - window.location.href = "<%= foodcourt_food_court_path %>"; - } - }); - var second_display_lookup = $("#display_type").val(); - if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){ - customer_display_view(null,"reload"); - } + var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all'; + // calculate_member_discount(sale_id,tax_type); + /* check credit payment or not*/ + var url = "<%= foodcourt_payment_cash_path %>"; + $.ajax({type: "POST", + url: url, + data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type + "&is_kbz=" + is_kbz+"&account_no="+customer_mamber_card_no, + success:function(result) { + /* start delete receipt no in first bill*/ + if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){ + var receipt_no = ($("#receipt_no").html()).trim(); + deleteReceiptNoInFirstBillData(receipt_no); + } + /* end delete receipt no in first bill*/ + localStorage.removeItem("cash"); + swal({ + title: "Payment Successful!", + text: "Thank You !", + type: 'success', + html: true, + closeOnConfirm: true, + closeOnCancel: false, + allowOutsideClick: false + }, + function (isConfirm) { + $('.confirm').attr("disabled","disabled"); + window.location.href = "<%= foodcourt_food_court_path %>"; + }); + $("#loading_wrapper").hide(); + } }); - }else{ + var second_display_lookup = $("#display_type").val(); + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){ + customer_display_view(null,"reload"); + } + } else { swal({ title: 'Oops', text: result.message, @@ -807,10 +809,10 @@ $(document).ready(function(){ closeOnCancel: false, allowOutsideClick: false }, function () { - window.location.href = '/foodcourt/sale/'+ sale_id +"/"+cashier_type + "/payment"; + location.reload(); }); + $("#loading_wrapper").hide(); } - $("#loading_wrapper").hide(); } }); }else{