diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 94d52bbf..25b9aa9b 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -113,7 +113,7 @@ $(function() { instances = menu_items[field].instances ; if (!instances.length > 0) { - swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning"); + swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning"); } if (instances.length > 0) { qty = 1; diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 3edbdf73..ad46ede6 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -5,7 +5,6 @@ class Origami::RequestBillsController < ApplicationController @sale = Sale.new sale_order=SaleOrder.new - # if shift = ShiftSale.current_open_shift(current_user.id) if !ShiftSale.current_shift.nil? order_id = params[:id] # order_id bk_order = BookingOrder.find_by_order_id(order_id) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 8c275785..fb066f7c 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -489,7 +489,7 @@ console.log("fffffffffffff") var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1); var total = $('#amount_due').text(); var amt = parseFloat(total) - parseFloat(othertotal); - $('#cash').text(parseFloat(amt).toFixed(2)); + $('#cash').text(parseFloat(amt).toFixed(1)); update_balance(); break; } @@ -579,7 +579,7 @@ console.log("fffffffffffff") $( "#loading_wrapper" ).hide(); if($('#balance').text() < 0){ swal({ - title: "Information!", + title: "Payment Successful!", text: 'Changed amount ' + $('#balance').text() * (-1), html: true, closeOnConfirm: false, @@ -595,7 +595,7 @@ console.log("fffffffffffff") }else{ $('#pay').text("Pay"); swal({ - title: "Information!", + title: "Payment Successful!", text: 'Thank You !', html: true, closeOnConfirm: false,