From e9b26f1684b3d454ebeba2a412bea0e07e825f30 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Tue, 7 Aug 2018 14:41:18 +0630
Subject: [PATCH] Edit in bill and request bill controller

---
 app/controllers/api/bill_controller.rb        | 26 +++++++-------
 app/controllers/application_controller.rb     | 30 ----------------
 .../concerns/login_verification.rb            | 34 ++++++++++++++++++-
 .../origami/request_bills_controller.rb       |  9 +++--
 4 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 9ad9c5ee..d98e25e0 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -45,21 +45,21 @@ class Api::BillController < Api::ApiController
             @sale_id = booking.sale_id
             @sale_data = Sale.find_by_sale_id(@sale_id)
           end
+
+          if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+          
+            unique_code = "CheckInOutPdf"
+            printer = PrintSetting.find_by_unique_code(unique_code)
+
+            # 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
 
-        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)
-
-          # 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  
 
       elsif (params[:order_id])
         order = Order.find(params[:order_id])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4ad0c42a..13de03e6 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,36 +21,6 @@ class ApplicationController < ActionController::Base
   def shop_detail
     @shop = Shop.first
   end
-
-  def order_reservation
-    order_reserve = Lookup.collection_of('order_reservation')
-    status = false
-    if !order_reserve.empty?
-        order_reserve.each do |order|
-            if order[0] == 'OrderReservation'
-              if order[1] == '1'
-                status = true
-              end
-            end
-        end
-    end
-    return status
-  end
-
-  def bank_integration
-    bank_integration = Lookup.collection_of('bank_integration')
-    status = false
-    if !bank_integration.empty?
-        bank_integration.each do |bank|
-            if bank[0] == 'Bank Integration'
-              if bank[1] == '1'
-                status = true
-              end
-            end
-        end
-    end
-    return status
-  end
 end
 
 
diff --git a/app/controllers/concerns/login_verification.rb b/app/controllers/concerns/login_verification.rb
index 590fdcbc..78864e34 100755
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -3,7 +3,7 @@ module LoginVerification
 
   included do
     before_action :authenticate_session_token
-    helper_method :current_company, :current_login_employee, :current_user, :get_cashier
+    helper_method :current_company, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration
   end
 
   #this is base api base controller to need to inherit.
@@ -30,6 +30,38 @@ module LoginVerification
     @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
   end
 
+  #check order reservation used
+  def order_reservation
+    order_reserve = Lookup.collection_of('order_reservation')
+    status = false
+    if !order_reserve.empty?
+        order_reserve.each do |order|
+            if order[0] == 'OrderReservation'
+              if order[1] == '1'
+                status = true
+              end
+            end
+        end
+    end
+    return status
+  end
+
+  #check bank integration used
+  def bank_integration
+    bank_integration = Lookup.collection_of('bank_integration')
+    status = false
+    if !bank_integration.empty?
+        bank_integration.each do |bank|
+            if bank[0] == 'Bank Integration'
+              if bank[1] == '1'
+                status = true
+              end
+            end
+        end
+    end
+    return status
+  end
+
   protected
   # Authenticate the user with token based authentication
   def authenticate   
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 961fc855..8cf0b07b 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -69,16 +69,15 @@ class Origami::RequestBillsController < ApplicationController
       else
        
         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(bk_order.booking_id)
+
+          unique_code = "CheckInOutPdf"        
+          printer = PrintSetting.find_by_unique_code(unique_code)
 
           # print when complete click 
           order_queue_printer = Printer::OrderQueuePrinter.new(printer)
 
           if !printer.nil?
-            order_queue_printer.print_check_in_out(printer, booking, table)
+            order_queue_printer.print_check_in_out(printer, check_booking, table)
           end
         end     
       end