fixed conflict

app/controllers/api/api_controller.rb

@@ -1,11 +1,20 @@
 class Api::ApiController < ActionController::API
-  include TokenVerification, MultiTenancy
+
+  include MultiTenancy
+  include TokenVerification
   include ActionController::MimeResponds
+  include ActionView::Rendering
 
   # before_action :lookup_domain
   helper_method :current_token, :current_login_employee, :get_cashier
 
   private
+  # ActionView::Rendering override render_to_body breaks render :json,
+  # resulting in an ActionView::MissingTemplate error.
+  def render_to_body(options)
+    _render_to_body_with_renderer(options) || super
+  end
+
   #this is base api base controller to need to inherit.
   #all token authentication must be done here
   #response format must be set to JSON

app/controllers/application_controller.rb

@@ -1,5 +1,6 @@
 class ApplicationController < ActionController::Base
-  include LoginVerification, MultiTenancy
+  include MultiTenancy
+  include LoginVerification
 
   #before_action :check_installation
   protect_from_forgery with: :exception
@@ -17,5 +18,4 @@ class ApplicationController < ActionController::Base
     flash[:warning] = exception.message
     redirect_to root_path
   end
-
 end

app/controllers/base_crm_controller.rb

@@ -1,5 +1,7 @@
 class BaseCrmController < ActionController::Base
-  include LoginVerification, 
+
+  include MultiTenancy
+  include LoginVerification
 	layout "CRM"
 
   before_action :check_user

app/controllers/base_inventory_controller.rb

@@ -1,5 +1,7 @@
 class BaseInventoryController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
 	layout "inventory"
 
   before_action :check_user

app/controllers/base_oqs_controller.rb

@@ -1,5 +1,8 @@
 class BaseOqsController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
+  
   layout "OQS"
 
   before_action :check_user

app/controllers/base_origami_controller.rb

@@ -1,5 +1,7 @@
 class BaseOrigamiController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
   layout "origami"
 
   before_action :check_user

app/controllers/base_report_controller.rb

@@ -1,5 +1,7 @@
 class BaseReportController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
 	layout "application"
 
 	before_action :check_user

app/controllers/base_waiter_controller.rb

@@ -1,5 +1,7 @@
 class BaseWaiterController < ActionController::Base
-  include LoginVerification, MultiTenancy
+
+  include MultiTenancy
+  include LoginVerification
   layout "waiter"
 
   before_action :check_user

app/controllers/origami/home_controller.rb

@@ -4,8 +4,9 @@ class Origami::HomeController < BaseOrigamiController
 
   def index
     @webview = check_mobile
-    @tables   = Table.unscope(:order).all.active.order('status desc')
-    @rooms    = Room.unscope(:order).all.active.order('status desc')
+
+    @tables   = Table.unscope(:order).includes(:zone).all.active.order('status desc')
+    @rooms    = Room.unscope(:order).includes(:zone).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
     @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
 
@@ -21,8 +22,8 @@ class Origami::HomeController < BaseOrigamiController
     @print_settings = PrintSetting.get_precision_delimiter()
     @webview = check_mobile
 
-    @tables = Table.unscope(:order).all.active.order('status desc')
-    @rooms = Room.unscope(:order).all.active.order('status desc')
+    @tables = Table.unscope(:order).includes(:zone).all.active.order('status desc')
+    @rooms = Room.unscope(:order).includes(:zone).all.active.order('status desc')
     @complete = Sale.completed_sale("cashier")
     @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @customers = Customer.pluck("customer_id, name")

app/controllers/origami/payments_controller.rb

@@ -176,14 +176,14 @@ class Origami::PaymentsController < BaseOrigamiController
 
         # For Cashier by Zone
         # bookings = Booking.where("sale_id='#{sale_id}'")
-        bookings = Booking.find_by_sale_id(sale_id)
+        bookings = saleObj.bookings[0]
 
         shift = ShiftSale.current_open_shift(current_user.id)
         if !shift.nil?
           cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
         else
           if bookings.dining_facility_id.to_i > 0
-            table = DiningFacility.find(bookings.dining_facility_id)
+            table = bookings.dining_facility
             cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
             cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)