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

app/controllers/concerns/multi_tenancy.rb

@@ -0,0 +1,20 @@
+module MultiTenancy
+  extend ActiveSupport::Concern
+
+  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
+  def find_shop_by_subdomain_or_frist
+    if request.subdomain.present?
+      shop_code = request.subdomain.partition('-').last
+      shop = Shop.find_by(shop_code: shop_code)
+    else
+      shop = Shop.first
+    end
+    set_current_tenant(shop)
+  end
+end

app/controllers/concerns/number_formattable.rb

@@ -2,37 +2,43 @@ module NumberFormattable
   extend ActiveSupport::Concern
 
   def precision
-    @precision ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'precision'}
+    return @precision if defined? @precision
+    @number_formats = Lookup.number_formats if !defined? @number_formats
+    if @number_formats
+      @precision = @number_formats.find? { |x| x.name.parameterize.underscore == 'precision'}.value.to_i rescue nil
+    end
     if @precision.nil?
-      @print_settings ||= PrintSetting.get_precision_delimiter
+      @print_settings = PrintSetting.get_precision_delimiter if !defined? @number_formats
       if @print_settings
-        @precision = OpenStruct.new(value: @print_settings.precision.to_i)
+        @precision = @print_settings.precision.to_i
       else
-        @precision = OpenStruct.new(value: 2)
+        @precision = 2
       end
     end
-    @precison_value ||= @precision.value.to_i
   end
 
   def delimiter
-    @delimiter ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'delimiter'}
+    return @delimiter if defined? @delimiter
+    @number_formats = Lookup.number_formats if !defined? @number_formats
+    if @number_formats
+      @delimiter = @number_formats.find { |f| f.name.parameterize.underscore == 'delimiter'}.value.gsub(/\\u(\h{4})/) { |m| [$1].pack("H*").unpack("n*").pack("U*") } rescue nil
+    end
     if @delimiter.nil?
-      @print_settings ||= PrintSetting.get_precision_delimiter
+      @print_settings = PrintSetting.get_precision_delimiter if !defined? @number_formats
       if @print_settings && @print_settings.delimiter
-        @delimiter = OpenStruct.new(value: ",")
+        @delimiter = ","
       else
-        @delimiter = OpenStruct.new(value: "")
+        @delimiter = ","
       end
     end
-    @delimiter_value ||= @delimiter.value.to_s.gsub(/\\u(\h{4})/) { |m| [$1].pack("H*").unpack("n*").pack("U*") }
   end
 
   def strip_insignificant_zeros
-    @strip_insignificant_zeros ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'strip_insignificant_zeros'}
-    if @strip_insignificant_zeros.nil?
-      @strip_insignificant_zeros = OpenStruct.new(value: false)
+    return @strip_insignificant_zeros if defined? @strip_insignificant_zeros
+    @number_formats = Lookup.number_formats if !defined? @number_formats
+    if @number_formats
+      @strip_insignificant_zeros = @number_formats.find { |f| f.name.parameterize.underscore == 'strip_insignificant_zeros'}.value.in? ['1', 't', 'true', 'on', 'y', 'yes'] rescue false
     end
-    @strip_insignificant_zeros_value ||= ['1', 't', 'true', 'on', 'y', 'yes'].include? @strip_insignificant_zeros.value.to_s
   end
 
 	def number_format(number, options = {})
@@ -40,14 +46,16 @@ module NumberFormattable
 		# options[:delimiter] = options[:delimiter] || delimiter
 		options[:strip_insignificant_zeros] = options[:strip_insignificant_zeros] || strip_insignificant_zeros
     
+    number = number.to_f.round(options[:precision])
+
 		if options[:precision] > 0
 			if options[:strip_insignificant_zeros]
-				formatted = "%.12g" % number.round(options[:precision])
+				formatted = "%.12g" % number
 			else
-				formatted = "%.#{options[:precision]}f" % number.round(options[:precision])
+				formatted = "%.#{options[:precision]}f" % number
 			end
 		else
-			formatted = number.round(options[:precision]).to_i.to_s
+			formatted = number.to_i.to_s
 		end
 
 		if options[:delimiter] && !options[:delimiter].empty?