git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for void and float cal: error

Browse Source
This commit is contained in:
phyusin
2017-12-29 15:08:48 +06:30
parent 2a7eb7a12a
commit 23422aa5a7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/void_controller.rb
View File

@@ -42,12 +42,14 @@ class Origami::VoidController < BaseOrigamiController
table_avaliable = true table_avaliable = true
table = sale.bookings[0].dining_facility table = sale.bookings[0].dining_facility
table.bookings.each do |booking| table.bookings.each do |booking|
if booking.sale.sale_status == 'new' if !booking.sale.nil?
table_avaliable = false if booking.sale.sale_status == 'new'
table_avaliable = false
end
end end
end end
if table_avaliable == true if table_avaliable
table.status = 'available' table.status = 'available'
table.save table.save
end end

4
app/views/origami/payments/show.html.erb
View File

@@ -369,7 +369,7 @@
var master1 = $('#mastercount').text(); var master1 = $('#mastercount').text();
var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1); var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
var total = $('#amount_due').text(); var total = $('#amount_due').text();
var amt = parseFloat(total) - othertotal; var amt = parseFloat(total) - parseFloat(othertotal);
$('#cash').text(amt); $('#cash').text(amt);
update_balance(); update_balance();
break; break;
@@ -517,7 +517,7 @@
var master = $('#mastercount').text(); var master = $('#mastercount').text();
var amount_due = $('#amount_due').text(); var amount_due = $('#amount_due').text();
var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) 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)); $('#balance').text(result.toFixed(2));
} }