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

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-19 10:53:13 +06:30
parent 3a8fba973e 555ff6e684
commit 1deac0107c
6 changed files with 45 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/controllers/api/bill_controller.rb
View File

@@ -27,29 +27,18 @@ class Api::BillController < Api::ApiController
end
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
#bill channel
check_in_out_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
printer = PrintSetting.all
unique_code="CheckInOutPdf"
if !check_in_out_pdf.empty?
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'CheckInOutPdf'
unique_code="CheckInOutPdf"
end
end
end
end
printer = PrintSetting.find_by_unique_code("CheckInOutPdf")
unique_code = "CheckInOutPdf"
booking = Booking.find_by_booking_id(booking.booking_id)
# print when complete click
print_settings = PrintSetting.find_by_unique_code(unique_code)
order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_check_in_out(print_settings, booking, table)
from = getCloudDomain #get sub domain in cloud mode
end
order_queue_printer = Printer::OrderQueuePrinter.new(printer)
if !printer.nil?
order_queue_printer.print_check_in_out(printer, booking, table)
end
end
elsif (params[:order_id])
@sale = Sale.new
@@ -108,16 +97,6 @@ class Api::BillController < Api::ApiController
# printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
end
#get cloud domain
def getCloudDomain
from = ""
if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain
end
return from
end
private
def bill_params
params.permit(:booking_id, :order_id)