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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-07-01 15:55:39 +06:30
parent 8afb2e7c5e 985604cd1f
commit 4750f03ea8
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/home_controller.rb
View File

@@ -20,7 +20,7 @@ class Origami::HomeController < BaseOrigamiController
@tables = Table.unscoped.all.active.order('status desc') @tables = Table.unscoped.all.active.order('status desc')
@rooms = Room.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc')
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
@status_order = "" @status_order = ""
@status_sale = "" @status_sale = ""

9
app/models/dining_facility.rb
View File

@@ -179,14 +179,5 @@ class DiningFacility < ApplicationRecord
end end
end end
end end
def get_current_booking_status
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}'").limit(1) #and checkout_at is null
if booking.count > 0 then
return booking[0]
else
return nil
end
end
end end

8
app/views/api/restaurant/zones/index.json.jbuilder
View File

@@ -6,7 +6,7 @@ if @zones
#List all tables #List all tables
json.tables zone.tables do |table| json.tables zone.tables do |table|
if table.is_active if table.is_active
booking = table.get_current_booking_status booking = table.get_current_booking
json.id table.id json.id table.id
json.name table.name json.name table.name
json.status table.status json.status table.status
@@ -18,7 +18,7 @@ if @zones
json.rooms zone.rooms do |room| json.rooms zone.rooms do |room|
if room.is_active if room.is_active
booking = room.get_current_booking_status booking = room.get_current_booking
json.id room.id json.id room.id
json.name room.name json.name room.name
json.status room.status json.status room.status
@@ -32,7 +32,7 @@ if @zones
else #list all tables and rooms with out zones else #list all tables and rooms with out zones
json.tables @all_tables do |table| json.tables @all_tables do |table|
if table.is_active if table.is_active
booking = table.get_current_booking_status booking = table.get_current_booking
json.id table.id json.id table.id
json.name table.name json.name table.name
json.status table.status json.status table.status
@@ -44,7 +44,7 @@ else #list all tables and rooms with out zones
json.rooms @all_rooms do |room| json.rooms @all_rooms do |room|
if room.is_active if room.is_active
booking = room.get_current_booking_status booking = room.get_current_booking
json.id room.id json.id room.id
json.name room.name json.name room.name
json.status room.status json.status room.status

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

@@ -146,7 +146,7 @@
<div class="card-block"> <div class="card-block">
<% <%
order_status = "" order_status = ""
sale_order = SaleOrder.find_by_order_id(order) sale_order = order.sale_orders.first
if sale_order if sale_order
unless sale_order.sale_id.nil? unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id) sale = Sale.find(sale_order.sale_id)