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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2017-06-16 10:22:21 +06:30
parent f06235c2cf 87c3546974
commit 0e21117f05
16 changed files with 254 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/api/bookings/show.json.jbuilder
View File

@@ -1,6 +1,11 @@
if (@booking)
json.id @booking.booking_id
json.status @booking.booking_status
if Sale.exists?(@booking.sale_id)
json.sale_status Sale.find(@booking.sale_id).sale_status
else
json.sale_status ""
end
json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y")
json.checkin_by @booking.checkin_by
json.table_name @booking.dining_facility.name
@@ -12,7 +17,7 @@ if (@booking)
end
@total_amount = 0.00
@total_tax = 0.00
if @booking.booking_orders
order_items = []
@booking.booking_orders.each do |bo|

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

@@ -287,7 +287,16 @@ $(document).on('click', '.cashier_number', function(event){
update_balance();
break;
case 'nett':
$('#cash').text($('#amount_due').text());
var credit1 = $('#credit').text();
var card1 = $('#others').text();
var paypar1 = $('#ppamount').text();
var visa1 = $('#visacount').text();
var jcb1 = $('#jcbcount').text();
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;
$('#cash').text(amt);
update_balance();
break;
}