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

edit in check time

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-14 15:22:49 +06:30
parent 671aa155cd
commit 61e4b930c8
7 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/origami/check_in_process_controller.rb
View File

@@ -27,8 +27,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => "TableBooking",
:checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
terminal_id = DiningFacility.find_by_id(@booking.dining_facility_id)
terminal = CashierTerminal.find_by_id(terminal_id.zone_id)
cashier_terminal = CashierTerminal.find_by_id(@dining_facility.zone_id)
if @booking.save!
@dining_facility.status = "occupied"
@@ -37,7 +36,6 @@ class Origami::CheckInProcessController < BaseOrigamiController
end
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
printer = PrintSetting.find_by_unique_code("CheckInOutPdf")
unique_code = "CheckInOutPdf"
booking = Booking.find_by_booking_id(@booking.booking_id)
@@ -47,7 +45,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
order_queue_printer = Printer::OrderQueuePrinter.new(printer)
if !printer.nil?
order_queue_printer.print_check_in_out(printer, terminal, booking, table)
order_queue_printer.print_check_in_out(printer, cashier_terminal, booking, table)
end
end
end

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

@@ -70,8 +70,8 @@ class Origami::RequestBillsController < ApplicationController
#check checkInOut pdf print
check_booking = Booking.find_by_sale_id(@sale_id)
checkout_time = Lookup.collection_of('checkout_time')
terminal_id = DiningFacility.find_by_id(check_booking.dining_facility_id)
terminal = CashierTerminal.find_by_id(terminal_id.zone_id)
terminal = DiningFacility.find_by_id(check_booking.dining_facility_id)
cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id)
if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server
unique_code = "CheckInOutPdf"
@@ -81,7 +81,7 @@ class Origami::RequestBillsController < ApplicationController
order_queue_printer = Printer::OrderQueuePrinter.new(printer)
if !printer.nil?
order_queue_printer.print_check_in_out(printer, terminal, check_booking, table)
order_queue_printer.print_check_in_out(printer, cashier_terminal, check_booking, table)
end
end
end