diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 237bf321..94d52bbf 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -697,7 +697,8 @@ $(function() { qty = parseInt(data.attr('data-qty')); append = 0; - price = parseFloat(data.attr('data-price')).toFixed(2); + price = data.attr('data-price'); + instance_name = data.attr('data-instance'); if (instance_name == "undefined"){ instance = ''; @@ -720,7 +721,7 @@ $(function() { } $(item_row[i]).children('#item_qty').text(qty); - parseFloat($(item_row[i]).children('#item_price').text(price*qty)).toFixed(2); + parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; }else{ if (qty > 1) { diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index d2359593..d7afc4db 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -148,13 +148,14 @@ $(document).on('turbolinks:load', function() { function checkReceiptNoInFirstBillData(receipt_no,payment) { // localStorage.removeItem('receipt_lists'); var status = false; + var json_data = []; if((receipt_no!=undefined) && (receipt_no!="")){ if(localStorage.hasOwnProperty("receipt_lists")===true){ var arr_data = JSON.parse(localStorage.getItem("receipt_lists")); if (payment) { - var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no }); + json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no }); }else{ - var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); + json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no }); } if((arr_data.length) > (json_data.length)){ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index ff72d2bc..a49300d2 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -154,7 +154,7 @@ <% if type %>