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

Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

Browse Source
This commit is contained in:
NyanLinHtut
2019-10-07 15:24:11 +06:30
parent bca0ffc955 33670b450e
commit bcda6e98f0
9 changed files with 244 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/controllers/api/orders_controller.rb
View File

@@ -66,6 +66,17 @@ class Api::OrdersController < Api::ApiController
Rails.logger.debug "Table ID - " + params[:table_id].to_s Rails.logger.debug "Table ID - " + params[:table_id].to_s
if checkin_checkout_time(params[:booking_id]) if checkin_checkout_time(params[:booking_id])
if params[:booking_id].present?
booking = Booking.find(params[:booking_id])
end
if params[:table_id].present?
if booking.nil? || booking.dining_facility_id.to_i != params[:table_id].to_i
table = DiningFacility.find(params[:table_id])
booking = table.get_current_booking
end
end
#for extratime #for extratime
is_extra_time = false is_extra_time = false
extra_time = '' extra_time = ''
@@ -82,8 +93,7 @@ class Api::OrdersController < Api::ApiController
end end
} }
#end extra time #end extra time
puts params[:order_items]
puts "ORDER ITEMS"
# begin # begin
@order = Order.new @order = Order.new
@order.source = params[:order_source] @order.source = params[:order_source]
@@ -98,37 +108,13 @@ class Api::OrdersController < Api::ApiController
@order.is_extra_time = is_extra_time @order.is_extra_time = is_extra_time
@order.extra_time = extra_time @order.extra_time = extra_time
#Create Table Booking or Room Booking
if !params["booking_id"].nil?
# check booking id is already completed.
booking = Booking.find(params[:booking_id])
if booking
if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
if !booking.sale_id.nil?
sale_status = check_order_with_booking(booking)
if sale_status #Create Table Booking or Room Booking
return return_json_status_with_code(400, "bill requested") if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved'
end @order.new_booking = true
else else
@order.new_booking = false @order.new_booking = false
@order.booking_id = params[:booking_id] @order.booking_id = booking.booking_id
end
else
sale_status = check_order_with_table(params[:table_id])
if sale_status
return return_json_status_with_code(400, "bill requested")
end
end
end #booking exists
else
sale_status = check_order_with_table(params[:table_id])
if sale_status
# return false , @message = "bill requested"
return return_json_status_with_code(400, "bill requested")
end
end end
@status, @booking = @order.generate @status, @booking = @order.generate
@@ -140,7 +126,6 @@ class Api::OrdersController < Api::ApiController
type = 'order' type = 'order'
from = getCloudDomain #get sub domain in cloud mode from = getCloudDomain #get sub domain in cloud mode
ActionCable.server.broadcast "order_channel",table: table,type:type,from:from ActionCable.server.broadcast "order_channel",table: table,type:type,from:from
end end
# # for parallel order # # for parallel order
# remoteIP = "" # remoteIP = ""
@@ -211,12 +196,9 @@ class Api::OrdersController < Api::ApiController
def checkin_checkout_time(booking_id) def checkin_checkout_time(booking_id)
status = true status = true
if !booking_id.nil? if !booking_id.nil?
today = Time.now.utc if booking = Booking.find(booking_id)
booking = Booking.find(booking_id) if booking.checkout_at.present?
if !booking.nil? if booking.checkout_at.utc <= Time.now.utc
if !booking.checkout_at.nil?
checkout_time = booking.checkout_at.utc
if checkout_time <= today
status = false status = false
end end
end end
@@ -303,4 +285,3 @@ class Api::OrdersController < Api::ApiController
end end
end end

70
app/controllers/origami/addorders_controller.rb
View File

@@ -38,20 +38,10 @@ class Origami::AddordersController < BaseOrigamiController
@booking = @table.get_booking @booking = @table.get_booking
if @booking if @booking
@booking_id = @booking.booking_id @booking_id = @booking.booking_id
@order_items = Array.new @obj_order = @booking.orders.first
@booking.booking_orders.each do |booking_order| @customer = @obj_order.customer
order = Order.find(booking_order.order_id) @date = @obj_order.created_at
if (order.status == "new") @order_items = @booking.order_items
@obj_order = order
@customer = order.customer
@date = order.created_at
order.order_items.each do |item|
@order_items.push(item)
end
end
end
else
@booking = nil
end end
end end
@@ -102,8 +92,16 @@ class Origami::AddordersController < BaseOrigamiController
end end
def create def create
# Rails.logger.debug "Order Source - " + params[:order_source].to_s if params[:booking_id].present?
# Rails.logger.debug "Table ID - " + params[:table_id].to_s booking = Booking.find(params[:booking_id])
end
if params[:table_id].present?
if booking.nil? || booking.dining_facility_id.to_i != params[:table_id].to_i
table = DiningFacility.find(params[:table_id])
booking = table.get_current_booking
end
end
is_extra_time = false is_extra_time = false
extra_time = '' extra_time = ''
@@ -131,6 +129,7 @@ class Origami::AddordersController < BaseOrigamiController
else else
customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
end end
@order = Order.new @order = Order.new
@order.source = params[:order_source] @order.source = params[:order_source]
@order.order_type = params[:order_type] @order.order_type = params[:order_type]
@@ -144,43 +143,12 @@ class Origami::AddordersController < BaseOrigamiController
@order.is_extra_time = is_extra_time @order.is_extra_time = is_extra_time
@order.extra_time = extra_time @order.extra_time = extra_time
#Create Table Booking or Room Booking
if !params["booking_id"].nil? if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved'
# check booking id is already completed. @order.new_booking = true
booking = Booking.find(params[:booking_id])
if params[:table_id].to_i > 0
table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
else
table_status = true
end
if booking
if table_status && booking.booking_status != 'moved'
if !booking.sale_id.nil?
sale_status = check_order_with_booking(booking)
if sale_status
return return_json_status_with_code(400, "bill requested")
end
else else
@order.new_booking = false @order.new_booking = false
@order.booking_id = params[:booking_id] @order.booking_id = booking.booking_id
end
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
return return_json_status_with_code(400, "bill requested")
end
end
end
end #booking exists
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
# return false , @message = "bill requested"
return return_json_status_with_code(400, "bill requested")
end
end
end end
@status, @booking = @order.generate @status, @booking = @order.generate

119
app/controllers/origami/food_court_controller.rb
View File

@@ -59,34 +59,29 @@ class Origami::FoodCourtController < ApplicationController
@booking = @table.get_booking @booking = @table.get_booking
end end
@sale_id = params[:sale_id] @sale_id = @booking.sale_id
if @booking if @booking
@booking_id = @booking.booking_id @booking_id = @booking.booking_id
@order_items = Array.new @obj_order = @booking.orders.first
@booking.booking_orders.each do |booking_order| @customer = @obj_order.customer
order = Order.find(booking_order.order_id) @date = @obj_order.created_at
if (order.status == "new") @order_items = @booking.order_items
@obj_order = order
@customer = order.customer
@date = order.created_at
order.order_items.each do |item|
@order_items.push(item)
end
end
end
else
@booking = nil
end end
render "origami/addorders/detail" render "origami/addorders/detail"
end end
def update_modify_order def update_modify_order
Rails.logger.debug "Order Source - " + params[:order_source].to_s booking = Booking.find(params[:booking_id])
Rails.logger.debug "Table ID - " + params[:table_id].to_s sale = booking.sale
if sale && sale.sale_status != 'new'
render :json => { :status => false }
end
is_extra_time = false is_extra_time = false
extra_time = '' extra_time = ''
@cashier_type = "food_court" cashier_type = "food_court"
items_arr = [] items_arr = []
JSON.parse(params[:order_items]).each { |i| JSON.parse(params[:order_items]).each { |i|
@@ -108,81 +103,31 @@ class Origami::FoodCourtController < ApplicationController
} }
# begin # begin
@order = Order.new order = Order.new
@order.source = params[:order_source] order.source = params[:order_source]
@order.order_type = params[:order_type] order.order_type = params[:order_type]
@order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
@order.items = items_arr order.items = items_arr
@order.guest = params[:guest_info] order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true order.waiters = current_login_employee.name
@order.waiters = current_login_employee.name order.employee_name = current_login_employee.name
@order.employee_name = current_login_employee.name
@order.is_extra_time = is_extra_time order.is_extra_time = is_extra_time
@order.extra_time = extra_time order.extra_time = extra_time
#Create Table Booking or Room Booking order.new_booking = false
if !params["booking_id"].nil? order.booking_id = booking.booking_id
# check booking id is already completed.
booking = Booking.find(params[:booking_id])
if params[:table_id].to_i > 0
table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
else
table_status = true
end
if booking
if table_status && booking.booking_status != 'moved'
if !booking.sale_id.nil?
sale_status = check_order_with_booking(booking)
if sale_status
return return_json_status_with_code(400, "bill requested")
end
else
@order.new_booking = false
@order.booking_id = params[:booking_id]
end
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
return return_json_status_with_code(400, "bill requested")
end
end
end
end #booking exists
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
# return false , @message = "bill requested"
return return_json_status_with_code(400, "bill requested")
end
end
end
@status, @booking = @order.generate if order.generate
if(params[:sale_id][0,3] == "SAL") if sale
if @status && @booking && (@order.source == 'quick_service' || @order.source == 'food_court') Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking)
if params[:sale_id] render :json => { :status => true, :data => sale }
@sale = Sale.find(params[:sale_id])
if @order.table_id.to_i > 0
@table_id = @order.table_id
else else
@table_id = nil render :json => { :status => true, :data => 'OK' }
end end
update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
end
result = {:status=> true, :data => @sale }
render :json => result.to_json
end
elsif (params[:sale_id][0,3] == "BKI")
result = {:status=> true, :data => 'OK' }
render :json => result.to_json
else else
result = {:status=> true, :data => nil } render :json => { :status => false }
render :json => result.to_json
end end
end end

52
app/controllers/origami/pending_order_controller.rb
View File

@@ -13,6 +13,26 @@ class Origami::PendingOrderController < BaseOrigamiController
end end
def show def show
id = params[:sale_id]
if id.start_with?("SAL")
@sale = Sale.find(id)
if @sale.sale_status == "new"
@bookings = @sale.bookings.first
@status = "sale"
else
redirect_to "/origami/#{params[:type]}" and return
end
elsif id.start_with?("BKI")
@bookings = Booking.find(id)
@order = @bookings.orders.where(status: "new").first
@order_items = @bookings.order_items
@status = "order"
end
if @dining = @bookings.dining_facility
@table_id = @dining.id
end
@cashier_type = params[:type] @cashier_type = params[:type]
@sales = Sale.pending_sale(@cashier_type) @sales = Sale.pending_sale(@cashier_type)
@orders = Sale.pending_order(@cashier_type) @orders = Sale.pending_order(@cashier_type)
@@ -20,38 +40,6 @@ class Origami::PendingOrderController < BaseOrigamiController
@customers = Customer.pluck("customer_id, name") @customers = Customer.pluck("customer_id, name")
@occupied_table = @sales.count.length + @orders.count.length @occupied_table = @sales.count.length + @orders.count.length
@id = params[:sale_id]
if(@id[0,3] == "SAL")
@sale = Sale.find(@id)
@order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
@booking = BookingOrder.find_by_order_id(@order).booking_id
@bookings = Booking.find(@booking)
@status = "sale"
else
# @booking = BookingOrder.find_by_order_id(@order).booking_id
@bookings = Booking.find(@id)
@status = "order"
@order_items = Array.new
@bookings.booking_orders.each do |booking_order|
@order = Order.find(booking_order.order_id)
if (@order.status == "new")
@order.order_items.each do |item|
@order_items.push(item)
end
end
end
end
# puts @status
if @bookings.dining_facility_id.to_i > 0
@table_id = Booking.find(@bookings.booking_id).dining_facility_id
@dining = DiningFacility.find(@table_id)
else
@table_id = nil
@dining = nil
end
@customers = Customer.pluck("customer_id, name")
end end
def completed_sale def completed_sale

119
app/controllers/origami/quick_service_controller.rb
View File

@@ -68,34 +68,29 @@ class Origami::QuickServiceController < ApplicationController
@booking = @table.get_booking @booking = @table.get_booking
end end
@sale_id = params[:sale_id] @sale_id = @booking.sale_id
if @booking if @booking
@booking_id = @booking.booking_id @booking_id = @booking.booking_id
@order_items = Array.new @obj_order = @booking.orders.first
@booking.booking_orders.each do |booking_order| @customer = @obj_order.customer
order = Order.find(booking_order.order_id) @date = @obj_order.created_at
if (order.status == "new") @order_items = @booking.order_items
@obj_order = order
@customer = order.customer
@date = order.created_at
order.order_items.each do |item|
@order_items.push(item)
end
end
end
else
@booking = nil
end end
render "origami/addorders/detail" render "origami/addorders/detail"
end end
def update_modify_order def update_modify_order
Rails.logger.debug "Order Source - " + params[:order_source].to_s booking = Booking.find(params[:booking_id])
Rails.logger.debug "Table ID - " + params[:table_id].to_s sale = booking.sale
if sale && sale.sale_status != 'new'
render :json => { :status => false }
end
is_extra_time = false is_extra_time = false
extra_time = '' extra_time = ''
@cashier_type = "quick_service" cashier_type = "quick_service"
items_arr = [] items_arr = []
JSON.parse(params[:order_items]).each { |i| JSON.parse(params[:order_items]).each { |i|
@@ -117,81 +112,31 @@ class Origami::QuickServiceController < ApplicationController
} }
# begin # begin
@order = Order.new order = Order.new
@order.source = params[:order_source] order.source = params[:order_source]
@order.order_type = params[:order_type] order.order_type = params[:order_type]
@order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
@order.items = items_arr order.items = items_arr
@order.guest = params[:guest_info] order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true order.waiters = current_login_employee.name
@order.waiters = current_login_employee.name order.employee_name = current_login_employee.name
@order.employee_name = current_login_employee.name
@order.is_extra_time = is_extra_time order.is_extra_time = is_extra_time
@order.extra_time = extra_time order.extra_time = extra_time
#Create Table Booking or Room Booking order.new_booking = false
if !params["booking_id"].nil? order.booking_id = booking.booking_id
# check booking id is already completed.
booking = Booking.find(params[:booking_id])
if params[:table_id].to_i > 0
table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
else
table_status = true
end
if booking
if table_status && booking.booking_status != 'moved'
if !booking.sale_id.nil?
sale_status = check_order_with_booking(booking)
if sale_status
return return_json_status_with_code(400, "bill requested")
end
else
@order.new_booking = false
@order.booking_id = params[:booking_id]
end
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
return return_json_status_with_code(400, "bill requested")
end
end
end
end #booking exists
else
if params[:table_id].to_i > 0
sale_status = check_order_with_table(params[:table_id])
if sale_status
# return false , @message = "bill requested"
return return_json_status_with_code(400, "bill requested")
end
end
end
@status, @booking = @order.generate if order.generate
if(params[:sale_id][0,3] == "SAL") if sale
if @status && @booking && @order.source == 'quick_service' Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking)
if params[:sale_id] render :json => { :status => true, :data => sale }
@sale = Sale.find(params[:sale_id])
if @order.table_id.to_i > 0
@table_id = @order.table_id
else else
@table_id = nil render :json => { :status => true, :data => 'OK' }
end end
update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
end
result = {:status=> true, :data => @sale }
render :json => result.to_json
end
elsif (params[:sale_id][0,3] == "BKI")
result = {:status=> true, :data => 'OK' }
render :json => result.to_json
else else
result = {:status=> true, :data => nil } render :json => { :status => false }
render :json => result.to_json
end end
end end

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

@@ -16,7 +16,7 @@ class Origami::RequestBillsController < ApplicationController
@status = false @status = false
@error_message = "Operation failed, Could not request bill!" @error_message = "Operation failed, Could not request bill!"
else else
table = DiningFacility.find(booking.dining_facility_id) table = DiningFacility.find_by(id: booking.dining_facility_id)
if sale_data = booking.sale if sale_data = booking.sale
@status = true @status = true

4
app/models/order.rb
View File

@@ -57,13 +57,12 @@ class Order < ApplicationRecord
if self.is_extra_time if self.is_extra_time
if !booking.checkout_at.nil? if !booking.checkout_at.nil?
new_time = booking.checkout_at + self.extra_time.to_i new_time = booking.checkout_at + self.extra_time.to_i
booking.update_attributes(checkout_at: new_time) booking.update(checkout_at: new_time)
end end
end end
#end extra time #end extra time
end end
booking.save!
self.default_values self.default_values
# cashier already opened? # cashier already opened?
@@ -211,7 +210,6 @@ class Order < ApplicationRecord
self.customer = Customer.find(1) if self.customer_id.nil? self.customer = Customer.find(1) if self.customer_id.nil?
self.source = "emenu" if self.source.nil? self.source = "emenu" if self.source.nil?
self.order_type = "dine-in" if self.order_type.nil? self.order_type = "dine-in" if self.order_type.nil?
end end
protected protected

67
app/models/sale.rb
View File

@@ -2533,72 +2533,25 @@ end
def self.add_to_existing_pending_invoice(dining,sale_id,booking) def self.add_to_existing_pending_invoice(dining,sale_id,booking)
sale = Sale.find(sale_id)
existing_booking = Booking.find_by_sale_id(sale_id) existing_booking = Booking.find_by_sale_id(sale_id)
if dining.to_i > 0
table = DiningFacility.find(dining)
table.bookings.each do |booking|
# if !booking.checkout_at.nil?
# existing_booking.update_attributes(checkout_at: checkout_at)
# end
if booking.sale_id.nil?
booking.booking_orders.each do |booking_order|
booking.booking_status = 'moved' if booking.sale_id.nil? || booking.booking_id != existing_booking.booking_id
order = Order.find(booking_order.order_id) booking.orders.where(status: 'new').update(booking: existing_booking)
booking.update(booking_status: 'moved')
end
existing_booking.orders.where(status: 'new').each do |order|
order.status = 'billed' order.status = 'billed'
order.order_items.each do |item| order.order_items.each do |item|
item.order_item_status = 'billed' item.order_item_status = 'billed'
sale.add_item(item)
end end
# create sale item
saleobj = Sale.find(sale_id)
order.order_items.each do |orer_item|
saleobj.add_item (orer_item)
end
# Re-compute for add
saleobj.compute(order.source)
saleobj.save
order.save order.save
booking.save sale.compute(order.source)
sale.orders << order
end end
booking_order = BookingOrder.where('booking_id=?',booking)
booking_order.each do |bo|
bo.booking_id = existing_booking.booking_id
bo.save
end
end
end
else
if booking.sale_id.nil?
booking.booking_orders.each do |booking_order|
booking.booking_status = 'moved'
order = Order.find(booking_order.order_id)
order.status = 'billed'
order.order_items.each do |item|
item.order_item_status = 'billed'
end
# create sale item
saleobj = Sale.find(sale_id)
order.order_items.each do |orer_item|
saleobj.add_item (orer_item)
end
# Re-compute for add
saleobj.compute(order.source)
saleobj.save
order.save
booking.save
end
booking_order = BookingOrder.where('booking_id=?',booking)
booking_order.each do |bo|
bo.booking_id = existing_booking.booking_id
bo.save
end
end
end
end end
def self.get_shift_sale_items(sh_id) def self.get_shift_sale_items(sh_id)