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:
Yan
2017-12-12 10:45:02 +06:30
parent 8298b1aebe e727b8b22e
commit 196746bd4f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/sale_payment.rb
View File

@@ -369,6 +369,7 @@ class SalePayment < ApplicationRecord
def table_update_status(sale_obj) def table_update_status(sale_obj)
status = true status = true
booking = Booking.find_by_sale_id(sale_obj.id) booking = Booking.find_by_sale_id(sale_obj.id)
if booking if booking
table = DiningFacility.find(booking.dining_facility_id) table = DiningFacility.find(booking.dining_facility_id)
bookings = table.bookings bookings = table.bookings
@@ -377,12 +378,15 @@ class SalePayment < ApplicationRecord
if tablebooking.sale_id if tablebooking.sale_id
if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void'
status = false status = false
else
status = true
end end
else else
status = false status = false
end end
end end
end end
if status if status
table.status = "available" table.status = "available"
table.save table.save

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

@@ -237,7 +237,7 @@
end end
if @status_order == 'order' && @status_sale != 'sale' if @status_order == 'order' && @status_sale != 'sale'
unless @order_items.nil? unless @order_items.nil? || @order_items.empty?
count = 0 count = 0
@order_items.each do |order_item| @order_items.each do |order_item|
count += 1 count += 1
@@ -306,7 +306,7 @@
<% <%
if @status_sale == 'sale' if @status_sale == 'sale'
unless @order_items.nil? unless @order_items.nil? || @order_items.empty?
%> %>
Pending New Order Pending New Order
<table class="table table-striped"> <table class="table table-striped">