current shop changes

app/controllers/concerns/login_verification.rb

@@ -17,39 +17,33 @@ module LoginVerification
   end
 
   def current_shop
-    begin
-      shop_code ='262'
-      @shop =Shop.find_by_shop_code(shop_code)
-     return @shop
-    rescue
-      return nil
-    end
+    @current_shop 
   end
 
   def current_login_employee
-    @employee = Employee.find_by_token_session_and_shop_code(session[:session_token],@shop.shop_code)
+    @employee = Employee.find_by_token_session_and_shop_code(session[:session_token],@current_shop.shop_code)
   end
 
   def current_user
-    @current_user ||=  Employee.find_by_token_session_and_shop_code(session[:session_token],@shop.shop_code) if session[:session_token]
+    @current_user ||=  Employee.find_by_token_session_and_shop_code(session[:session_token],@current_shop.shop_code) if session[:session_token]
   end
 
   #  Get current Cashiers
   def get_cashier
-    @cashier = Employee.where("shop_code='#{@shop.shop_code}' and role = 'cashier' AND token_session <> ''")
+    @cashier = Employee.where("shop_code='#{@current_shop.shop_code}' and role = 'cashier' AND token_session <> ''")
   end
 
 
   #Shop Name in Navbor
   def shop_detail
-    shop_code ='262'
-    @shop = Shop.find_by_shop_code(shop_code)
-    return @shop
+    # shop_code ='262'
+    # @shop = Shop.find_by_shop_code(shop_code)
+    return @current_shop
   end
 
   #check order reservation used
   def order_reservation
-    order_reserve = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('order_reservation')
+    order_reserve = Lookup.where("shop_code='#{@current_shop.shop_code}'").collection_of('order_reservation')
     status = false
     if !order_reserve.empty?
         order_reserve.each do |order|
@@ -65,7 +59,7 @@ module LoginVerification
 
   #check bank integration used
   def bank_integration
-    bank_integration = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('bank_integration')
+    bank_integration = Lookup.where("shop_code='#{@current_shop.shop_code}'").collection_of('bank_integration')
     status = false
     if !bank_integration.empty?
         bank_integration.each do |bank|
@@ -90,8 +84,7 @@ module LoginVerification
     if (token)
       #@current_user = User.find_by(api_key: token)
       #Rails.logger.debug "token - " + token.to_s
-
-      @user = Employee.authenticate_by_token(token,current_shop)
+      @user = Employee.authenticate_by_token(token,@current_shop)
       if @user
         return true
         #Maybe log - login?
@@ -99,6 +92,21 @@ module LoginVerification
     end
   end
 
+  def authenticate_session_token
+    shop_code = 262
+    if (shop_code)
+      #@current_user = User.find_by(api_key: token)
+      #Rails.logger.debug "token - " + token.to_s
+      @current_shop = Shop.find_by_shop_code(shop_code)
+      if @current_shop
+        return true
+        #Maybe log - login?
+      end
+    else
+      @current_shop = Shop.first
+    end
+  end
+
   def render_unauthorized
     redirect_to root_path
   end