diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index ffb2bde4..0ac9df9f 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -42,12 +42,14 @@ class Origami::VoidController < BaseOrigamiController table_avaliable = true table = sale.bookings[0].dining_facility table.bookings.each do |booking| - if booking.sale.sale_status == 'new' - table_avaliable = false + if !booking.sale.nil? + if booking.sale.sale_status == 'new' + table_avaliable = false + end end end - if table_avaliable == true + if table_avaliable table.status = 'available' table.save end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index c076b81b..98fd4385 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -369,7 +369,7 @@ var master1 = $('#mastercount').text(); var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1); var total = $('#amount_due').text(); - var amt = parseFloat(total) - othertotal; + var amt = parseFloat(total) - parseFloat(othertotal); $('#cash').text(amt); update_balance(); break; @@ -517,7 +517,7 @@ var master = $('#mastercount').text(); var amount_due = $('#amount_due').text(); var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) - var result = amount_due - total; + var result = parseFloat(amount_due) - parseFloat(total); $('#balance').text(result.toFixed(2)); }