merge with r-19

2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
--- a/app/controllers/concerns/multi_tenancy.rb
+++ b/app/controllers/concerns/multi_tenancy.rb
@@ -4,7 +4,6 @@ module MultiTenancy
  included do
    set_current_tenant_through_filter if respond_to? :set_current_tenant_through_filter
    before_action :find_shop_by_subdomain_or_frist if respond_to? :before_action
-    helper_method :current_shop if respond_to? :helper_method
  end

  private