merge with r-19

app/controllers/concerns/customers.rb

@@ -0,0 +1,18 @@
+module Customers
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :walkin, :takeaway if respond_to? :helper_method
+  end
+
+  def walkin
+    return @walkin if defined? @walkin
+    @walkin = Customer.walkin
+  end
+
+  def takeaway
+    return @takeaway if defined? @takeaway
+    @takeaway = Customer.takeaway
+  end
+
+end

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

app/controllers/concerns/number_formattable.rb

@@ -8,7 +8,7 @@ module NumberFormattable
       @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 if !defined? @number_formats
+      @print_settings = PrintSetting.get_precision_delimiter if !defined? @print_settings
       if @print_settings
         @precision = @print_settings.precision.to_i
       else
@@ -24,7 +24,7 @@ module NumberFormattable
       @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 if !defined? @number_formats
+      @print_settings = PrintSetting.get_precision_delimiter if !defined? @print_settings
       if @print_settings && @print_settings.delimiter
         @delimiter = ","
       else
@@ -42,10 +42,10 @@ module NumberFormattable
   end
 
 	def number_format(number, options = {})
-		options[:precision] = options[:precision] || precision
+    options[:precision] = options[:precision] || precision
 		# 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