diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 507e9b2f..33252efa 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -145,7 +145,7 @@ $(document).on('turbolinks:load', function() { }); /* start check first bill or not funs: */ -function checkReceiptNoInFirstBillData(receipt_no,payment=null) { +function checkReceiptNoInFirstBillData(receipt_no,payment) { // localStorage.removeItem('receipt_lists'); var status = false; if((receipt_no!=undefined) && (receipt_no!="")){ @@ -169,26 +169,26 @@ function checkReceiptNoInFirstBillData(receipt_no,payment=null) { } } -function createReceiptNoInFirstBillData(receipt_no,payment=null) { +function createReceiptNoInFirstBillData(receipt_no,payment) { var arr_data = []; var json_data = []; - if(localStorage.hasOwnProperty("receipt_lists")===true){ + if(localStorage.hasOwnProperty("receipt_lists") === true){ arr_data = JSON.parse(localStorage.getItem("receipt_lists")); json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no }); if (payment) { jdata = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); - jdata.push({receipt_no:receipt_no, payment:payment}); + jdata.push({'receipt_no':receipt_no,'payment':payment}); localStorage.setItem("receipt_lists",JSON.stringify(jdata)); } } if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){ - arr_data.push({receipt_no:receipt_no, payment:payment}); + arr_data.push({'receipt_no':receipt_no,'payment':payment}); localStorage.setItem("receipt_lists",JSON.stringify(arr_data)); } } function deleteReceiptNoInFirstBillData(receipt_no) { - if(localStorage.hasOwnProperty("receipt_lists")===true){ + if(localStorage.hasOwnProperty("receipt_lists") ===true ){ var arr_data = JSON.parse(localStorage.getItem("receipt_lists")); var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); localStorage.setItem("receipt_lists",JSON.stringify(json_data)); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 5471b5e4..b77e3b96 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -444,7 +444,7 @@ receipt_no = ($("#receipt_no").html()).trim(); } // console.log(checkReceiptNoInFirstBillData(receipt_no)); - if(checkReceiptNoInFirstBillData(receipt_no)){ + if(checkReceiptNoInFirstBillData(receipt_no,"")){ $("#pay").show(); }else{ $("#pay").hide(); @@ -574,7 +574,7 @@ success: function (result) { receipt_no = ($("#receipt_no").html()).trim(); if((receipt_no!=undefined) && (receipt_no!="")) - createReceiptNoInFirstBillData(receipt_no); + createReceiptNoInFirstBillData(receipt_no,""); location.reload(); } @@ -657,7 +657,7 @@ }); $('#move').on('click', function () { - var dining_id = "<%= @dining.id %>" + var dining_id = "<%= @dining.id %>"; window.location.href = '/origami/table/' + dining_id + "/movetable"; }) @@ -783,7 +783,7 @@ $.ajax({ type: 'POST', - data: {dining_id : dining_id}, + data: {'dining_id' : dining_id}, datatype: 'JSON', url: '/origami/check_in', success: function(data) { diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 1cf61690..b9d2cf8b 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -397,23 +397,23 @@ $('#pay').click(function() { sub_total = $('#sub-total').text(); if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) { - swal("Opps","Please Pay with MPU Payment","warning") + swal("Opps","Please Pay with MPU Payment","warning"); }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){ - swal("Opps","Please Pay with Redeem Payment","warning") + swal("Opps","Please Pay with Redeem Payment","warning"); }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){ - swal("Opps","Please Pay with Visa Payment","warning") + swal("Opps","Please Pay with Visa Payment","warning"); }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){ - swal("Opps","Please Pay with jcb Payment","warning") + swal("Opps","Please Pay with jcb Payment","warning"); } else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){ - swal("Opps","Please Pay with Master Payment","warning") + swal("Opps","Please Pay with Master Payment","warning"); }else{ $( "#loading_wrapper").show(); if($('#balance').text() > 0){ - swal ( "Oops" , "Insufficient Amount!" , "error" ); - $( "#loading_wrapper").hide(); + swal ( "Oops", "Insufficient Amount!" , "error" ); + $("#loading_wrapper").hide(); }else{ $(this).off("click"); var sale_id = $('#sale_id').text(); diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 06f7cfe8..3b7a5144 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -455,7 +455,7 @@ $(document).ready(function(){ receipt_no = ($("#receipt_no").html()).trim(); } // console.log(checkReceiptNoInFirstBillData(receipt_no)); - if(checkReceiptNoInFirstBillData(receipt_no)){ + if(checkReceiptNoInFirstBillData(receipt_no,"")){ $("#pay").show(); }else{ $("#pay").hide(); @@ -586,7 +586,7 @@ $("#first_bill").on('click', function(){ success:function(result){ receipt_no = ($("#receipt_no").html()).trim(); if((receipt_no!=undefined) && (receipt_no!="")) - createReceiptNoInFirstBillData(receipt_no); + createReceiptNoInFirstBillData(receipt_no,""); location.reload(); }