fixed conflict after merch dev for current shop

app/controllers/concerns/login_verification.rb

@@ -2,7 +2,7 @@ module LoginVerification
   extend ActiveSupport::Concern
   included do
     before_action :authenticate_session_token
-    helper_method :current_company,:current_shop, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration, :shop_detail
+    helper_method :current_company, :current_shop, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration, :shop_detail
   end
 
   #this is base api base controller to need to inherit.
@@ -17,7 +17,11 @@ module LoginVerification
   end
 
   def current_shop
-    @current_shop 
+    begin
+      return Shop.current_shop
+    rescue
+      return nil
+    end
   end
 
   def current_login_employee
@@ -36,9 +40,7 @@ module LoginVerification
 
   #Shop Name in Navbor
   def shop_detail
-    # shop_code ='262'
-    # @shop = Shop.find_by_shop_code(shop_code)
-    return @current_shop
+    @shop = current_shop
   end
 
   #check order reservation used