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

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
 
 

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