From 555ff6e68469da789c747350cd13d2ff7040e18b Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Tue, 19 Jun 2018 10:48:56 +0630 Subject: [PATCH] Delect Lookup for check in out --- README.md | 2 +- app/controllers/api/bill_controller.rb | 39 ++++------------ .../api/check_in_process_controller.rb | 37 ++++------------ .../origami/check_in_process_controller.rb | 36 ++++----------- .../origami/request_bills_controller.rb | 44 +++++-------------- app/models/print_setting.rb | 1 + 6 files changed, 41 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index fddd35bf..141e1f2c 100755 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ For Check in-out Printing ********* Check in-out Pdf ********* 1) settings/print_settings (a) Unique Code => CheckInOutPdf - 2) settings/lookups => { type:print_settings, name:CheckInOutPdf, value:1 } + (b) Heading Space => 5 For ReceiptBillA5Pdf *** change ReceiptBillPdf to ReceiptBillA5Pdf diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 4d60a2b6..a2982b83 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -32,29 +32,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 @@ -113,16 +102,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) diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb index cf2767ef..4eff8b2a 100644 --- a/app/controllers/api/check_in_process_controller.rb +++ b/app/controllers/api/check_in_process_controller.rb @@ -83,28 +83,19 @@ class Api::CheckInProcessController < Api::ApiController end if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - 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) table = DiningFacility.find(params[:dining_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 else render :json => { :status => true } end @@ -145,16 +136,6 @@ class Api::CheckInProcessController < Api::ApiController end end - #get cloud domain - def getCloudDomain - from = "" - if ENV["SERVER_MODE"] == 'cloud' - from = request.subdomain + "." + request.domain - end - - return from - end - private def check_in_process_params params.permit(:dining_id,:booking_id,:time) diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb index d763aac1..a1750b7f 100644 --- a/app/controllers/origami/check_in_process_controller.rb +++ b/app/controllers/origami/check_in_process_controller.rb @@ -31,27 +31,19 @@ class Origami::CheckInProcessController < BaseOrigamiController end if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - 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) table = DiningFacility.find(params[:dining_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 end respond = {:status => 'ok'} respond_to do |format| @@ -59,14 +51,4 @@ class Origami::CheckInProcessController < BaseOrigamiController end end - #get cloud domain - def getCloudDomain - from = "" - if ENV["SERVER_MODE"] == 'cloud' - from = request.subdomain + "." + request.domain - end - - return from - end - end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index a38f6408..c7bff41b 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -51,30 +51,20 @@ class Origami::RequestBillsController < ApplicationController result = {:status=> @status, :data => @sale.sale_id } render :json => result.to_json else + 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 - - booking = Booking.find_by_booking_id(bk_order.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 + printer = PrintSetting.find_by_unique_code("CheckInOutPdf") + unique_code = "CheckInOutPdf" + booking = Booking.find_by_booking_id(bk_order.booking_id) + + # print when complete click + order_queue_printer = Printer::OrderQueuePrinter.new(printer) + + if !printer.nil? + order_queue_printer.print_check_in_out(printer, booking, table) + end + end end else @status = false @@ -103,15 +93,5 @@ class Origami::RequestBillsController < ApplicationController # 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 end diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb index d97650fe..59c58001 100755 --- a/app/models/print_setting.rb +++ b/app/models/print_setting.rb @@ -5,4 +5,5 @@ class PrintSetting < ApplicationRecord def self.get_precision_delimiter PrintSetting.find_by_unique_code("CloseCashierPdf") end + end