Read NFC

2020-01-12 20:07:28 +06:30
parent 314cc507a3
commit dff2c69627
89 changed files with 492 additions and 469 deletions
--- a/app/controllers/concerns/login_verification.rb
+++ b/app/controllers/concerns/login_verification.rb
@@ -18,7 +18,7 @@ module LoginVerification

  def current_shop
    begin
-      return @shop
+      return Shop.current_shop
    rescue
      return nil
    end
@@ -40,7 +40,7 @@ module LoginVerification

  #Shop Name in Navbor
  def shop_detail
-    @shop = current_shop
+    @shop ||= current_shop
  end

  #check order reservation used
--- a/app/controllers/concerns/multi_tenancy.rb
+++ b/app/controllers/concerns/multi_tenancy.rb
@@ -12,8 +12,7 @@ module MultiTenancy
      shop_code = request.subdomain.partition('-').last
      @shop = Shop.find_by(shop_code: shop_code)
    else
-      # @shop = Shop.first
-      @shop = Shop.find_by(shop_code: '262')
+      @shop = Shop.first
    end
    set_current_tenant(@shop)
  end