fixed conflict after merge with dev branch for report query updated

Gemfile.lock

@@ -375,5 +375,8 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   whenever
 
+RUBY VERSION
+   ruby 2.4.1p111
+   
 BUNDLED WITH
    2.0.2

README.md

@@ -279,6 +279,15 @@ For Food Court Settings On/Off
 	** '0' means can not use food court and '1' means can use food court **
 	=> settings/lookups => { type:food_court, name: FoodCourt, value:'{0 or 1}' }
 
+For Number Formats
+	Precision
+	=> settings/lookups => { lookup_type: number_format, name: precision, value: {0..2} }
+	Delimiter
+	=> settings/lookups => { lookup_type: number_format, name: delimiter, value: { ',', '\u0020', '', ... }
+	Strip insignificant zeros
+	=> settings/lookups => { lookup_type: number_format, name: strip_insignificant_zeros,
+		 value: {true: => ['1', 't', 'true', 'on', 'y', 'yes'], false: => ['0', 'f', 'false', 'off', 'n', 'no', ...] }
+
 /* Customer Types in lookups */
 1) settings/lookups => { type:customer_type, name: Dinein, value:Dinein }
 2) settings/lookups => { type:customer_type, name: Takeaway, value: Takeaway }

app/controllers/concerns/number_formattable.rb

@@ -0,0 +1,57 @@
+module NumberFormattable
+  extend ActiveSupport::Concern
+
+  def precision
+    @precision ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'precision'}
+    if @precision
+      @precision.value.to_i
+    else
+      @print_settings ||= PrintSetting.get_precision_delimiter
+      if @print_settings
+        @print_settings.precision.to_i
+      end
+    end || 2
+  end
+
+  def delimiter
+    @delimiter ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'delimiter'}
+    if @delimiter
+      @delimiter_value ||= @delimiter.value.to_s.gsub(/\\u(\h{4})/) { |m| [$1].pack("H*").unpack("n*").pack("U*") }
+    else
+      @print_settings ||= PrintSetting.get_precision_delimiter
+      if @print_settings
+        "," if @print_settings.delimiter
+      end
+    end || ""
+  end
+
+  def strip_insignificant_zeros
+    @strip_insignificant_zeros ||= Lookup.number_formats.find { |f| f.name.parameterize.underscore == 'strip_insignificant_zeros'}
+    if @strip_insignificant_zeros
+      ['1', 't', 'true', 'on', 'y', 'yes'].include? @strip_insignificant_zeros.value.to_s
+    end || false
+  end
+
+	def number_format(number, options = {})
+		options[:precision] = options[:precision] || precision
+		# options[:delimiter] = options[:delimiter] || delimiter
+		options[:strip_insignificant_zeros] = options[:strip_insignificant_zeros] || strip_insignificant_zeros
+
+		if options[:precision] > 0
+			if options[:strip_insignificant_zeros]
+				formatted = "%.12g" % number.round(options[:precision])
+			else
+				formatted = "%.#{options[:precision]}f" % number.round(options[:precision])
+			end
+		else
+			formatted = number.to_i.to_s
+		end
+		
+		if options[:delimiter] &&
+			formatted = formatted.gsub(/(\d)(?=\d{3}+(\.\d*)?$)/, "\\1#{options[:delimiter]}")
+		end
+
+		return formatted
+	end
+
+end

app/controllers/home_controller.rb

@@ -93,29 +93,39 @@ class HomeController < ApplicationController
   def dashboard
     @from, @to, @from_time, @to_time = get_date_range_from_params
     today = DateTime.now.strftime('%Y-%m-%d')
-    if !@from.nil? && !@to.nil?
-      if !@from_time.nil? && @to_time.nil?
-        @orders = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}' and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%m') between '#{@from_time}' and '#{@to_time}'").count()
-      else
-        @orders = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
-      end
-    else
-      @orders = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
-    end
-    if !@from.nil? && !@to.nil?
-      if !@from_time.nil? && @to_time.nil?
-        @sales = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}' and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%m') between '#{@from_time}' and '#{@to_time}'").count()
-      else
-        @sales = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') between '#{@from}' and '#{@to}'").count()
-      end
-    else
-      @sales = Sale::where("shop_code='#{@shop.shop_code}' and payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
-    end
-    @top_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"top",@shop).sum('i.qty')
-    @bottom_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"bottom",@shop).sum('i.qty')
-    @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time,@shop).sum(:grand_total)
+    @orders = Sale.where("payment_status = 'new' and sale_status = 'bill'")
+    @sales = Sale.completed
 
+    if !@from.nil? && !@to.nil?
+      @orders = @orders.date_between(@from, @to)
+      @sales = @sales.date_between(@from, @to)
+      if !@from_time.nil? && @to_time.nil?
+
+        @orders = @orders.time_between(@from_time, @to_time)
+        @sales = @sales.time_between(@from_time, @to_time)
+      end
+    else
+      @orders = @orders.date_on(today)
+      @sales = @sales.date_on(today)
+    end
+
+    if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account'  || current_user.role == 'supervisor')
+      if shift = ShiftSale.current_open_shift(current_user.id)
+        @orders = @orders.where(shift_sale_id: shift.id)
+        @sales = @sales.where(shift_sale_id: shift.id)
+      end
+    end
+
+    @top_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"top", @shop)
+    @bottom_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"bottom", @shop)
+    @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time, @shop)
+    # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
+    # .sum(:grand_total)
+    logger.debug 'hourly_sales<>><><><<<<<<>><<<><><><><><><><><><<>><'
+    logger.debug @hourly_sales.to_json
     employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time, @shop)
+                    # .sum("(CASE WHEN sp.payment_method='cash' THEN ((sp.payment_amount) - (sales.amount_changed)) ELSE (sp.payment_amount) END)")
+
     @employee_sales = []
     if !employee_sales.nil?
       employee_sales.each do |emp|
@@ -129,10 +139,12 @@ class HomeController < ApplicationController
     end
     @inventories    = StockJournal.inventory_balances(today,@from,@to,@from_time,@to_time,@shop).sum(:balance)
 
+
     @total_trans     = Sale.total_trans(today,current_user,@from,@to,@from_time,@to_time,@shop)
     @total_card     = Sale.total_card_sale(today,current_user,@from,@to,@from_time,@to_time,@shop)
     @total_credit   = Sale.credit_payment(today,current_user,@from,@to,@from_time,@to_time,@shop)
 
+
     @sale_data = Array.new
     @total_payment_methods = Sale.total_payment_methods(@shop,today,current_user,@from,@to,@from_time,@to_time)
 
@@ -150,16 +162,18 @@ class HomeController < ApplicationController
     @summ_sale              = Sale.summary_sale_receipt(@shop,today,current_user,@from,@to,@from_time,@to_time)
     @total_customer, @total_dinein, @total_takeaway, @total_membership  = Sale.total_customer(@shop,today,current_user,@from,@to,@from_time,@to_time)
 
+
     @total_order            = Sale.total_order(@shop, today,current_user,@from,@to,@from_time,@to_time)
-    @total_accounts         = Sale.total_account(@shop,today,current_user,@from,@to,@from_time,@to_time)
+    @total_accounts         = Account.select("accounts.id as account_id, accounts.title as title")
     @account_data = Array.new
     if !@total_accounts.nil?
       @total_accounts.each do |account|
         acc = Sale.account_data(@shop, account.account_id, today,current_user,@from,@to,@from_time,@to_time)
-        if !acc.nil?
+        if !acc.nil? && acc.cnt_acc > 0
           @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
         end
       end
+      @total_accounts = @total_accounts.reject.with_index { |x, i| @account_data[i].nil? }
     end
 
     @top_items         = Sale.top_items(@shop,today,current_user,@from,@to,@from_time,@to_time)

app/controllers/origami/dashboard_controller.rb

@@ -24,8 +24,9 @@ class Origami::DashboardController < BaseOrigamiController
     @total_customer, @total_dinein, @total_takeaway, @total_membership  = Sale.total_customer(@shop,today,current_user,@from,@to,@from_time,@to_time)
     # @total_other_customer   = Sale.total_other_customer(today,current_user)
 
+
     @total_order            = Sale.total_order(@shop, today,current_user)
-    @total_accounts         = Sale.total_account(@shop,today,current_user)
+    @total_accounts         = Account.select("accounts.id as account_id, accounts.title as title")
     @account_data = Array.new
     if !@total_accounts.nil?
          @total_accounts.each do |account|
@@ -34,6 +35,7 @@ class Origami::DashboardController < BaseOrigamiController
             @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
           end
         end
+        @total_accounts = @total_accounts.reject.with_index { |x, i| @account_data[i].nil? }
     else
         @account_data = nil
     end

app/controllers/origami/sale_edit_controller.rb

@@ -163,8 +163,6 @@ class Origami::SaleEditController < BaseOrigamiController
     #   end
     # end
 
-    sale.compute_by_sale_items(sale.total_discount, nil, order_source)
-
     ProductCommission.edit_product_commission(saleitemObj,sale.shop_code)
   end
 

app/controllers/reports/receipt_no_detail_controller.rb

@@ -10,11 +10,11 @@ authorize_resource :class => false
 	    @shift = ''
 	    if params[:shift_name].to_i != 0
 
-	      @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED).where("shift_sales.shop_code='#{@shop.shop_code}'")
+	      @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
 	      @shift_sale = ShiftSale.find(params[:shift_name])
 	      if to.blank?
-	        @shift = ShiftSale.where("shift_started_at = ? and shift_closed_at is NULL and shop_code='#{@shop.shop_code}'",@shift_sale.shift_started_at)
+	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',@shift_sale.shift_started_at)
 	      else
 	        if @shift_sale.shift_closed_at.blank?
 	          @shift = ShiftSale.where("shift_started_at = ? and shift_closed_at is NULL and shop_code='#{@shop.shop_code}'",@shift_sale.shift_started_at)
@@ -25,8 +25,10 @@ authorize_resource :class => false
 	    end
 
 	    payment_type = params[:payment_type]
+
         @sale_data = Sale.get_shift_sales_by_receipt_no_detail(@shift_sale_range,@shift,from,to,payment_type).where("sales.shop_code='#{@shop.shop_code}'")
 
+
         @from       = from
         @to         = to
         # get printer info

app/helpers/application_helper.rb

@@ -1,4 +1,6 @@
 module ApplicationHelper
+	include NumberFormattable
+
 	def flash_class(level)
 		case level
 			when :notice then "alert alert-info fade-in"
@@ -7,4 +9,5 @@ module ApplicationHelper
 			when :alert then "alert alert-error fade-in"
 		end
 	end
+
 end

app/models/inventory_definition.rb

@@ -23,19 +23,8 @@ class InventoryDefinition < ApplicationRecord
     end
   end
 
-  def self.find_product_in_inventory(item,shop_code=nil)
-    # unless instance_code.empty?
-    #   instance_code = instance_code.to_s
-    #   instance_code[0] = ""
-    #   instance_code = instance_code.chomp("]")
-    # else
-    #   instance_code = '"0"'
-    # end
-    #
-    # if prod = InventoryDefinition.where("item_code IN(#{instance_code})")
-    #   puts "found prodcut+++++++++++++++++++++++++++++++++++==="
-    #   puts prod.to_json
-    # end
+
+  def self.find_product_in_inventory(item)
    if product = InventoryDefinition.find_by_item_code_and_shop_code(item.item_instance_code,shop_code)
       if stock_check_item = StockCheckItem.find_by_item_code_and_shop_code(item.item_instance_code,shop_code)
         return true, product
@@ -44,11 +33,11 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.check_balance(item, inventory_definition) # item => saleItemOBj
+
    stock = StockJournal.where("shop_code='#{inventory_definition.shop_code}' and item_code=?", item.item_instance_code).order("id DESC").first
    unless stock.nil?
      modify_balance(item, stock, inventory_definition)
    else
-       puts "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OUT OF STOCK >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
      StockJournal.add_to_journal(item.item_instance_code, item.qty, 0, "out of stock", inventory_definition, item.id, StockJournal::SALES_TRANS)
    end
   end
@@ -75,6 +64,7 @@ class InventoryDefinition < ApplicationRecord
     elsif item.is_a? SaleItem
       trans_type = StockJournal::SALES_TRANS
     end
+    # StockJournal.add_to_journal(instance_code, qty, stock.balance, remark, inventory_definition, item.id, trans_type)
     StockJournal.add_to_journal(item.item_instance_code, qty, stock.balance, remark, inventory_definition, item.id, trans_type)
     check_item.different = check_item.different - qty
     check_item.save

app/models/lookup.rb

@@ -3,6 +3,8 @@ class Lookup < ApplicationRecord
   has_many :accounts
   belongs_to :shop
 
+  scope :number_formats, -> { where(lookup_type: 'number_format')}
+
   def available_types
     {'Employee Roles' => 'employee_roles',
       'Dining Facilities Status' => 'dining_facilities_status',

app/models/order_item.rb

@@ -125,42 +125,14 @@ class OrderItem < ApplicationRecord
   end
 
   def update_stock_journal
-    if self.set_menu_items.present?
-      puts "set menu itemsssssssss???????????????????????????????"
-      puts items = JSON.parse(self.set_menu_items)
-      instance_code = Array.new
-      count = 0
-      items.each { |i|
-        instance_code.push(i["item_instance_code"])
-      }
-      print instance_code
-    end
+
+    unless MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
       if self.qty != self.qty_before_last_save
-      found, inventory_definition = InventoryDefinition.find_product_in_inventory(self,self.order.shop_code)
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
         if found
           InventoryDefinition.check_balance(self, inventory_definition)
         end
       end
-  #   if self.qty > self.qty_was
-  #     credit = 0
-  #     debit = self.qty.to_i - self.qty_was.to_i
-  #   else
-  #     credit = self.qty_was.to_i - self.qty.to_i
-  #     debit = 0
-  #   end
-  #   if credit != debit
-  #     defination = InventoryDefinition.find_by_item_code(self.item_instance_code)
-  #     stock = StockJournal.where('item_code = ?', self.item_instance_code).order("id DESC").first
-  #     journal = StockJournal.create(
-  #       item_code: self.item_instance_code,
-  #       credit: credit,
-  #       debit: debit,
-  #       balance: stock.balance - debit + credit,
-  #       inventory_definition_id: defination.id,
-  #       remark: 'ok',
-  #       trans_ref: self.order.id,
-  #       trans_type: StockJournal::SALES_TRANS
-  #     )
-  #   end
+    end
   end
 end

app/models/sale.rb

@@ -1,4 +1,5 @@
 class Sale < ApplicationRecord
+  include NumberFormattable
   self.primary_key = "sale_id"
 
   #primary key - need to be unique generated for multiple shops
@@ -7,12 +8,15 @@ class Sale < ApplicationRecord
   belongs_to :cashier, foreign_key: "cashier_id", class_name: "Employee"
   belongs_to :customer, :optional => true
   belongs_to :shift_sale
+  has_one :survey, foreign_key: "receipt_no"
+  has_many :sale_audits
   has_many :sale_items
   has_many :sale_discount_items
   has_many :sale_discounts
   has_many :sale_taxes
   has_many :sale_payments
   has_many :sale_orders
+  has_many :sale_payments_for_credits, through: :sale_audits
   has_many :orders, through: :sale_orders
   has_many :order_items, through: :sale_orders
   has_many :bookings
@@ -28,7 +32,9 @@ class Sale < ApplicationRecord
   scope :date_on, -> (date) { where("DATE(CONVERT_TZ(receipt_date, '+00:00', ?)) = ?", Time.zone.formatted_offset, date) }
   scope :date_between, -> (from, to) { where("DATE(CONVERT_TZ(receipt_date, '+00:00', ?)) BETWEEN ? AND ?", Time.zone.formatted_offset, from, to) }
   scope :time_between, -> (from, to) { where("TIME(CONVERT_TZ(receipt_date, '+00:00', ?)) BETWEEN ? AND ?", Time.zone.formatted_offset, from, to) }
-  scope :along_with_sale_payments_except_void, -> { joins("LEFT JOIN sale_payments on sales.sale_status != 'void' AND sale_payments.sale_id = sales.sale_id AND DATE(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30')) = DATE(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'))") }
+
+  scope :along_with_sale_payments_except_void, -> { joins("LEFT JOIN sale_payments on sales.sale_status != 'void' AND sale_payments.sale_id = sales.sale_id AND DATE(CONVERT_TZ(sale_payments.created_at,'+00:00', '#{Time.zone.formatted_offset}')) = DATE(CONVERT_TZ(sales.receipt_date,'+00:00', '#{Time.zone.formatted_offset}'))") }
+
   def qty_of(item_instance_code)
     order_items.select(:order_items_id, :item_instance_code, 'SUM(qty) as qty').where(item_instance_code: item_instance_code).group(:item_instance_code).first
   end
@@ -524,12 +530,51 @@ class Sale < ApplicationRecord
     tax_profiles = unique_tax_profiles(order_source, self.customer_id)
 
     # #Creat new tax records
-    if self.payment_status != 'foc'
+    if self.payment_status != 'foc' && tax_type.to_s == "all"
       tax_profiles.each do |tax|
         sale_tax = SaleTax.new(:sale => self)
         sale_tax.tax_name = tax.name
         sale_tax.tax_rate = tax.rate
 
+        # substract , to give after discount
+        total_tax = total_taxable - total_discount
+        #include or execulive
+        if tax.inclusive
+          tax_incl_exec = "inclusive"
+          rate = tax.rate
+          divided_value = (100 + rate)/rate
+          sale_tax.tax_payable_amount = total_tax / divided_value
+        else
+          sale_tax.tax_payable_amount = total_tax * tax.rate / 100
+        end
+
+        sale_tax.inclusive = tax.inclusive
+        sale_tax.save
+
+        if !tax.inclusive
+          total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+        end
+
+        #new taxable amount is standard rule for step by step
+        if shop.calc_tax_order
+          total_taxable = total_taxable + sale_tax.tax_payable_amount
+        end
+      end
+    elsif tax_type.to_s == "no_tax"
+      tax_profiles.each do |tax|
+        sale_tax = SaleTax.new(:sale => self)
+        sale_tax.tax_name = tax.name
+        sale_tax.tax_rate = 0
+        sale_tax.tax_payable_amount = 0
+        sale_tax.inclusive = tax.inclusive
+        sale_tax.save
+      end
+    elsif tax_type.to_s == "Commercial Tax"
+      tax_profiles.each do |tax|
+        if tax.name == tax_type.to_s
+          sale_tax = SaleTax.new(:sale => self)
+          sale_tax.tax_name = tax.name
+          sale_tax.tax_rate = tax.rate
           # substract , to give after discount
           total_tax = total_taxable - total_discount
           #include or execulive
@@ -550,6 +595,33 @@ class Sale < ApplicationRecord
           sale_tax.save
         end
       end
+    elsif tax_type.to_s == "Service Charges"
+      tax_profiles.each do |tax|
+        if tax.name == tax_type.to_s
+          sale_tax = SaleTax.new(:sale => self)
+          sale_tax.tax_name = tax.name
+          sale_tax.tax_rate = tax.rate
+          # substract , to give after discount
+          total_tax = total_taxable - total_discount
+          #include or execulive
+          if tax.inclusive
+            tax_incl_exec = "inclusive"
+            rate = tax.rate
+            divided_value = (100 + rate)/rate
+            sale_tax.tax_payable_amount = total_tax / divided_value
+          else
+            sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+            total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
+          end
+          #new taxable amount is standard rule for step by step
+          if shop.calc_tax_order
+            total_taxable = total_taxable + sale_tax.tax_payable_amount
+          end
+          sale_tax.inclusive = tax.inclusive
+          sale_tax.save
+        end
+      end
+    end
     self.tax_type = tax_incl_exec
     self.total_tax = total_tax_amount
   end
@@ -595,6 +667,12 @@ class Sale < ApplicationRecord
         sale_tax.tax_payable_amount = total_tax / divided_value
       else
         sale_tax.tax_payable_amount = total_tax  * tax.rate / 100
+      end
+
+      sale_tax.inclusive = tax.inclusive
+      sale_tax.save
+
+      if !tax.inclusive
         total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
       end
 
@@ -602,9 +680,6 @@ class Sale < ApplicationRecord
       if shop.calc_tax_order
         total_taxable = total_taxable + sale_tax.tax_payable_amount
       end
-
-      sale_tax.inclusive = tax.inclusive
-      sale_tax.save
     end
     self.tax_type   = tax_incl_exec
     self.total_tax  = total_tax_amount
@@ -1194,7 +1269,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       payment_type = " and sale_payments.payment_method = '#{payment_type}'"
     end
 
-    query = Sale.all.select("sales.*,sale_payments.*,df.name,df.type")
+    query = Sale.includes(:sale_items).select("sales.*,sale_payments.*,df.name,df.type")
               .where("sale_status= 'completed' and sale_payments.payment_amount != 0 #{payment_type}")
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .joins("join bookings on bookings.sale_id = sales.sale_id")
@@ -1212,17 +1287,16 @@ end
 
 def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
-    if payment_type.blank?
-      payment_type = ''
-    else
-      payment_type = " and sale_payments.payment_method = '#{payment_type}'"
-    end
 
-    query = Sale.select("sales.*,bookings.dining_facility_id as table_id")
-            .where("sale_status= 'completed' and sale_payments.payment_amount != 0 #{payment_type}")
-            .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-            .joins("join bookings on bookings.sale_id = sales.sale_id")
-            .group("sales.sale_id")
+    query = Sale.includes([:customer, :survey, :sale_payments])
+            .includes(:bookings => :dining_facility)
+            .select("sales.*, SUM(sale_payments.payment_amount) AS payments_for_credits_amount")
+            .joins(:bookings)
+            .left_joins(:sale_payments_for_credits)
+            .completed
+            .where.not(total_amount: 0)
+            .group(:sale_id)
+            .order(:receipt_date)
     if shift.present?
       query = query.where("sales.shift_sale_id in (?)", shift.to_a)
     elsif shift_sale_range.present?
@@ -1230,6 +1304,9 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay
     else
       query = query.where("sales.receipt_date between ? and ?",from,to)
     end
+
+    ActiveRecord::Associations::Preloader.new.preload(query, :sale_items, SaleItem.where.not(price: 0))
+
     return query
 end
 
@@ -1502,102 +1579,55 @@ end
      return tax
   end
 
-  def self.top_bottom_products(today,current_user,from,to,from_time,to_time,type,shop)
-    if (!from.nil? && !to.nil?) && (from != "" && to!="")
-      if current_user.nil?
-        query = Sale.top_bottom(shop,today,nil,from,to,from_time,to_time)
+  def self.top_bottom_products(today,current_user,from,to,from_time,to_time,type)
+    query = Sale.joins("JOIN sale_items ON sale_items.sale_id = sales.sale_id")
+        .completed
+        .where("qty > 0 AND price > 0")
+        .group("SUBSTRING_INDEX(product_name, ' - ', 1)")
 
-        if type == "top"
-          query =   query.group('i.product_name')
-                  .order("SUM(i.qty) DESC").limit(20)
-        elsif type == "bottom"
-          query =   query.group('i.product_name')
-                  .order("SUM(i.qty) ASC").limit(20)
+    if !from.nil? && !to.nil?
+      query = query.date_between(from, to)
+      if !from_time.nil? && !to_time.nil?
+        query = query.time_between(from_time, to_time)
       end
     else
-        if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor'
-          query = Sale.top_bottom(shop,today,nil,from,to,from_time,to_time)
-          if type == "top"
-            query =   query.group('i.product_name')
-                    .order("SUM(i.qty) DESC").limit(20)
-          elsif type == "bottom"
-            query =   query.group('i.product_name')
-                    .order("SUM(i.qty) ASC").limit(20)
+      query = query.date_on(today)
     end
-        else
-          shift = ShiftSale.current_open_shift(current_user)
-          if !shift.nil?
-            query = Sale.top_bottom(shop,today,shift,from,to,from_time,to_time)
-            if type == "top"
-              query =   query.group('i.product_name')
-                      .order("SUM(i.qty) DESC").limit(20)
-            elsif type == "bottom"
-              query =   query.group('i.product_name')
-                      .order("SUM(i.qty) ASC").limit(20)
-            end
-          end
-        end
-      end
-    else
-      if current_user.nil?
-        query = Sale.top_bottom(shop,today).group('i.product_name')
+    if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor')
+      if shift = ShiftSale.current_open_shift(current_user.id)
+        query = query.where("shift_sale_id='#{shift.id}'")
 
-        if type == "top"
-          query  = query.order("SUM(i.qty) DESC").limit(20)
-        elsif type == "bottom"
-          query  = query.order("SUM(i.qty) ASC").limit(20)
-        end
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor'
-          query = Sale.top_bottom(shop,today).group('i.product_name')
-          if type == "top"
-            query  = query.order("SUM(i.qty) DESC").limit(20)
-          elsif type == "bottom"
-            query  = query.order("SUM(i.qty) ASC").limit(20)
-          end
-        else
-          shift = ShiftSale.current_open_shift(current_user)
-          if !shift.nil?
-            query = Sale.top_bottom(shop,today,shift).group('i.product_name')
-            if type == "top"
-              query  = query.order("SUM(i.qty) DESC").limit(20)
-            elsif type == "bottom"
-              query  = query.order("SUM(i.qty) ASC").limit(20)
-            end
-          end
-        end
-      end
       end
     end
 
-  def self.hourly_sales(today,current_user,from,to,from_time,to_time,shop)
-    if (!from.nil? && !to.nil?) && (from != "" && to!="")
-      if current_user.nil?
-        query = Sale.hourly_sale_data(shop,today,nil,from,to,from_time,to_time)
+    if type == "top"
+      query = query.order("SUM(qty) DESC")
     else
-        if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor'
-          query = Sale.hourly_sale_data(shop,today,nil,from,to,from_time,to_time)
-        else
-          shift = ShiftSale.current_open_shift(current_user)
-          if !shift.nil?
-            query = Sale.hourly_sale_data(shop,today,shift,from,to,from_time,to_time)
+      query = query.order("SUM(qty) ASC")
     end
+
+    query.limit(20).sum('qty')
   end
+
+  def self.hourly_sales(today,current_user,from,to,from_time,to_time)
+    query = Sale.group("date_format(CONVERT_TZ(receipt_date,'+00:00', '+06:30'), '%I %p')")
+    .order('receipt_date').completed
+
+    if !from.nil? && !to.nil?
+      query = query.date_between(from, to)
+      if !from_time.nil? && !to_time.nil?
+        query = query.time_between(from_time, to_time)
       end
     else
-      if current_user.nil?
-        query = Sale.hourly_sale_data(shop,today)
-      else
-        if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor'
-          query = Sale.hourly_sale_data(shop,today)
-        else
-          shift = ShiftSale.current_open_shift(current_user)
-          if !shift.nil?
-            query = Sale.hourly_sale_data(shop,today,shift)
-          end
-        end
+      query = query.date_on(today)
+    end
+
+    if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor')
+      if shift = ShiftSale.current_open_shift(current_user.id)
+        query = query.where("shift_sale_id='#{shift.id}'")
       end
     end
+    query.sum(:grand_total)
   end
 
   def self.employee_sales(today,current_user,from,to,from_time,to_time,shop)
@@ -1881,28 +1911,7 @@ end
     query = query.first
   end
 
-  def self.total_account(shop,today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
-    query = Sale.select("distinct b.id as account_id, b.title as title")
-            .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-            .joins("JOIN accounts as b ON b.id = a.account_id")
-            .where("sales.shop_code='#{shop.shop_code}' and sales.sale_status = 'completed'")
-    if (!from.nil? && !to.nil?) && (from != "" && to!="")
-      query = query.date_between(from, to)
-      if !from_time.nil? && !to_time.nil?
-        query = query.time_between(from_time, to_time)
-      end
-    else
-      query = query.date_on(today)
-    end
-    if current_user.present? && !(current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account'  || current_user.role == 'supervisor')
-      if shift = ShiftSale.current_open_shift(current_user)
-        query = query.where("sales.shift_sale_id = ?", shift.id)
-      end
-    end
-    return query
-  end
-
-  def self.account_data(shop,account_id, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
+  def self.account_data(account_id, today, current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil)
     query = Sale.select("count(*) as cnt_acc, SUM(a.price) as total_acc")
             .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
             .where("sales.shop_code='#{shop.shop_code}' and sales.sale_status = 'completed' and a.account_id ='#{account_id}'")
@@ -2097,61 +2106,8 @@ def unique_tax_profiles(order_source, customer_id)
   return tax_data
 end
 
-def self.top_bottom(shop,today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil)
-  if !from.nil? && !to.nil?
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
-                            " i.price as unit_price,i.product_name")
-              .joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
-              if !from_time.nil? && !to_time.nil?
-    query =     query.where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                    " and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}' and sale_status= 'completed'")
-              else
-    query =     query.where("shop_code='#{shop.shop_code}' and (i.qty > 0 and i.price > 0) and DATE_FORMAT(CONVERT_TZ(receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'"+
-                    " and sale_status= 'completed'")
-              end
-              if !shift.nil?
-                query = query.where("shift_sale_id='#{shift.id}'")
-              end
-  else
-    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
-                        " i.price as unit_price,i.product_name")
-                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id")
-                .where("shop_code='#{shop.shop_code}' and (i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
-                      " and sale_status= 'completed'")
-                if !shift.nil?
-                  query = query.where("shift_sale_id='#{shift.id}'")
-                end
-  end
-  return query
-end
 
-def self.hourly_sale_data(shop,today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil)
-  if !from.nil? && !to.nil?
-    query = Sale.select("grand_total")
-          if !from_time.nil? && !to_time.nil?
-            query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%H:%M") between ? and ?',from,to,from_time,to_time)
-          else
-            query = query.where('sale_status = "completed" and DATE_FORMAT(CONVERT_TZ(receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ?',from,to)
-          end
-          if !shift.nil?
-            query = query.where("shift_sale_id='#{shift.id}'")
-          end
-    query = query.where("shop_code='#{shop.shop_code}'").group("date_format(CONVERT_TZ(receipt_date,'+00:00', '+06:30'), '%I %p')")
-          .order('receipt_date')
-  else
-    query = Sale.select("grand_total")
-            .where("shop_code='#{shop.shop_code}' and sale_status = 'completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = ?",today)
-          if !shift.nil?
-            query = query.where("shift_sale_id='#{shift.id}'")
-          end
-    query =  query.group("date_format(CONVERT_TZ(receipt_date,'+00:00', '+06:30'), '%I %p')")
-            .order('receipt_date')
-  end
-
-  return query
-end
-
-def self.employee_sale(shop,today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil)
+def self.employee_sale(today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil)
   query = Sale.joins(:cashier)
             .joins(:sale_payments)
             .paid.completed.where("sales.shop_code='#{shop.shop_code}'")
@@ -2314,7 +2270,7 @@ end
 def grand_total_round
     print_settings = PrintSetting.get_precision_delimiter()
     if !print_settings.nil?
-        self.grand_total =self.grand_total.round(print_settings.precision.to_i)
+        self.grand_total =self.grand_total.round(precision)
     end
 end
 
@@ -2461,8 +2417,6 @@ private
   def round_to_precision
     if (self.total_amount != self.total_amount_was || self.total_discount != self.total_discount_was || self.total_tax != self.total_tax_was)
       if (self.total_amount % 1 > 0 || self.total_discount % 1 > 0 || self.total_tax % 1 > 0)
-        precision = PrintSetting.get_precision_delimiter().precision.to_i
-
         self.total_amount = self.total_amount.round(precision)
         self.total_discount = self.total_discount.round(precision)
         self.total_tax = self.total_tax.round(precision)
@@ -2491,6 +2445,9 @@ private
           found, inventory_definition = InventoryDefinition.find_product_in_inventory(item,self.shop_code)
           if found
             if stock_journal = StockJournal.find_by_trans_ref(item.order_items_id)
+              if self.payment_status == "foc" && self.payment_status_was != "foc"
+                stock_journal.update(remark: self.payment_status)
+              else
                 stock_journal.update(remark: self.sale_status)
               end
             end
@@ -2498,3 +2455,4 @@ private
         end
       end
   end
+end

app/models/sale_audit.rb

@@ -6,7 +6,7 @@ class SaleAudit < ApplicationRecord
 
   belongs_to :sale
 
-  belongs_to :credit_payment, -> { where "SUBSTRING_INDEX(sale_audits.remark,'||',1) = sale_payments.sale_payment_id" }, foreign_key: "sale_id", primary_key: "sale_id", class_name: "SalePayment"
+  belongs_to :sale_payments_for_credit, -> { where "SUBSTRING_INDEX(sale_audits.remark,'||',1) = sale_payments.sale_payment_id" }, foreign_key: "sale_id", primary_key: "sale_id", class_name: "SalePayment"
 
   def self.sync_sale_audit_records(sale_audits)
     if !sale_audits.nil?

app/models/sale_item.rb

@@ -1,4 +1,5 @@
 class SaleItem < ApplicationRecord
+  include NumberFormattable
   self.primary_key = "sale_item_id"
 
   #primary key - need to be unique generated for multiple shops
@@ -13,6 +14,7 @@ class SaleItem < ApplicationRecord
 
   before_validation :round_to_precision
   after_update :update_stock_journal
+  after_save :update_stock_journal_set_item
 
   # Add Sale Items
   def self.add_sale_items(sale_items)
@@ -293,8 +295,6 @@ class SaleItem < ApplicationRecord
     if self.unit_price != self.unit_price_was || self.price != self.price_was
       if unit_price_fraction > 0 || price_fraction > 0
         if ['Discount', 'promotion'].include?(self.status)
-          precision = PrintSetting.get_precision_delimiter().precision.to_i
-
           self.unit_price = self.unit_price.round(precision)
           self.price = (self.unit_price * self.qty).round(precision)
           self.taxable_price = self.price
@@ -304,6 +304,7 @@ class SaleItem < ApplicationRecord
   end
 
   def update_stock_journal
+    unless MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
       is_void = self.status == "void" && self.status_before_last_save != "void"
       cancel_void = self.status_before_last_save == "void" && self.status.nil?
       is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
@@ -311,11 +312,11 @@ class SaleItem < ApplicationRecord
       cancel_foc = self.status_before_last_save == "foc"
 
       if is_void or cancel_void or is_edit or is_foc or cancel_foc
-      found, inventory_definition = InventoryDefinition.find_product_in_inventory(self,self.sale.shop_code)
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
         if found
-        stock = StockJournal.where("shop_code='#{self.sale.shop_code}' and item_code=?", self.item_instance_code).order("id DESC").first
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
           unless stock.nil?
-          check_item = StockCheckItem.where("shop_code='#{self.sale.shop_code}' and item_code=?", self.item_instance_code).order("id DESC").first
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
             if is_void or cancel_void or is_edit
               if is_void
                 qty = -self.qty
@@ -347,3 +348,79 @@ class SaleItem < ApplicationRecord
       end
     end
   end
+
+  def update_stock_journal_set_item
+    is_void = self.status == "void" && self.status_before_last_save != "void" && self.qty > 0
+    cancel_void = self.status_before_last_save == "void" && self.status.nil?
+    is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
+    is_foc =  self.status == "foc" && self.status_before_last_save != "foc"
+    cancel_foc = self.status_before_last_save == "foc"
+
+    is_waste = self.status == "waste"
+    is_spoile = self.status == "spoile"
+
+    if MenuItemInstance.where("item_instance_name <> ''").pluck(:item_instance_code).include?(self.item_instance_code)
+      if self.qty == 1 && self.qty != self.qty_before_last_save
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
+          unless stock.nil?
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
+            if self.qty.to_i >= 0
+              qty = self.qty - self.qty_was
+              if stock.balance.to_i >= qty
+                puts ">> stock is greater than order qty"
+                remark = "ok"
+              else
+                puts " << stock is less than order qty"
+                remark = "out of stock"
+              end
+            end
+            StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
+            check_item.different = check_item.different - qty
+            check_item.save
+          else
+            StockJournal.add_to_journal(self.item_instance_code, self.qty, 0, "out of stock", inventory_definition, self.id, StockJournal::SALES_TRANS)
+          end
+        end
+      elsif is_void or cancel_void or is_edit
+        if is_void
+          qty = -self.qty
+          remark = "void"
+        elsif cancel_void
+          qty = self.qty
+          remark = "cancel void"
+        elsif is_edit
+          qty = self.qty - self.qty_before_last_save
+          remark = "edit"
+        end
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first
+          unless stock.nil?
+            check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first
+          end
+        end
+        StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
+        check_item.different = check_item.different + qty
+        check_item.save
+      elsif is_foc or cancel_foc
+        qty = StockJournal.where(trans_ref: self.sale_item_id).sum("credit-debit")
+        if stock_journal = StockJournal.where(trans_ref: self.sale_item_id, item_code: self.item_instance_code).order(id: :desc).first
+          if is_foc
+            stock_journal.update(remark: "foc")
+          elsif cancel_foc
+            stock_journal.update(remark: "cancel_foc")
+          end
+        end
+      elsif is_waste or is_spoile
+        found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
+        if found
+          if stock_journal = StockJournal.where(trans_ref: self.sale_item_id, item_code: self.item_instance_code)
+            stock_journal.update(remark: self.status)
+          end
+        end
+      end
+    end
+  end
+end

app/models/sale_tax.rb

@@ -1,4 +1,5 @@
 class SaleTax < ApplicationRecord
+  include NumberFormattable
   self.primary_key = "sale_tax_id"
 
   #primary key - need to be unique generated for multiple shops
@@ -44,7 +45,6 @@ class SaleTax < ApplicationRecord
   def round_to_precision
     if self.tax_payable_amount != self.tax_payable_amount_was
       if self.tax_payable_amount % 1 > 0
-        precision = PrintSetting.get_precision_delimiter().precision.to_i
         self.tax_payable_amount = self.tax_payable_amount.round(precision)
       end
     end

app/pdf/check_in_out_pdf.rb

@@ -1,5 +1,5 @@
 class CheckInOutPdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size, :item_height,:qty_width,:total_width,:item_description_width
     def initialize(print_settings,booking, table)
         self.page_width = print_settings.page_width

app/pdf/close_cashier_customise_pdf.rb

@@ -1,5 +1,5 @@
 class CloseCashierCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
@@ -39,22 +39,11 @@ class CloseCashierCustomisePdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-    #check delimiter
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header( shop_details)
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) 
   end
 
   def header (shop_details)
@@ -109,7 +98,7 @@ class CloseCashierCustomisePdf < Prawn::Document
             text "Opening Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            text "#{ number_format(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
         end
 
         y_position = cursor
@@ -117,8 +106,8 @@ class CloseCashierCustomisePdf < Prawn::Document
             text "Closing Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
-            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
+            text "#{ number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
         end
 
 
@@ -135,7 +124,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Received Amount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
 
         end
 
@@ -144,7 +133,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Cash In :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -152,7 +141,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Cash Out :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         move_down -5
@@ -181,7 +170,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Grand Total :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(total_grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(total_grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         #start total amount by Account Like Food / Beverage /..
@@ -192,7 +181,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{ number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account
@@ -205,7 +194,7 @@ class CloseCashierCustomisePdf < Prawn::Document
           @total_foc = 0
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -226,7 +215,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Cash Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -234,7 +223,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Credit Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
         end
         #start other payment details
         if shift_sale.other_sales > 0
@@ -246,7 +235,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "MPU Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -256,7 +245,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "VISA Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{number_format(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -266,7 +255,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "Master Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -276,7 +265,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "JCB Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -286,7 +275,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "UNIONPAY Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -296,7 +285,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "Alipay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -306,7 +295,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "JunctionPay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -316,7 +305,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "Dinga Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -326,7 +315,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "Redeem Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -336,7 +325,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "Paymal Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -346,7 +335,7 @@ class CloseCashierCustomisePdf < Prawn::Document
                  text "GiftVoucher Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
             end
@@ -356,7 +345,7 @@ class CloseCashierCustomisePdf < Prawn::Document
              text "Other Payment :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         end
 
@@ -365,7 +354,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-        text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+        text "#{ number_format(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
 
         end
 
@@ -374,7 +363,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Gross Sale :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "#{ number_format(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
 
         # end other payment details
@@ -392,7 +381,7 @@ class CloseCashierCustomisePdf < Prawn::Document
           total_dinein = 0
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-          text "#{ number_with_precision(total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right        
+          text "#{ number_format(total_dinein, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -403,7 +392,7 @@ class CloseCashierCustomisePdf < Prawn::Document
           total_takeway = 0
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(total_takeway, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(total_takeway, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
 
@@ -419,7 +408,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -428,7 +417,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -436,7 +425,7 @@ class CloseCashierCustomisePdf < Prawn::Document
          text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
+         text "#{number_format(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
         end
 
         if total_credit_payments && total_credit_payments.to_f > 0
@@ -445,7 +434,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total Credit Payment :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
         #end for service charges and commercial tax
@@ -469,7 +458,7 @@ class CloseCashierCustomisePdf < Prawn::Document
         #    text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
         #   end
         #   bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-        #    text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+        #    text "#{ number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
         #   end
         # end
         #end total amount by Account
@@ -490,7 +479,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account
@@ -502,7 +491,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total Other Charges :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-            text "#{ number_with_precision(total_other_charges, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right        
+            text "#{ number_format(total_other_charges, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
         #end total other charges amount
@@ -521,7 +510,7 @@ class CloseCashierCustomisePdf < Prawn::Document
              text "Total Member Discount :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         else
           @overall = shift_sale.total_discounts
@@ -533,7 +522,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total Discount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "-#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "-#{ number_format(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
           move_down -5
           stroke_horizontal_rule
@@ -547,7 +536,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total Waste :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "(#{ number_with_precision(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+           text "(#{ number_format(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -557,7 +546,7 @@ class CloseCashierCustomisePdf < Prawn::Document
            text "Total Spoile :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+           text "(#{ number_format(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -591,4 +580,3 @@ class CloseCashierCustomisePdf < Prawn::Document
 		move_down 5
   end
 end
-

app/pdf/close_cashier_pdf.rb

@@ -1,5 +1,5 @@
 class CloseCashierPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shift_sale, sale_items, total_other_charges_info, acc_cate_count, menu_cate_count, total_by_acc, shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
@@ -39,22 +39,11 @@ class CloseCashierPdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-    #check delimiter
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header( shop_details)
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments)
 
     if !sale_items.nil? or !sale_items.blank?
       sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges_info)
@@ -113,7 +102,7 @@ class CloseCashierPdf < Prawn::Document
             text "Opening Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            text "#{ number_format(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
         end
 
         y_position = cursor
@@ -121,8 +110,8 @@ class CloseCashierPdf < Prawn::Document
             text "Closing Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
-            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
+            text "#{ number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
         end
 
 
@@ -139,7 +128,7 @@ class CloseCashierPdf < Prawn::Document
          text "Received Amount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
 
         end
 
@@ -148,7 +137,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash In:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -156,7 +145,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Out:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         move_down -5
@@ -169,7 +158,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -177,7 +166,7 @@ class CloseCashierPdf < Prawn::Document
          text "Credit Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
         end
 
         #start other payment details
@@ -190,7 +179,7 @@ class CloseCashierPdf < Prawn::Document
                  text "MPU Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -200,7 +189,7 @@ class CloseCashierPdf < Prawn::Document
                  text "VISA Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{number_format(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -210,7 +199,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Master Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -220,7 +209,7 @@ class CloseCashierPdf < Prawn::Document
                  text "JCB Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -230,7 +219,7 @@ class CloseCashierPdf < Prawn::Document
                  text "UNIONPAY Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -240,7 +229,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Alipay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -250,7 +239,7 @@ class CloseCashierPdf < Prawn::Document
                  text "KBZ Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.kbzpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.kbzpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -260,7 +249,7 @@ class CloseCashierPdf < Prawn::Document
                  text "JunctionPay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -270,7 +259,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Dinga Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -280,7 +269,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Redeem Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -290,7 +279,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Paymal Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -300,7 +289,7 @@ class CloseCashierPdf < Prawn::Document
                  text "GiftVoucher Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
             end
@@ -310,7 +299,7 @@ class CloseCashierPdf < Prawn::Document
              text "Other Payment :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         end
 
@@ -319,7 +308,7 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -327,7 +316,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "#{ number_format(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
 
         # end other payment details
@@ -342,7 +331,7 @@ class CloseCashierPdf < Prawn::Document
            text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -351,7 +340,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -359,7 +348,7 @@ class CloseCashierPdf < Prawn::Document
          text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
+         text "#{number_format(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
         end
 
         if total_credit_payments && total_credit_payments.to_f > 0
@@ -368,7 +357,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total Credit Payment :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
         #end for service charges and commercial tax
@@ -392,7 +381,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{ number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account
@@ -406,7 +395,7 @@ class CloseCashierPdf < Prawn::Document
              text "Total Member Discount :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         else
           @overall = shift_sale.total_discounts
@@ -417,7 +406,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Discount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -425,7 +414,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total FOC :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -441,7 +430,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Waste :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -449,7 +438,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Spoile :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         # y_position = cursor
@@ -471,7 +460,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
 

app/pdf/close_cashier_pdf_v1.rb

@@ -1,5 +1,5 @@
 class CloseCashierPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shift_sale, total_by_acc, shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments)
@@ -39,22 +39,11 @@ class CloseCashierPdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-    #check delimiter
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header( shop_details)
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) 
 
   end
 
@@ -110,7 +99,7 @@ class CloseCashierPdf < Prawn::Document
             text "Opening Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            text "#{ number_format(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
         end
 
         y_position = cursor
@@ -118,8 +107,8 @@ class CloseCashierPdf < Prawn::Document
             text "Closing Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
-            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
+            text "#{ number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
         end
 
 
@@ -136,7 +125,7 @@ class CloseCashierPdf < Prawn::Document
          text "Received Amount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
 
         end
 
@@ -145,7 +134,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash In:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -153,7 +142,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Out:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         move_down -5
@@ -166,7 +155,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -174,7 +163,7 @@ class CloseCashierPdf < Prawn::Document
          text "Credit Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
+         text "#{number_format(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
         end
 
         #start other payment details
@@ -187,7 +176,7 @@ class CloseCashierPdf < Prawn::Document
                  text "MPU Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -197,7 +186,7 @@ class CloseCashierPdf < Prawn::Document
                  text "VISA Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{number_format(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -207,7 +196,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Master Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -217,7 +206,7 @@ class CloseCashierPdf < Prawn::Document
                  text "JCB Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -227,7 +216,7 @@ class CloseCashierPdf < Prawn::Document
                  text "UNIONPAY Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -237,7 +226,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Alipay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -247,7 +236,7 @@ class CloseCashierPdf < Prawn::Document
                  text "JunctionPay Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -257,7 +246,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Dinga Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -267,7 +256,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Redeem Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -277,7 +266,7 @@ class CloseCashierPdf < Prawn::Document
                  text "Paymal Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
 
@@ -287,7 +276,7 @@ class CloseCashierPdf < Prawn::Document
                  text "GiftVoucher Payment :", :size => self.item_font_size, :align => :right
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-                 text "#{ number_with_precision(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+                 text "#{ number_format(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
                 end
               end
             end
@@ -297,7 +286,7 @@ class CloseCashierPdf < Prawn::Document
              text "Other Payment :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         end
 
@@ -306,7 +295,7 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -314,7 +303,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "#{ number_format(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
 
         # end other payment details
@@ -329,7 +318,7 @@ class CloseCashierPdf < Prawn::Document
            text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -338,7 +327,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -346,7 +335,7 @@ class CloseCashierPdf < Prawn::Document
          text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
+         text "#{number_format(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
         end
 
         if total_credit_payments && total_credit_payments.to_f > 0
@@ -355,7 +344,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total Credit Payment :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+           text "#{ number_format(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
         #end for service charges and commercial tax
@@ -379,7 +368,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{ number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account
@@ -393,7 +382,7 @@ class CloseCashierPdf < Prawn::Document
              text "Total Member Discount :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+             text "#{ number_format(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         else
           @overall = shift_sale.total_discounts
@@ -404,7 +393,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Discount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+         text "#{ number_format(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -412,7 +401,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total FOC :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -428,7 +417,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Waste :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -436,7 +425,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Spoile :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
+         text "(#{ number_format(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end
 
         # y_position = cursor
@@ -458,7 +447,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
+           text "#{number_format(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
 

app/pdf/move_table_pdf.rb

@@ -1,5 +1,5 @@
 class MoveTablePdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
     def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     self.page_width = printer_settings.page_width
@@ -39,7 +39,7 @@ class MoveTablePdf < Prawn::Document
     stroke_horizontal_rule
     move_down 5
 
-    add_lining_item(order_items, printer_settings.precision)
+    add_lining_item(order_items, precision)
 
     move_down 5
     stroke_horizontal_rule
@@ -98,7 +98,7 @@ class MoveTablePdf < Prawn::Document
             end
 
             bounding_box([self.item_width,y_position], :width => self.qty_width) do
-                text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+                text "#{number_format(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
             end
 
             bounding_box([0,y_position], :width => self.item_width) do

app/pdf/move_table_star_pdf.rb

@@ -1,5 +1,5 @@
 class MoveTableStarPdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
     def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
     self.page_width = printer_settings.page_width
@@ -38,7 +38,7 @@ class MoveTableStarPdf < Prawn::Document
     stroke_horizontal_rule
     move_down 5
 
-    add_lining_item(order_items, printer_settings.precision)
+    add_lining_item(order_items, precision)
 
     move_down 5
     stroke_horizontal_rule
@@ -97,7 +97,7 @@ class MoveTableStarPdf < Prawn::Document
             end
 
             bounding_box([self.item_width,y_position], :width => self.qty_width) do
-                text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+                text "#{number_format(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
             end
 
             bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_item_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderItemCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
@@ -47,7 +47,7 @@ class OrderItemCustomisePdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
+    order_items(order_item, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -107,7 +107,7 @@ class OrderItemCustomisePdf < Prawn::Document
     end
 
     bounding_box([self.item_width - 10,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
+        text "[#{number_format(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -146,7 +146,7 @@ class OrderItemCustomisePdf < Prawn::Document
             # add option
             y_position = cursor
             bounding_box([0,y_position], :width => self.page_width) do
-                text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+                text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
             end
         end
     end

app/pdf/order_item_pdf.rb

@@ -1,5 +1,5 @@
 class OrderItemPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
 
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
@@ -48,7 +48,7 @@ class OrderItemPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
+    order_items(order_item, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -108,7 +108,7 @@ class OrderItemPdf < Prawn::Document
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        text "[#{number_format(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -147,7 +147,7 @@ class OrderItemPdf < Prawn::Document
         # add option
         y_position = cursor
         bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+            text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
     end
   end

app/pdf/order_item_slim_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderItemSlimCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :item_slim_font_size
   def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
@@ -47,7 +47,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
     order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
 
     # order items slim
-    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
+    order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -108,7 +108,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
     end
 
     bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
+        text "[#{number_format(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -146,7 +146,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
             # add option
             y_position = cursor
             bounding_box([0,y_position], :width => self.page_width) do
-                text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+                text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
             end
         end
     end

app/pdf/order_item_slim_pdf.rb

@@ -1,5 +1,5 @@
 class OrderItemSlimPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
 
   def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty)
@@ -47,7 +47,7 @@ class OrderItemSlimPdf < Prawn::Document
     order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
 
     # order items slim
-    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
+    order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -108,7 +108,7 @@ class OrderItemSlimPdf < Prawn::Document
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        text "[#{number_format(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -146,7 +146,7 @@ class OrderItemSlimPdf < Prawn::Document
         # add option
         y_position = cursor
         bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+            text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
     end
   end

app/pdf/order_item_star_pdf.rb

@@ -1,5 +1,5 @@
 class OrderItemStarPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
 
   def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
@@ -48,7 +48,7 @@ class OrderItemStarPdf < Prawn::Document
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
 
     # order items
-    order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty)
+    order_items(order_item, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -108,7 +108,7 @@ class OrderItemStarPdf < Prawn::Document
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        text "[#{number_format(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -147,7 +147,7 @@ class OrderItemStarPdf < Prawn::Document
         # add option
         y_position = cursor
         bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+            text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
     end
   end

app/pdf/order_set_item_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSetItemCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
@@ -46,7 +46,7 @@ class OrderSetItemCustomisePdf < Prawn::Document
     order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
 
     # order items
-    order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
+    order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -106,7 +106,7 @@ class OrderSetItemCustomisePdf < Prawn::Document
     end
 
     bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
+        text "[#{number_format(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :right
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -161,7 +161,7 @@ class OrderSetItemCustomisePdf < Prawn::Document
             # add option
             y_position = cursor
             bounding_box([0,y_position], :width => self.page_width) do
-                text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+                text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
             end
         end
     end

app/pdf/order_set_item_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSetItemPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty)
     self.page_width = print_settings.page_width
@@ -45,7 +45,7 @@ class OrderSetItemPdf < Prawn::Document
     order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
 
     # order items
-    order_set_items(order_set_item, options, alt_name, print_settings.precision, before_updated_qty)
+    order_set_items(order_set_item, options, alt_name, precision, before_updated_qty)
   end
 
   # Write Order Information to PDF
@@ -105,7 +105,7 @@ class OrderSetItemPdf < Prawn::Document
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
-        text "[#{number_with_precision(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        text "[#{number_format(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
@@ -160,7 +160,7 @@ class OrderSetItemPdf < Prawn::Document
             # add option
             y_position = cursor
             bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-                text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+                text "* Change quantity [#{number_format(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_format(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
             end
         end
     end

app/pdf/order_summary_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummaryCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -48,9 +48,9 @@ class OrderSummaryCustomisePdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -113,7 +113,7 @@ class OrderSummaryCustomisePdf < Prawn::Document
         end
 
         bounding_box([self.item_width - 10,y_position], :width => self.qty_width) do
-          text " [#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+          text " [#{number_format(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_summary_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummaryPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -47,9 +47,9 @@ class OrderSummaryPdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -123,7 +123,7 @@ class OrderSummaryPdf < Prawn::Document
         end
 
         bounding_box([self.item_width,y_position], :width => self.qty_width) do
-          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+          text "#{number_format(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_summary_set_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummarySetCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -47,9 +47,9 @@ class OrderSummarySetCustomisePdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -112,7 +112,7 @@ class OrderSummarySetCustomisePdf < Prawn::Document
         end
 
         bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do
-          text "[#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+          text "[#{number_format(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_summary_set_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummarySetPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -46,9 +46,9 @@ class OrderSummarySetPdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -122,7 +122,7 @@ class OrderSummarySetPdf < Prawn::Document
         end
 
         bounding_box([self.item_width,y_position], :width => self.qty_width) do
-          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+          text "#{number_format(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_summary_slim_customise_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummarySlimCustomisePdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:item_slim_font_size
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -47,9 +47,9 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -115,7 +115,7 @@ class OrderSummarySlimCustomisePdf < Prawn::Document
         end
 
         bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do
-          text "[#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+          text "[#{number_format(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/order_summary_slim_pdf.rb

@@ -1,5 +1,5 @@
 class OrderSummarySlimPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
     self.page_width = print_settings.page_width
@@ -46,9 +46,9 @@ class OrderSummarySlimPdf < Prawn::Document
 
     # order items
     if order_items == nil
-      order_items(order, alt_name, print_settings.precision)
+      order_items(order, alt_name, precision)
     else
-      order_items(order_items, alt_name, print_settings.precision)
+      order_items(order_items, alt_name, precision)
     end
   end
 
@@ -122,7 +122,7 @@ class OrderSummarySlimPdf < Prawn::Document
         end
 
         bounding_box([self.item_width,y_position], :width => self.qty_width) do
-          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+          text "#{number_format(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
         end
 
         bounding_box([0,y_position], :width => self.item_width) do

app/pdf/receipt_bill_a5_pdf.rb

@@ -1,5 +1,5 @@
 class ReceiptBillA5Pdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
 
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount)
@@ -26,11 +26,6 @@ class ReceiptBillA5Pdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-
     # db font setup
     if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
@@ -46,23 +41,17 @@ class ReceiptBillA5Pdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header(shop_details)
 
     stroke_horizontal_rule
 
     cashier_info(sale_data, customer_name, latest_order_no)
-    line_items(sale_items,printer_settings.precision,delimiter)
-    all_total(sale_data,printer_settings.precision,delimiter)
+    line_items(sale_items,precision,delimiter)
+    all_total(sale_data,precision,delimiter)
 
 
     if member_info != nil
-        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+        member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
     end
 
     customer(customer_name)
@@ -79,19 +68,19 @@ class ReceiptBillA5Pdf < Prawn::Document
     #end card blanace amount
 
     if discount_price_by_accounts.length > 0 && shop_details.show_account_info
-        discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+        discount_account(discount_price_by_accounts,precision,delimiter)
     end
 
     if shop_details.show_account_info
-       items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+       items_account(item_price_by_accounts,precision,delimiter)
        if other_charges_amount
-               show_other_charges_amount(other_charges_amount,printer_settings.precision,delimiter)
+               show_other_charges_amount(other_charges_amount,precision,delimiter)
            end
     end
 
     #start for individual payment
     if !sale_data.equal_persons.nil?
-        individual_payment(sale_data, printer_settings.precision, delimiter)
+        individual_payment(sale_data, precision, delimiter)
     end
     #end for individual payment
 
@@ -265,13 +254,13 @@ class ReceiptBillA5Pdf < Prawn::Document
            text "Sub Total", :size => self.item_font_size,:align => :left
         end
         # bounding_box([self.item_width + self.price_width + 11,y_position], :width =>self.qty_width, :height => self.item_height) do
-        #    text "#{number_with_precision(total_qty, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :center
+        #    text "#{number_format(total_qty, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :center
         # end
         # bounding_box([self.item_width + self.price_width + 8,y_position], :width =>self.total_width, :height => self.item_height) do
-        #    text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+        #    text "#{number_format(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         # end
-        text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-        text_box  "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+        text_box  "#{number_format(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
     end
 
@@ -298,9 +287,9 @@ class ReceiptBillA5Pdf < Prawn::Document
             text "#{product_name}", :size => self.item_font_size,:align => :left
         end
                    # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
-                   text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
-                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
-                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                   text_box "#{number_format(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+                   text_box "#{number_format(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+                   text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
                    if show_alt_name
                     if !(item.product_alt_name).empty?
@@ -328,7 +317,7 @@ class ReceiptBillA5Pdf < Prawn::Document
             text "#{ dis_type }", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.description_width,y_position], :width =>self.label_width) do
-            text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
+            text "( #{number_format(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
         end
 
         if sale_data.sale_taxes.length > 0
@@ -344,7 +333,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                     text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
                 end
                 bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                    text  "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                    text  "#{number_format(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
                 end
             end
         else
@@ -380,7 +369,7 @@ class ReceiptBillA5Pdf < Prawn::Document
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.description_width,y_position], :width =>self.label_width) do
-            text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+            text "#{number_format(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
         end
         move_down line_move
 
@@ -421,7 +410,7 @@ class ReceiptBillA5Pdf < Prawn::Document
             end
 
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -432,7 +421,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                  text "Change Amount", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             #move_down line_move
         end
@@ -467,7 +456,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                             text "Rebate Earn", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
 
                     end
@@ -480,7 +469,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                             text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
                     end
                 #end Total rebate if birthday
@@ -492,7 +481,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                      text "Redeem Amount", :size => self.item_font_size,:align => :left
                   end
                   bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                    text "#{number_format(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                   end
 
                  if current_balance != nil
@@ -502,7 +491,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                          text "Old Balance", :size => self.item_font_size,:align => :left
                      end
                       bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                        text "#{number_format(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                      end
                  end
 
@@ -524,7 +513,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                  text "Total Balance", :size => self.item_font_size,:align => :left
             end
              bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                  text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                  text "#{number_format(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
               end
         end
 
@@ -554,7 +543,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                 text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.description_width,y_position], :width =>self.label_width) do
-                text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
+                text "(" + "#{ number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -570,7 +559,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                 text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.description_width) do
-                text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -582,7 +571,7 @@ class ReceiptBillA5Pdf < Prawn::Document
                 text "Other Charges", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-                text "#{number_with_precision(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
     end
@@ -604,7 +593,7 @@ class ReceiptBillA5Pdf < Prawn::Document
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
             move_down 15
-            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+            text "#{number_format(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
     end
 

app/pdf/receipt_bill_order_pdf.rb

@@ -1,5 +1,5 @@
 class ReceiptBillOrderPdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
 
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
 
@@ -27,11 +27,6 @@ class ReceiptBillOrderPdf < Prawn::Document
         #setting page margin and width
         super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-        #precision checked
-        if printer_settings.precision.to_i > 2
-            printer_settings.precision = 2
-        end
-
         # db font setup
         if printer_settings.font != ""
             font_families.update("#{printer_settings.font}" => {
@@ -47,19 +42,13 @@ class ReceiptBillOrderPdf < Prawn::Document
         # font "public/fonts/Zawgyi-One.ttf"
         # font "public/fonts/padauk.ttf"
 
-        if printer_settings.delimiter
-            delimiter = ","
-        else
-            delimiter = ""
-        end
-
         header(shop_details)
 
         stroke_horizontal_rule
 
         cashier_info(sale_data, customer_name, latest_order_no,order_reservation)
-        line_items(sale_items,printer_settings.precision,delimiter,order_reservation)
-        all_total(sale_data,printer_settings.precision,delimiter,order_reservation)
+        line_items(sale_items,precision,delimiter,order_reservation)
+        all_total(sale_data,precision,delimiter,order_reservation)
 
        footer(printed_status)
    end
@@ -209,8 +198,8 @@ class ReceiptBillOrderPdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_width + self.price_width, :height => self.item_height) do
          text "Sub Total", :size => self.item_font_size,:align => :left
         end
-        text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-        text_box  "#{number_with_precision(order_reservation.total_amount, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+        text_box  "#{number_format(order_reservation.total_amount, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
         if !order_reservation.delivery_type.nil? && order_reservation.delivery_fee.to_f > 0
             y_position = cursor
@@ -219,7 +208,7 @@ class ReceiptBillOrderPdf < Prawn::Document
             end
 
             bounding_box([self.description_width - 48,y_position], :width =>self.label_width, :height => self.item_height) do
-                text "#{number_with_precision(order_reservation.delivery_fee, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                text "#{number_format(order_reservation.delivery_fee, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
             end
         end
 
@@ -230,7 +219,7 @@ class ReceiptBillOrderPdf < Prawn::Document
             end
 
             bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
-                text "#{number_with_precision(order_reservation.total_tax, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                text "#{number_format(order_reservation.total_tax, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
             end
         end
 
@@ -239,7 +228,7 @@ class ReceiptBillOrderPdf < Prawn::Document
             text "Convenience Charges " , :size => self.item_font_size, :align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
-          text "#{number_with_precision(order_reservation.convenience_charge, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+          text "#{number_format(order_reservation.convenience_charge, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
 
         if order_reservation.discount_amount > 0
@@ -249,7 +238,7 @@ class ReceiptBillOrderPdf < Prawn::Document
             end
 
             bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
-                text "#{number_with_precision(order_reservation.discount_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                text "#{number_format(order_reservation.discount_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
             end
         end
     end
@@ -278,9 +267,9 @@ class ReceiptBillOrderPdf < Prawn::Document
             text "#{product_name}", :size => self.item_font_size,:align => :left
         end
             # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
-            text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
-            text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
-            text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                 
+            text_box "#{number_format(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "#{number_format(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+            text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
             if show_alt_name
                 if !(item.product_alt_name).empty?
@@ -309,7 +298,7 @@ class ReceiptBillOrderPdf < Prawn::Document
        end
 
        bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-          text "#{number_with_precision(order_reservation.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+          text "#{number_format(order_reservation.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
       end
       move_down line_move
 

app/pdf/receipt_bill_pdf.rb

@@ -1,7 +1,7 @@
 # require 'prawn/qrcode'
 require 'prawn/measurement_extensions'
 class ReceiptBillPdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
 
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
 
@@ -29,11 +29,6 @@ class ReceiptBillPdf < Prawn::Document
         #setting page margin and width
         super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-        #precision checked
-        if printer_settings.precision.to_i > 2
-            printer_settings.precision = 2
-        end
-
         # db font setup
         if printer_settings.font != ""
             font_families.update("#{printer_settings.font}" => {
@@ -49,23 +44,17 @@ class ReceiptBillPdf < Prawn::Document
         # font "public/fonts/Zawgyi-One.ttf"
         # font "public/fonts/padauk.ttf"
 
-        if printer_settings.delimiter
-            delimiter = ","
-        else
-            delimiter = ""
-        end
-
         header(shop_details)
 
         stroke_horizontal_rule
 
         cashier_info(sale_data, customer_name, latest_order_no)
-        line_items(sale_items,printer_settings.precision,delimiter)
-        all_total(sale_data,printer_settings.precision,delimiter)
+        line_items(sale_items,precision,delimiter)
+        all_total(sale_data,precision,delimiter)
 
 
         if member_info != nil
-            member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+            member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
         end
 
         customer(customer_name)
@@ -82,19 +71,19 @@ class ReceiptBillPdf < Prawn::Document
         #end card blanace amount
 
         if discount_price_by_accounts.length > 0 && shop_details.show_account_info
-            discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+            discount_account(discount_price_by_accounts,precision,delimiter)
         end
 
         if shop_details.show_account_info
-           items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+           items_account(item_price_by_accounts,precision,delimiter)
            if other_charges_amount
-               show_other_charges_amount(other_charges_amount,printer_settings.precision,delimiter)
+               show_other_charges_amount(other_charges_amount,precision,delimiter)
            end
         end
 
         #start for individual payment
         if !sale_data.equal_persons.nil?
-            individual_payment(sale_data,sale_data.equal_persons, printer_settings.precision, delimiter)
+            individual_payment(sale_data,sale_data.equal_persons, precision, delimiter)
         end
         #end for individual payment
 
@@ -273,8 +262,8 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_width + self.price_width, :height => self.item_height) do
            text "Sub Total", :size => self.item_font_size,:align => :left
         end
-        text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-        text_box  "#{number_with_precision(@sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+        text_box  "#{number_format(@sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
     end
 
     def item_row(item,precision,delimiter,product_name,price,qty ,total_price)
@@ -298,9 +287,9 @@ class ReceiptBillPdf < Prawn::Document
             text "#{product_name}", :size => self.item_font_size,:align => :left
         end
             # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
-        text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
-        text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-        text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+        text_box "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
         if show_alt_name
             if !(item.product_alt_name).empty?
@@ -330,7 +319,7 @@ class ReceiptBillPdf < Prawn::Document
             text "#{ dis_type }", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-            text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
+            text "( #{number_format(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
         end
 
         service_tax_desc = ""
@@ -355,14 +344,14 @@ class ReceiptBillPdf < Prawn::Document
               sale_data.sale_taxes.each do |st|
                 if (st.tax_name.include? "Service")
                   service_tax_desc = st.tax_name
-                  service_tax_amount = number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)
+                  service_tax_amount = number_format(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)
                   if incl_tax
                     service_tax_rate = st.tax_rate.to_i
                   end
                 end
                 if (st.tax_name.include? "Commercial")
                   com_tax_desc = st.tax_name
-                  com_tax_amount = number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)
+                  com_tax_amount = number_format(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)
                   if incl_tax
                     com_tax_rate = st.tax_rate.to_i
                   end
@@ -374,7 +363,7 @@ class ReceiptBillPdf < Prawn::Document
                   text "#{ service_tax_desc } (#{incl_tax} #{ service_tax_rate }%)", :size => self.item_font_size,:align => :left
               end
               bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                  text  "#{number_with_precision(service_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                  text  "#{number_format(service_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
               end
               move_down line_move
               y_position = cursor
@@ -391,7 +380,7 @@ class ReceiptBillPdf < Prawn::Document
                   text "#{ com_tax_desc } (#{incl_tax} #{ com_tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
               end
               bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                  text  "#{number_with_precision(com_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                  text  "#{number_format(com_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
               end
             else
               sale_data.sale_taxes.each do |st|
@@ -402,7 +391,7 @@ class ReceiptBillPdf < Prawn::Document
                       text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
                   end
                   bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                      text  "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                      text  "#{number_format(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
                   end
               end
             end
@@ -439,7 +428,7 @@ class ReceiptBillPdf < Prawn::Document
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-            text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+            text "#{number_format(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
         end
         move_down line_move
 
@@ -480,7 +469,7 @@ class ReceiptBillPdf < Prawn::Document
             end
 
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -491,7 +480,7 @@ class ReceiptBillPdf < Prawn::Document
                  text "Change Amount", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
           #  move_down line_move
         end
@@ -526,7 +515,7 @@ class ReceiptBillPdf < Prawn::Document
                             text "Rebate Earn", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
 
                     end
@@ -539,7 +528,7 @@ class ReceiptBillPdf < Prawn::Document
                             text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
                     end
                 #end Total rebate if birthday
@@ -551,7 +540,7 @@ class ReceiptBillPdf < Prawn::Document
                      text "Redeem Amount", :size => self.item_font_size,:align => :left
                   end
                   bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                    text "#{number_format(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                   end
 
                  if current_balance != nil
@@ -561,7 +550,7 @@ class ReceiptBillPdf < Prawn::Document
                          text "Old Balance", :size => self.item_font_size,:align => :left
                      end
                       bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                        text "#{number_format(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                      end
                  end
 
@@ -583,7 +572,7 @@ class ReceiptBillPdf < Prawn::Document
                  text "Total Balance", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
         end
 
@@ -615,7 +604,7 @@ class ReceiptBillPdf < Prawn::Document
                 text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
+                text "(" + "#{ number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -631,7 +620,7 @@ class ReceiptBillPdf < Prawn::Document
                 text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-                text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -643,7 +632,7 @@ class ReceiptBillPdf < Prawn::Document
                 text "Other Charges", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-                text "#{number_with_precision(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
     end
@@ -666,7 +655,7 @@ class ReceiptBillPdf < Prawn::Document
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
             move_down 15
-            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+            text "#{number_format(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
     end
 

app/pdf/receipt_bill_star_pdf.rb

@@ -1,5 +1,5 @@
 class ReceiptBillStarPdf < Prawn::Document
-    include ActionView::Helpers::NumberHelper
+    include NumberFormattable
 
     attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
 
@@ -28,11 +28,6 @@ class ReceiptBillStarPdf < Prawn::Document
         #setting page margin and width
         super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
-        #precision checked
-        if printer_settings.precision.to_i > 2
-            printer_settings.precision = 2
-        end
-
         # db font setup
         if printer_settings.font != ""
             font_families.update("#{printer_settings.font}" => {
@@ -48,23 +43,17 @@ class ReceiptBillStarPdf < Prawn::Document
         # font "public/fonts/Zawgyi-One.ttf"
         # font "public/fonts/padauk.ttf"
 
-        if printer_settings.delimiter
-            delimiter = ","
-        else
-            delimiter = ""
-        end
-
         header(shop_details)
 
         stroke_horizontal_rule
 
         cashier_info(sale_data, customer_name, latest_order_no)
-        line_items(sale_items,printer_settings.precision,delimiter)
-        all_total(sale_data,printer_settings.precision,delimiter)
+        line_items(sale_items,precision,delimiter)
+        all_total(sale_data,precision,delimiter)
 
 
         if member_info != nil
-            member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+            member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
         end
 
         customer(customer_name)
@@ -81,19 +70,19 @@ class ReceiptBillStarPdf < Prawn::Document
         #end card blanace amount
 
         if discount_price_by_accounts.length > 0 && shop_details.show_account_info
-            discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+            discount_account(discount_price_by_accounts,precision,delimiter)
         end
 
         if shop_details.show_account_info
-           items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+           items_account(item_price_by_accounts,precision,delimiter)
            if other_charges_amount
-               show_other_charges_amount(other_charges_amount,printer_settings.precision,delimiter)
+               show_other_charges_amount(other_charges_amount,precision,delimiter)
            end
         end
 
         #start for individual payment
         if !sale_data.equal_persons.nil?
-            individual_payment(sale_data,sale_data.equal_persons, printer_settings.precision, delimiter)
+            individual_payment(sale_data,sale_data.equal_persons, precision, delimiter)
         end
         #end for individual payment
 
@@ -268,8 +257,8 @@ class ReceiptBillStarPdf < Prawn::Document
         bounding_box([0,y_position], :width =>self.item_width + self.price_width, :height => self.item_height) do
            text "Sub Total", :size => self.item_font_size,:align => :left
         end
-        text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-        text_box  "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        text_box "#{number_format(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+        text_box  "#{number_format(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
     end
 
     def item_row(item,precision,delimiter,product_name,price,qty ,total_price)
@@ -293,9 +282,9 @@ class ReceiptBillStarPdf < Prawn::Document
             text "#{product_name}", :size => self.item_font_size,:align => :left
         end
             # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
-             text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
-            text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-             text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+             text_box "#{number_format(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "#{number_format(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+             text_box  "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
 
             if show_alt_name
                 if !(item.product_alt_name).empty?
@@ -325,7 +314,7 @@ class ReceiptBillStarPdf < Prawn::Document
             text "#{ dis_type }", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-            text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
+            text "( #{number_format(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
         end
 
         if sale_data.sale_taxes.length > 0
@@ -342,7 +331,7 @@ class ReceiptBillStarPdf < Prawn::Document
                     text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
                 end
                 bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text  "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                    text  "#{number_format(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
                 end
             end
         else
@@ -378,7 +367,7 @@ class ReceiptBillStarPdf < Prawn::Document
              text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
         end
         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-            text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+            text "#{number_format(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
         end
         move_down line_move
 
@@ -419,7 +408,7 @@ class ReceiptBillStarPdf < Prawn::Document
             end
 
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -430,7 +419,7 @@ class ReceiptBillStarPdf < Prawn::Document
                  text "Change Amount", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
           #  move_down line_move
         end
@@ -465,7 +454,7 @@ class ReceiptBillStarPdf < Prawn::Document
                             text "Rebate Earn", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
 
                     end
@@ -478,7 +467,7 @@ class ReceiptBillStarPdf < Prawn::Document
                             text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                            text "#{number_format(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
                         end
                     end
                 #end Total rebate if birthday
@@ -490,7 +479,7 @@ class ReceiptBillStarPdf < Prawn::Document
                      text "Redeem Amount", :size => self.item_font_size,:align => :left
                   end
                   bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                    text "#{number_format(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                   end
 
                  if current_balance != nil
@@ -500,7 +489,7 @@ class ReceiptBillStarPdf < Prawn::Document
                          text "Old Balance", :size => self.item_font_size,:align => :left
                      end
                       bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                        text "#{number_format(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                      end
                  end
 
@@ -522,7 +511,7 @@ class ReceiptBillStarPdf < Prawn::Document
                  text "Total Balance", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
         end
 
@@ -554,7 +543,7 @@ class ReceiptBillStarPdf < Prawn::Document
                 text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
+                text "(" + "#{ number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -570,7 +559,7 @@ class ReceiptBillStarPdf < Prawn::Document
                 text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-                text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
         end
@@ -582,7 +571,7 @@ class ReceiptBillStarPdf < Prawn::Document
                 text "Other Charges", :size => self.item_font_size,:align => :left
             end
             bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
-                text "#{number_with_precision(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                text "#{number_format(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
             end
             move_down line_move
     end
@@ -605,7 +594,7 @@ class ReceiptBillStarPdf < Prawn::Document
 
         bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
             move_down 15
-            text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+            text "#{number_format(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
     end
 

app/pdf/sale_items_pdf.rb

@@ -1,5 +1,5 @@
 class SaleItemsPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges)
@@ -41,17 +41,6 @@ class SaleItemsPdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-    #check delimiter
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header( shop_details)
 
     stroke_horizontal_rule

app/pdf/sale_items_star_pdf.rb

@@ -1,5 +1,5 @@
 class SaleItemsStarPdf < Prawn::Document
-  include ActionView::Helpers::NumberHelper
+  include NumberFormattable
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
 
   def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges)
@@ -41,17 +41,6 @@ class SaleItemsStarPdf < Prawn::Document
     # font "public/fonts/Zawgyi-One.ttf"
     # font "public/fonts/padauk.ttf"
 
-    #precision checked
-    if printer_settings.precision.to_i > 2
-        printer_settings.precision = 2
-    end
-    #check delimiter
-    if printer_settings.delimiter
-        delimiter = ","
-    else
-        delimiter = ""
-    end
-
     header( shop_details)
 
     stroke_horizontal_rule

app/views/home/dashboard.html.erb

@@ -199,19 +199,20 @@
                 <tr>
                 <% revenue = @summ_sale.total_amount - @summ_sale.total_discount%>
                   <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
-                  <td align="right"><%= number_with_precision( revenue, precision: @precision.to_i ,delimiter: @delimiter) %></td>
+
+                  <td align="right"><%= number_format( revenue, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %></td>
+                  <td align="right"><%= number_format( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %></td>
+                  <td align="right"><%= number_format( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total_sale") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: @precision.to_i ,delimiter: @delimiter)%></td>
+                  <td align="right"><%= number_format( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
               </table>
               <table class="table">
@@ -228,7 +229,8 @@
                           <td align="right">
                             <% @sale_data.each do |data| %>
                               <% pay_mth = payment.payment_method %>
-                              <%= number_with_precision(data[""+pay_mth+""], precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
+
+                              <%= number_format(data[""+pay_mth+""], precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
                             <% end %>
                           </td>
                         </tr>
@@ -241,7 +243,9 @@
                       <tr>
                         <td><%= t("views.right_panel.detail.other_payment") %> : </td>
                         <td align="right">
-                            <%= number_with_precision(total_card["card"], precision: @precision.to_i ,delimiter: @delimiter) rescue number_with_precision(0, precision: @precision.to_i ,delimiter: @delimiter) %>
+
+                            <%= number_format(total_card["card"], precision: precision.to_i ,delimiter: delimiter) rescue number_format(0, precision: precision.to_i ,delimiter: delimiter) %>
+
                         </td>
                       </tr>
                   <% end %>

app/views/origami/dashboard/index.html.erb

@@ -6,18 +6,6 @@
     <!-- <h2><%= t :dashboard %></h2> -->
     <h2><%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></h2>
   </div>
-  <% if @print_settings.precision.to_i > 0
-    precision = @print_settings.precision
-  else
-    precision = 0
-  end
-    #check delimiter
-    if @print_settings.delimiter
-      delimiter = ","
-    else
-      delimiter = ""
-    end
-    %>
 
     <!-- Widgets -->
     <div class="row clearfix">
@@ -91,19 +79,19 @@
                 <tr>
                 <% revenue = @summ_sale.total_amount - @summ_sale.total_discount%>
                   <td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
-                  <td align="right"><%= number_with_precision( revenue, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_format( revenue, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
+                  <td align="right"><%= number_format( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_format( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
                 <tr>
                   <td><%= t("views.right_panel.detail.total") %> <%= t :sale %> : </td>
-                  <td align="right"><%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
+                  <td align="right"><%= number_format( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%></td>
                 </tr>
               </table>
               <table class="table">

app/views/origami/discounts/index.html.erb

@@ -2,20 +2,6 @@
  <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
  </div>
- 	<% if !@print_settings.nil? %>
-	    <% if @print_settings.precision.to_i > 0
-	        precision = @print_settings.precision
-	      else
-	        precision = 0
-	      end
-	      #check delimiter
-	      if @print_settings.delimiter
-	        delimiter = ","
-	      else
-	        delimiter = ""
-	      end
-	    %>
-  	<% end %>
  	<div class="row">
  		<!-- Column One -->
  		<div class="col-lg-6 col-md-6 col-sm-6">
@@ -96,7 +82,7 @@
       			<table class="table" id="order-charges-table" border="0">
       				<tr>
       					<td class="charges-name"><strong>Sub Total:</strong></td>
-      					<td class="item-attr"><strong id="order-sub-total"><%= number_with_precision(sub_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong></td>
+      					<td class="item-attr"><strong id="order-sub-total"><%= number_format(sub_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong></td>
       				</tr>
               <!-- <tr>
                 <td class="charges-name"><strong>Food:</strong></td>
@@ -113,15 +99,15 @@
             	<td class="charges-name"><strong>Discount:</strong></td>
             	<%end%>
 
-            	<td class="item-attr">(<strong id="order-discount"><%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong>)</td>
+            	<td class="item-attr">(<strong id="order-discount"><%= number_format(@sale_data.total_discount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong>)</td>
             </tr>
             <tr class="hidden">
             	<td class="charges-name"><strong>Tax:</strong></td>
-            	<td class="item-attr"><strong id="order-Tax"><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong></td>
+            	<td class="item-attr"><strong id="order-Tax"><%= number_format(@sale_data.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong></td>
             </tr>
             <tr class="hidden">
             	<td class="charges-name"><strong>Grand Total:</strong></td>
-            	<td class="item-attr"><strong id="order-grand-total"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong></td>
+            	<td class="item-attr"><strong id="order-grand-total"><%= number_format(@sale_data.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong></td>
             </tr>
         </table>
     </div>
@@ -283,6 +269,8 @@ var cashier_type = "<%= @cashier_type %>";
 var totalAmount = <%= sub_total %>;
 var totalDiscount = <%= @sale_data.total_discount %>
 var precision = <%= precision %>;
+var originalAmount = totalAmount;
+var originalDiscount = totalDiscount;
 	$(document).ready(function(){
     	setHeaderBreadCrumb(_DISCOUNTS_);
     	/* check webview loaded*/
@@ -312,7 +300,7 @@ var precision = <%= precision %>;
 				switch (input_type) {
 					case 'num':
 						var input_value = $(this).attr("data-value");
-						if (original_value == "0.0"){
+						if (parseFloat(original_value) == 0){
 							$('#discount-amount').val(input_value);
 						}
 						else{
@@ -329,7 +317,7 @@ var precision = <%= precision %>;
 						$('#discount-amount').val(discount_text.substr(0,discount_text.length-1));
 						break;
 					case 'clr':
-						$('#discount-amount').val("0.0");
+						$('#discount-amount').val("0");
 						break;
 				}
 				event.handled = true;
@@ -379,7 +367,7 @@ var precision = <%= precision %>;
 		e.preventDefault();
 		var sale_id = $('#sale-id').text();
 		var discount_value = $('#discount-amount').val();
-		var sub_total = parseFloat($('#order-sub-total').text());
+		var sub_total = totalAmount;
 		var ajax_url = "/origami/" + sale_id + "/discount";
 
 		if(discount_value!=""){
@@ -449,18 +437,15 @@ var precision = <%= precision %>;
 	// Remove selected discount items
 	$("#remove-item").on('click', function(e){
 		e.preventDefault();
-		var origin_sub_total = parseFloat($("#order-sub-total").text());
 		// var total = 0;
 
 		$('.item-row.new-discount').each(function(i){
-			var amount = parseFloat($(this).find('#item-total-price').text());
-      totalAmount += Math.abs(amount)
 			// total = total + Math.abs(amount);
 			$(this).remove();
 		});
 
-		$("#order-sub-total").text(totalAmount);
-    $("#order-discount").text(totalDiscount.toFixed(<%= precision.to_i %>));
+		$("#order-sub-total").text(originalAmount.toFixed(<%= precision.to_i %>));
+    $("#order-discount").text(originalDiscount.toFixed(<%= precision.to_i %>));
 	});
 
 	// Pay Discount for Payment
@@ -472,8 +457,8 @@ var precision = <%= precision %>;
 		$("#loading_wrapper").show();
 		var sale_id = $('#sale-id').text();
 		var discount_items = JSON.stringify(get_new_discount_item_rows());
-		var overall_discount = $("#order-discount").text();
-		var sub_total = $('#order-sub-total').text();
+		var overall_discount = totalDiscount;
+		var sub_total = totalAmount;
 		var ajax_url = "/origami/" + sale_id + "/discount";
 
 		var params = { 'cashier_type' : cashier_type,'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
@@ -578,7 +563,7 @@ var precision = <%= precision %>;
 	$("#member-discount").on('click', function(e){
 		e.preventDefault();
 		var sale_id = $('#sale-id').text();
-		var sub_total = $('#order-sub-total').text();
+		var sub_total = totalAmount;
 		var ajax_url = "/origami/" + sale_id + "/member_discount";
 
 		// Selected Account
@@ -702,9 +687,7 @@ function get_selected_account_types(){
 
 /* Calculate Overall Discount*/
 function calculate_overall_discount(type, amount){
-	var origin_sub_total = parseFloat($("#order-sub-total").text()) + parseFloat($("#order-discount").text());
-	var dis_amount = 0;
-	var sub_total = 0;
+	var sub_total = totalAmount;
 	var total_discount = 0;
 
 	// For Net Pay
@@ -724,18 +707,16 @@ function calculate_overall_discount(type, amount){
 			});
 		}
 		else{
-			total_discount = Math.round(totalAmount * amount / 100 * Math.pow(10, precision)) / Math.pow(10, precision);
+			total_discount = Math.round(sub_total * amount / 100 * Math.pow(10, precision)) / Math.pow(10, precision);
 		}
 	}
-
-  sub_total = parseFloat(totalAmount) - parseFloat(total_discount)
-
+  totalDiscount = total_discount
 	$("#order-discount").text(parseFloat(total_discount).toFixed(<%= precision.to_i %>));
 }
 
 /* Calculate Items Discount*/
 function calculate_item_discount(type, amount, sale_items, account_types){
-	var origin_sub_total = parseFloat($("#order-sub-total").text());
+	var origin_sub_total = totalAmount;
 	var dis_amount = 0;
 	var sub_total = 0;
 	var total_discount = 0;
@@ -749,17 +730,6 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 			dis_amount = -Math.round(amount * Math.pow(10, precision)) / Math.pow(10, precision);
 			if(sale_items.length > 0){
 				for(var i=0;i < sale_items.length;i++){
-					// if(account_types.length > 0){
-					// 	for(var j=0; j < account_types.length; j++){
-					// 		if(sale_items[i].account_id == account_types[j].id){
-					// 			// Discount Items
-					// 	        var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
-					// 	        $("#order-items-table tbody").append(discount_item_row);
-					// 	        total_discount = total_discount + amount;
-					// 		}
-					// 	}
-					// }
-					// else {
 					if(parseFloat(amount) > parseFloat(sale_items[i].price)){
 						arrItemName += ", " + sale_items[i].name;
 					}else{
@@ -773,7 +743,6 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 							$("#discount-amountErr").html("Discount is greater than sub total!");
 						}
 					}
-					// }
 				}
 			}
 
@@ -789,26 +758,6 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 
 			}
 
-			// No Needs For Auto Selected
-			// if(account_types.length > 0){
-			// 	var item_rows=get_item_rows();
-			// 	if(item_rows.length > 0){
-			// 		for(var k=0; k < item_rows.length; k++){
-			// 			for(var j=0; j < account_types.length; j++){
-			// 				if(item_rows[k].account_id == account_types[j].id){
-			// 					// Discount Items
-			// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-			// 			        $("#order-items-table tbody").append(discount_item_row);
-			// 			        total_discount = total_discount + amount;
-			// 				}
-			// 			}
-			// 		}
-			// 	}
-			// 	else {
-			// 		alert("No Items!");
-			// 	}
-			// }
-
 			sub_total = parseFloat(origin_sub_total) - parseFloat(total_discount);
       totalAmount = sub_total
   		$("#order-sub-total").text(parseFloat(sub_total).toFixed(<%= precision.to_i %>));
@@ -829,18 +778,6 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 				// Check sale items exists
 				if(sale_items.length > 0){
 					for(var i=0;i < sale_items.length;i++){
-						// if(account_types.length > 0){
-						// 	for(var j=0; j < account_types.length; j++){
-						// 		if(sale_items[i].account_id == account_types[j].id){
-						// 			// Discount Items
-						// 			dis_amount = 0 - ((sale_items[i].price * amount)/100);
-						// 	        var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
-						// 	        $("#order-items-table tbody").append(discount_item_row);
-						// 	        total_discount = total_discount + dis_amount;
-						// 		}
-						// 	}
-						// }
-						// else {
 							dis_amount = -Math.round(sale_items[i].price * amount / 100 * Math.pow(10, precision)) / Math.pow(10, precision);
 							var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
 
@@ -851,35 +788,12 @@ function calculate_item_discount(type, amount, sale_items, account_types){
 								total_discount = total_discount - dis_amount;
 								$("#discount-amountErr").html("Discount is greater than sub total!");
 							}
-						// }
 					}
 					sub_total = parseFloat(origin_sub_total) + parseFloat(total_discount);
           totalAmount = sub_total
       		$("#order-sub-total").text(parseFloat(sub_total).toFixed(<%= precision.to_i %>));
 				}
 			}
-			// No Needs For Auto Selected
-			// Check account types exists
-			// if(account_types.length > 0){
-			// 	var item_rows=get_item_rows();
-			// 	console.log(account_types);
-			// 	if(item_rows.length > 0){
-			// 		for(var k=0; k < item_rows.length; k++){
-			// 			for(var j=0; j < account_types.length; j++){
-			// 				if(item_rows[k].account_id == account_types[j].id){
-			// 					// Discount Items
-			// 					dis_amount = 0 - ((item_rows[k].price * amount)/100);
-			// 			        var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
-			// 			        $("#order-items-table tbody").append(discount_item_row);
-			// 			        total_discount = total_discount + dis_amount;
-			// 				}
-			// 			}
-			// 		}
-			// 	}
-			// 	else {
-			// 		alert("No Items!");
-			// 	}
-			// }
 		}
 
 	}else{

app/views/origami/home/show.html.erb

@@ -2,20 +2,6 @@
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
-   <% if !@print_settings.nil? %>
-    <% if @print_settings.precision.to_i > 0
-        precision = @print_settings.precision
-      else
-        precision = 0
-      end
-      #check delimiter
-      if @print_settings.delimiter
-        delimiter = ","
-      else
-        delimiter = ""
-      end
-    %>
-  <% end %>
   <div class="row clearfix">
     <!-- Column One -->
     <div class="col-lg-6 col-md-6 col-sm-6">
@@ -364,7 +350,7 @@
               <table class="table" id="order-charges-table" border="0">
                   <tr>
                     <td class="charges-name"><strong>Sub Total:</strong></td>
-                    <td class="item-attr"><strong id="sub-total"><%= number_with_precision(sub_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong></td>
+                    <td class="item-attr"><strong id="sub-total"><%= number_format(sub_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong></td>
                   </tr>
                   <tr>
                     <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%>
@@ -373,7 +359,7 @@
                       <td class="charges-name"><strong>Discount:</strong></td>
                     <%end%>
 
-                     <td class="item-attr"><strong id="order-discount">(<%= number_with_precision(@obj_sale.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)</strong></td>
+                     <td class="item-attr"><strong id="order-discount">(<%= number_format(@obj_sale.total_discount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %>)</strong></td>
                   </tr>
             <% if @status_sale == "sale" %>
               <tr>
@@ -396,15 +382,15 @@
                     <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
                   <% end %>
                 </td>
-                <td class="item-attr"><strong id="order-Tax"><%= number_with_precision(@obj_sale.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td>
+                <td class="item-attr"><strong id="order-Tax"><%= number_format(@obj_sale.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></strong></td>
               </tr>
               <tr>
                 <td class="charges-name"><strong>Rounding Adj:</strong></td>
-                <td class="item-attr"><strong id="order-round-adj"><%= number_with_precision(@obj_sale.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td>
+                <td class="item-attr"><strong id="order-round-adj"><%= number_format(@obj_sale.rounding_adjustment, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></strong></td>
               </tr>
               <tr>
                 <td class="charges-name"><strong>Grand Total:</strong></td>
-                <td class="item-attr"><strong id="order-grand-total"><%= number_with_precision(@obj_sale.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></strong></td>
+                <td class="item-attr"><strong id="order-grand-total"><%= number_format(@obj_sale.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></strong></td>
               </tr>
             <% end %>
               <tr class="rebate_amount"></tr>

app/views/origami/payments/show.html.erb

@@ -2,20 +2,6 @@
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
-  <% if !@print_settings.nil? %>
-    <% if @print_settings.precision.to_i > 0
-        precision = @print_settings.precision
-      else
-        precision = 0
-      end
-      #check delimiter
-      if @print_settings.delimiter
-        delimiter = ","
-      else
-        delimiter = ""
-      end
-    %>
-  <% end %>
 
   <div class="row clearfix">
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -78,9 +64,9 @@
                     <% sub_total += sale_item.price%>
                     <tr>
                       <td><%= count %></td>
-                      <td class="item-name"><%=sale_item.product_name%>@<%=number_with_precision( sale_item.unit_price, precision: precision.to_i )%></td>
+                      <td class="item-name"><%=sale_item.product_name%>@<%=number_format( sale_item.unit_price, precision: precision.to_i )%></td>
                      <td class="item-attr"><%=sale_item.qty%></td>
-                    <td class="item-attr"><%=(number_with_precision(sale_item.price, precision: precision.to_i ))%></td>
+                    <td class="item-attr"><%=(number_format(sale_item.price, precision: precision.to_i ))%></td>
                  </tr>
                  <%end %>
                </tbody>
@@ -93,7 +79,7 @@
           <tfooter>
             <tr>
               <td class="charges-name"><strong>Sub Total</strong></td>
-              <td class="item-attr"><strong><span id="sub-total"><%=number_with_precision(sub_total, precision: precision.to_i)%></span></strong></td>
+              <td class="item-attr"><strong><span id="sub-total"><%=number_format(sub_total, precision: precision.to_i)%></span></strong></td>
             </tr>
             <tr>
               <%if @sale_data.discount_type == 'member_discount'%>
@@ -101,7 +87,7 @@
               <%else%>
               <td class="charges-name"><strong>(Discount)</strong></td>
               <%end%>
-              <td class="item-attr"><strong><span>(<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>)</span></strong></td>
+              <td class="item-attr"><strong><span>(<%= number_format(@sale_data.total_discount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %>)</span></strong></td>
             </tr>
             <tr>
               <td class="charges-name">
@@ -122,20 +108,20 @@
                   <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
                 <% end %>
               </td>
-              <td class="item-attr"><strong><span id="total_tax"><%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
+              <td class="item-attr"><strong><span id="total_tax"><%= number_format(@sale_data.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></span></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Rounding Adj:</strong></td>
-              <td class="item-attr"><strong><%= number_with_precision(@sale_data.rounding_adjustment, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></strong></td>
+              <td class="item-attr"><strong><%= number_format(@sale_data.rounding_adjustment, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Grand Total</strong></td>
-              <td class="item-attr"><strong><span><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%></span></strong></td>
+              <td class="item-attr"><strong><span><%= number_format(@sale_data.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></span></strong></td>
             </tr>
             <%if @balance > 0%>
             <tr>
               <td class="charges-name"><strong><%= @accountable_type %></strong></td>
-              <td class="item-attr"><strong><span><%=number_with_precision(@balance, precision: precision.to_i )%></span></strong></td>
+              <td class="item-attr"><strong><span><%=number_format(@balance, precision: precision.to_i )%></span></strong></td>
             </tr>
             <% end %>
             <% if !@individual_total[0].nil? %>
@@ -149,7 +135,7 @@
                   <td class="charges-name">
                     <strong>Amount Due (per person)</strong>
                   </td>
-                  <td class="item-attr"><strong><span><%= number_with_precision(@individual_total[0]['per_person_amount'], precision: precision.to_i )%></span></strong></td>
+                  <td class="item-attr"><strong><span><%= number_format(@individual_total[0]['per_person_amount'], precision: precision.to_i )%></span></strong></td>
               </tr>
             <% end %>
           </tfooter>
@@ -171,16 +157,16 @@
           <strong>
             <span id="grand_total" class="hidden">
               <% if @sale_payment.nil? %>
-                <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+                <%= number_format(@sale_data.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i)%>
               <% else %>
-                <%= number_with_precision(@sale_payment[0].payment_amount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+                <%= number_format(@sale_payment[0].payment_amount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i)%>
               <% end %>
             </span>
             <span id="amount_due">
               <% if @sale_payment.nil? %>
-                <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+                <%= number_format(@sale_data.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %>
               <% else %>
-                <%= number_with_precision(@sale_payment[0].payment_amount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+                <%= number_format(@sale_payment[0].payment_amount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i)%>
               <% end %>
             </span>
           </strong>
@@ -190,13 +176,13 @@
       <div class="row payment cash-color p-l-5 p-r-5">
         <div class="col-md-8">Cash</div>
         <div class="col-md-4" id="cash" >
-            <%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+            <%= number_format(@cash, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %>
         </div>
       </div>
       <% if @sale_payment.nil? && @cashier_type != "food_court" %>
         <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
           <div class="col-md-8">Credit</div>
-          <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <div class="col-md-4" id="credit"><%= number_format(@credit, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
         </div>
       <% else %>
         <div class="col-md-4 hidden" id="credit">0</div>
@@ -205,21 +191,21 @@
       <div class="row payment other-payment-color" id="card_payment" >
         <div class="col-md-8">Other Payments (KBZ Pay)</div>
         <div class="col-md-4" id="others">
-          <%= number_with_precision(@kbz_pay_amount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>
+          <%= number_format(@kbz_pay_amount, precision: precision.to_i) rescue number_format(0, precision: precision.to_i) %>
         </div>
       </div>
       <% elsif @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 && @giftvouchercount == 0.0 %>
         <div class="row payment other-payment-color" id="card_payment" >
           <div class="col-md-8">Other Payments</div>
           <div class="col-md-4" id="others">
-            <%= number_with_precision(@other, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>
+            <%= number_format(@other, precision: precision.to_i) rescue number_format(0, precision: precision.to_i) %>
           </div>
         </div>
       <% else %>
         <div class="row payment other-payment-color" id="card_payment" >
           <div class="col-md-8">Other Payments</div>
           <div class="col-md-4" id="other_payment_amount">
-            <%= number_with_precision(@other_payment, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>
+            <%= number_format(@other_payment, precision: precision.to_i) rescue number_format(0, precision: precision.to_i) %>
           </div>
         </div>
       <% end %>
@@ -231,9 +217,9 @@
             <div class="col-md-5"></div>
             <div class="col-md-3">MPU</div>
           <% if @other != 0.0 %>
-            <div class="col-md-4 mpu is_card" id="others"><%= number_with_precision(@other, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 mpu is_card" id="others"><%= number_format(@other, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="others"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="others"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
           </div>
 
@@ -242,9 +228,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">Redeem</div>
           <% if @ppamount != 0.0 %>
-          <div class="col-md-4" id="ppamount"><%= number_with_precision(@ppamount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+          <div class="col-md-4" id="ppamount"><%= number_format(@ppamount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-          <div class="col-md-4" id="ppamount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+          <div class="col-md-4" id="ppamount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -253,9 +239,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">VISA</div>
           <% if @visacount != 0.0 %>
-            <div class="col-md-4 visa is_card" id="visacount"><%= number_with_precision(@visacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 visa is_card" id="visacount"><%= number_format(@visacount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="visacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="visacount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -264,9 +250,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">JCB</div>
           <% if @jcbcount != 0.0 %>
-            <div class="col-md-4 jcb is_card" id="jcbcount"><%= number_with_precision(@jcbcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 jcb is_card" id="jcbcount"><%= number_format(@jcbcount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="jcbcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="jcbcount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -275,9 +261,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">MASTER</div>
           <% if @mastercount != 0.0 %>
-            <div class="col-md-4 master is_card" id="mastercount"><%= number_with_precision(@mastercount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="mastercount"><%= number_format(@mastercount, precision: precision.to_i) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="mastercount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="mastercount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
         <!-- <br> -->
@@ -287,9 +273,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">UNIONPAY</div>
           <% if @unionpaycount != 0.0 %>
-            <div class="col-md-4 master is_card" id="unionpaycount"><%= number_with_precision(@unionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="unionpaycount"><%= number_format(@unionpaycount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="unionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="unionpaycount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -298,9 +284,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">Alipay</div>
           <% if @alipaycount != 0.0 %>
-            <div class="col-md-4 alipay is_card" id="alipaycount"><%= number_with_precision(@alipaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 alipay is_card" id="alipaycount"><%= number_format(@alipaycount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="alipaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="alipaycount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -309,9 +295,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">PAYMAL</div>
           <% if @paymalcount != 0.0 %>
-            <div class="col-md-4 master is_card" id="paymalcount"><%= number_with_precision(@paymalcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="paymalcount"><%= number_format(@paymalcount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="paymalcount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="paymalcount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
         <!-- DINGA -->
@@ -319,9 +305,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">DINGA</div>
           <% if @dingacount != 0.0 %>
-            <div class="col-md-4 master is_card" id="dingacount"><%= number_with_precision(@dingacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="dingacount"><%= number_format(@dingacount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="dingacount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="dingacount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -330,9 +316,9 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">JUNCTION PAY</div>
           <% if @junctionpaycount != 0.0 %>
-            <div class="col-md-4 master is_card" id="junctionpaycount"><%= number_with_precision(@junctionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="junctionpaycount"><%= number_format(@junctionpaycount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="junctionpaycount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="junctionpaycount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
@@ -341,15 +327,15 @@
           <div class="col-md-5"></div>
           <div class="col-md-3">GIFT VOUCHER</div>
           <% if @giftvouchercount != 0.0 %>
-            <div class="col-md-4 master is_card" id="giftvouchercount"><%= number_with_precision(@giftvouchercount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4 master is_card" id="giftvouchercount"><%= number_format(@giftvouchercount, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></div>
           <% else %>
-            <div class="col-md-4" id="giftvouchercount"><%= number_with_precision(0, precision: precision.to_i ) %></div>
+            <div class="col-md-4" id="giftvouchercount"><%= number_format(0, precision: precision.to_i ) %></div>
           <% end %>
         </div>
 
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong class='amount_balance'>Balance</strong></div>
-          <div class="col-md-4"><strong><span id='balance'><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong></div>
+          <div class="col-md-4"><strong><span id='balance'><%= number_format(@sale_data.grand_total, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i ) %></span></strong></div>
         </div>
         <!-- <br> -->
       </div>

app/views/origami/table_invoices/show.html.erb

@@ -1,19 +1,5 @@
 <div class="container-fluid">
 <div class="row">
-<% if !@print_settings.nil? %>
-  <% if @print_settings.precision.to_i > 0
-      precision = @print_settings.precision
-    else
-      precision = 0
-    end
-    #check delimiter
-    if @print_settings.delimiter
-      delimiter = ","
-    else
-      delimiter = ""
-    end
-  %>
-<% end %>
 
  <div class="col-lg-4 col-md-6 col-sm-6">
        <!-- <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> -->
@@ -89,7 +75,7 @@
                  <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
                  <td class='item-attr'><%= sale_item.qty %></td>
-                 <td class='item-attr'><%= number_with_precision(sale_item.price, precision: precision.to_i ) %></td>
+                 <td class='item-attr'><%= number_format(sale_item.price, precision: precision.to_i ) %></td>
                </tr>
                <%
                      # end
@@ -108,7 +94,7 @@
                  <td><%= count %></td>
                  <td class='item-name'><%= order_item.item_name %></td>
                  <td class='item-attr'><%= order_item.qty %></td>
-                 <td class='item-attr'><%= number_with_precision(order_item.qty*order_item.price, precision: precision.to_i ) %></td>
+                 <td class='item-attr'><%= number_format(order_item.qty*order_item.price, precision: precision.to_i ) %></td>
                </tr>
                <%
                      end
@@ -124,7 +110,7 @@
            <table class="table" id="order-charges-table" border="0">
              <tr>
                <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><span id="sub_total"><%= number_with_precision(sub_total, precision: precision.to_i ) %></span></strong></td>
+               <td class="item-attr"><strong id="order-sub-total"><span id="sub_total"><%= number_format(sub_total, precision: precision.to_i ) %></span></strong></td>
              </tr>
              <tr>
                <%if @sale.discount_type == 'member_discount'%>
@@ -132,19 +118,19 @@
                <%else%>
                 <td class="charges-name"><strong>Discount:</strong></td>
                <%end%>
-               <td class="item-attr"><strong id="order-discount">(<%= number_with_precision(@sale.total_discount, precision: precision.to_i ) rescue 0%>)</strong></td>
+               <td class="item-attr"><strong id="order-discount">(<%= number_format(@sale.total_discount, precision: precision.to_i ) rescue 0%>)</strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Tax:</strong></td>
-               <td class="item-attr"><strong id="order-Tax"><%= number_with_precision(@sale.total_tax, precision: precision.to_i ) rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-Tax"><%= number_format(@sale.total_tax, precision: precision.to_i ) rescue 0%></strong></td>
              </tr>
               <tr>
                <td class="charges-name"><strong>Rounding Adj:</strong></td>
-               <td class="item-attr"><strong id="order-round-adj"><%= number_with_precision(@sale.rounding_adjustment, precision: precision.to_i ) rescue 0%></strong></td>
+               <td class="item-attr"><strong id="order-round-adj"><%= number_format(@sale.rounding_adjustment, precision: precision.to_i ) rescue 0%></strong></td>
              </tr>
              <tr>
                <td class="charges-name"><strong>Grand Total:</strong></td>
-               <td class="item-attr"><strong id="order-grand-total"><span id="grand_total"><%= number_with_precision(@sale.grand_total, precision: precision.to_i ) rescue 0%></span></strong></td>
+               <td class="item-attr"><strong id="order-grand-total"><span id="grand_total"><%= number_format(@sale.grand_total, precision: precision.to_i ) rescue 0%></span></strong></td>
              </tr>
               <tr class="rebate_amount"></tr>
            </table>

app/views/reports/commission/index.html.erb

@@ -43,18 +43,6 @@
         </tr>
         </thead>
         <tbody>
-        <% if @print_settings.precision.to_i > 0
-              precision = @print_settings.precision
-              else
-                precision = 0
-              end
-               #check delimiter
-              if @print_settings.delimiter
-                delimiter = ","
-            else
-                delimiter = ""
-            end
-             %> 
         <% total_qty = 0 %>
         <% total_price = 0 %>
         <% total_amount = 0 %>
@@ -65,9 +53,9 @@
               <td><%= result.sale_item_id rescue '-' %></td>
               <td><%= result.commissioner.name rescue '-' %></td>
               <td><%= result.porduct_name rescue '-' %></td>
-              <td><%= number_with_precision(result.qty.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-              <td><%= number_with_precision(result.price.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-              <td><%= number_with_precision(result.amount.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(result.qty.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(result.price.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(result.amount.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
               <td><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %></td>
             </tr>
             <% total_qty += result.qty.to_f %>
@@ -77,9 +65,9 @@
 
         <tr style="border-top: 3px solid grey;">
           <td colspan="4"></td>
-          <td><b><%= number_with_precision(total_qty, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
-          <td><b><%= number_with_precision(total_price, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
-          <td><b><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_format(total_qty, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_format(total_price, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_format(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
           <td></td>
         </tr>
         </tbody>
@@ -92,5 +80,3 @@
 
     });
 </script>
-
-

app/views/reports/credit_payment/index.html.erb

@@ -23,18 +23,6 @@
 
 <div class="margin-top-20">
 	<div class="card ">
-	<% if @print_settings.precision.to_i > 0
-			    precision = @print_settings.precision
-		    else
-			    precision = 0
-		    end
-		     #check delimiter
-		    if @print_settings.delimiter
-			    delimiter = ","
-			else
-			    delimiter = ""
-			end
-			     %>
 		<% unless @sale_data.blank? %>
 
 			<table class="table table-striped" border="0">
@@ -82,7 +70,7 @@
 						</td>
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.customer_name rescue '-' %></td>
-						<td><%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+						<td><%= number_format(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 						<td>
 							<%if credit.credit_payment_shift_name == '-' %>
 								<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%>
@@ -92,16 +80,16 @@
 						</td>
 						<td><%= credit.credit_payment_receipt_date rescue '-' %></td>
 						<td><%= credit.credit_payment_cashier_name rescue '-' %></td>
-						<td><%= number_with_precision(credit.credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+						<td><%= number_format(credit.credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 				  </tr>
 				<% end %>
 				<tr>
 					<td colspan="5"><b>Total</b></td>
-					<td><b><%= number_with_precision(total_credit_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+					<td><b><%= number_format(total_credit_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
-					<td><b><%= number_with_precision(total_credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+					<td><b><%= number_format(total_credit_payment, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 				</tr>
 			  </tbody>
 			</table>

app/views/reports/dailysale/index.html.erb

@@ -125,18 +125,6 @@
 
 								</tr>
 							</thead>
-							<% if @print_settings.precision.to_i > 0
-							      	 precision = @print_settings.precision
-								   else
-								   	precision = 0
-								   end
-								    #check delimiter
-								    if @print_settings.delimiter
-								        delimiter = ","
-								    else
-								        delimiter = ""
-								    end
-							    %>
 							<% unless @sale_data.blank? %>
 							<tbody>
 								<% void   = 0 %>
@@ -186,50 +174,50 @@
 									<td style='text-align:right;'><%= count %></td>
 									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
 									<% if @payment_methods.include? ("MPU") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Master") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("VISA") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JCB") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("UNIONPAY") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("KBZPay") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:kbzpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:kbzpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("GiftVoucher") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;'><%= number_format(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
-									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='color:red;text-align:right;'><%= number_format(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
-									<td style='text-align:right;'>(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
-									<!-- <td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   -->
-									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'>(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
+									<!-- <td style='text-align:right;'><%= number_format(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   -->
+									<td style='text-align:right;'><%= number_format(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 								</tr>
 								<% count = count + 1 %>
@@ -241,80 +229,80 @@
 									  <% if !request.user_agent.include? "Mobile" %>
 									    <% colspan += 1 %>
 									  <% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(mpu ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(mpu ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("Master") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("VISA") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("JCB") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("UNIONPAY") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("KBZPay") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(kbzpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(kbzpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
 										<% if !request.user_agent.include? "Mobile" %>
 											<% colspan += 1 %>
 										<% end %>
-										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("GiftVoucher") %>
 										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;'><%= number_format(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
-									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='color:red;text-align:right;'><%= number_with_precision(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='color:red;text-align:right;'><%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
-									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'>(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_format(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 								</tr>
 								<tr style="font-weight:600;">
@@ -327,7 +315,7 @@
 										total_tax += tax.tax_amount.to_f %>
 										<tr style="font-weight:600;">
 											<td colspan="<%= colspan %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-											<td colspan="2" style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+											<td colspan="2" style='text-align:right;'><%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 										</tr>
 									<% end %>
 								<% end %>
@@ -337,7 +325,7 @@
 								<% net = net - total_tax %>
 								<tr style="font-weight:600;">
 									<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td colspan="2" style='text-align:right;'><%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td colspan="2" style='text-align:right;'><%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								</tbody>
 							<% end %>

app/views/reports/dailysale/index.xls.erb

@@ -64,18 +64,6 @@
 
 							</tr>
 						</thead>
-						<% if @print_settings.precision.to_i > 0
-							precision = @print_settings.precision
-						else
-							precision = 0
-						end
-					    #check delimiter
-					    if @print_settings.delimiter
-					    	delimiter = ","
-					    else
-					    	delimiter = ""
-					    end
-					    %>
 					    <% unless @sale_data.blank? %>
 
 					    <tbody>
@@ -144,7 +132,7 @@
 					    			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]),delimiter => ',') rescue '-'%></td>
 					    		<% end %>
 					    		<% if @payment_methods.include? ("KBZPay") %>
-									<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:kbzpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_format(sale[:kbzpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<% end %>
 					    		<% if @payment_methods.include? ("PAYMAL") %>
 					    			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]),delimiter => ',') rescue '-'%></td>

app/views/reports/hourly_saleitem/index.html.erb

@@ -60,18 +60,6 @@
                 <% sale_item_count =sale_item_count +1 %>
               <% end %>
               <tbody>
-								<% if @print_settings.precision.to_i > 0
-									precision = @print_settings.precision
-								else
-									precision = 0
-								end
-								#check delimiter
-								if @print_settings.delimiter
-									delimiter = ","
-							    else
-									delimiter = ""
-							    end
-								 %>
                 <!-- all total qty sum -->
                   <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
                     total_qty += sale.total_item
@@ -113,8 +101,8 @@
                       <td><%= sale.item_code %></td>
 								  		<td><%= sale.product_name %></td>
 								  		<td><%= sale.total_item.to_i %></td>
-								  		<td><%= number_with_precision(sale.unit_price.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
-								  		<td><%= number_with_precision(sale.grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.unit_price.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
 											<!-- <td><%= sale.date_format %></td> -->
 								  	</tr>
 							  	<% end %>
@@ -133,7 +121,7 @@
 											  			<td style="text-align:right"> <strong>Grand Total: </strong></td>
 											  			<td >
 											  				<span class="underline" style="text-align:right">
-											  					<strong><%= number_with_precision(grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></strong>
+											  					<strong><%= number_format(grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></strong>
 																	<% grand_total = 0 %>
 											  				</span>
 											  		 	</td>

app/views/reports/hourly_saleitem/index.xls.erb

@@ -50,18 +50,6 @@
                 <% sale_item_count =sale_item_count +1 %>
               <% end %>
               <tbody>
-								<% if @print_settings.precision.to_i > 0
-									precision = @print_settings.precision
-								else
-									precision = 0
-								end
-								#check delimiter
-								if @print_settings.delimiter
-									delimiter = ","
-							    else
-									delimiter = ""
-							    end
-								 %>
                 <!-- all total qty sum -->
                   <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
                     total_qty += sale.total_item
@@ -103,8 +91,8 @@
                       <td><%= sale.item_code %></td>
 								  		<td><%= sale.product_name %></td>
 								  		<td><%= sale.total_item.to_i %></td>
-								  		<td><%= number_with_precision(sale.unit_price.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
-								  		<td><%= number_with_precision(sale.grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.unit_price.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></td>
 											<!-- <td><%= sale.date_format %></td> -->
 								  	</tr>
 							  	<% end %>
@@ -123,7 +111,7 @@
 											  			<td style="text-align:right"> <strong>Grand Total: </strong></td>
 											  			<td >
 											  				<span class="underline" style="text-align:right">
-											  					<strong><%= number_with_precision(grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></strong>
+											  					<strong><%= number_format(grand_total.to_i, precision:precision.to_i,delimiter:delimiter) %></strong>
 																	<% grand_total = 0 %>
 											  				</span>
 											  		 	</td>

app/views/reports/order_reservation/index.html.erb

@@ -62,17 +62,6 @@
 						</tr>
 					</thead>
 					<tbody>
-						<% if @print_settings.precision.to_i > 0
-							precision = @print_settings.precision
-						else
-							precision = 0
-						end
-						#check delimiter
-						if @print_settings.delimiter
-							delimiter = ","
-					    else
-							delimiter = ""
-					    end %>
 					    <%
 					    	discount_amount = 0.0
 					    	delivery_fee = 0.0
@@ -147,32 +136,32 @@
 									<td><%= provider%></td>
 									<td><%= payment_type%></td>
 									<td><%= order_reservation.payment_status%></td>
-									<td><%= number_with_precision(order_reservation.total_amount,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<!-- <td><%= number_with_precision(delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td> -->
-									<td><%= number_with_precision(order_reservation.total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-									<td><%= number_with_precision(order_reservation.grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
-									<td><%= number_with_precision(order_reservation.transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
+									<td><%= number_format(order_reservation.total_amount,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<!-- <td><%= number_format(delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td> -->
+									<td><%= number_format(order_reservation.total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_format(order_reservation.grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
+									<td><%= number_format(order_reservation.transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
 								</tr>
 							<% end
 						end %>
 
 						<tr>
 							<td colspan="7"><b>Total</b></td>
-							<td><b><%= number_with_precision(total_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<!-- <td><b><%= number_with_precision(total_delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>-->
-							<td><b><%= number_with_precision(total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td> 
-							<td><b><%= number_with_precision(grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
-							<td><b><%= number_with_precision(total_transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<!-- <td><b><%= number_format(total_delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>-->
+							<td><b><%= number_format(total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
+							<td><b><%= number_format(total_transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
 						</tr>
 					</tbody>
 				</table>

app/views/reports/payment_method/index.html.erb

@@ -57,37 +57,25 @@
 							<th><%= t("views.right_panel.detail.giftvoucher_sales") %></th>
 						</tr>
 					</thead>
-					<% if @print_settings.precision.to_i > 0
-					    precision = @print_settings.precision
-					    else
-						    precision = 0
-					    end
-					     #check delimiter
-					    if @print_settings.delimiter
-						    delimiter = ","
-						else
-						    delimiter = ""
-						end
-			    	 %>
 					<% unless @sale_data.empty? %>
 						<tbody>
 							<% @sale_data.each do |sale| %>
 							<tr>
-								<td><%= number_with_precision(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:unionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:alipay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:kbzpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<!-- <td><%= number_with_precision(sale[:paymal_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> -->
-								<td><%= number_with_precision(sale[:dinga_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:junctionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:giftvoucher_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:unionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:alipay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:kbzpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<!-- <td><%= number_format(sale[:paymal_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> -->
+								<td><%= number_format(sale[:dinga_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:junctionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:giftvoucher_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							</tr>
 							<% end %>
 
@@ -135,11 +123,11 @@
 								<td><%= payment.payment_method rescue '-' %></td>
 								<td><%= payment.sale.customer.name rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
-								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
+								<td><%= number_format(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
-								<td><%= number_with_precision(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
+								<td><%= number_format(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%end%>
-								<td><%= number_with_precision(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 
 							</tr>
 
@@ -147,7 +135,7 @@
 						<%if total>0%>
 							<tr>
 							   <td colspan="5" style="text-align: right;"><strong >Total </strong></td>
-					    	 	<td colspan="2"><strong><%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
+					    	 	<td colspan="2"><strong><%=number_format(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
 						    </tr>
 					    <%end%>
 					</tbody>

app/views/reports/payment_method/index.xls.erb

@@ -44,37 +44,25 @@
 							<th><%= t("views.right_panel.detail.giftvoucher_sales") %></th>
 						</tr>
 					</thead>
-					<% if @print_settings.precision.to_i > 0
-					    precision = @print_settings.precision
-					    else
-						    precision = 0
-					    end
-					     #check delimiter
-					    if @print_settings.delimiter
-						    delimiter = ","
-						else
-						    delimiter = ""
-						end
-			    	 %>	
 					<% unless @sale_data.empty? %>
 						<tbody>
 							<% @sale_data.each do |sale| %>
 							<tr>
-								<td><%= number_with_precision(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:unionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:alipay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:kbzpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<!-- <td><%= number_with_precision(sale[:paymal_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> -->
-								<td><%= number_with_precision(sale[:dinga_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:junctionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-								<td><%= number_with_precision(sale[:giftvoucher_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:unionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:alipay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:kbzpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<!-- <td><%= number_format(sale[:paymal_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> -->
+								<td><%= number_format(sale[:dinga_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:junctionpay_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(sale[:giftvoucher_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							</tr>
 							<% end %>
 
@@ -122,11 +110,11 @@
 								<td><%= payment.payment_method rescue '-' %></td>
 								<td><%= payment.sale.customer.name rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
-								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
+								<td><%= number_format(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
-								<td><%= number_with_precision(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
+								<td><%= number_format(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%end%>
-								<td><%= number_with_precision(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_format(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 
 							</tr>
 
@@ -134,7 +122,7 @@
 						<%if total>0%>
 							<tr>
 							   <td colspan="4" style="text-align: right;"><strong >Total </strong></td>
-					    	 	<td colspan="2"><strong><%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
+					    	 	<td colspan="2"><strong><%=number_format(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
 						    </tr>
 					    <%end%>
 					</tbody>

app/views/reports/product_sale/index.html.erb

@@ -26,17 +26,6 @@
 				</div>
 
 				<div class="table-responsive">
-					<% if @print_settings.precision.to_i > 0
-						precision = @print_settings.precision
-					else
-						precision = 0
-					end
-					#check delimiter
-					if @print_settings.delimiter
-						delimiter = ","
-				    else
-						delimiter = ""
-				    end %>				
 					<table class="table table-striped" id="items_table" border="0">
 						<thead>
 							<tr>
@@ -96,8 +85,8 @@
 											<td><%= sale.item_code rescue '-' %></td>
 											<td><%= sale.product_name rescue '-' %></td>
 											<td><%= total_item[sale.item_code] rescue '-' %></td>
-											<!-- <td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td> -->
-											<td><%= number_with_precision(total_data[sale.item_code] ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
+											<!-- <td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td> -->
+											<td><%= number_format(total_data[sale.item_code] ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
 										</tr>
 										<!-- sub total -->
 									<!-- end sub total -->
@@ -107,7 +96,7 @@
 								<td colspan="3"></td>
 								<td><strong>Total</strong></td>
 								<td><strong><%= total_qty %></strong></td>
-								<td><strong><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
+								<td><strong><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-' %></strong></td>
 							</tr>
 
 						<% end %>

app/views/reports/receipt_no/index.html.erb

@@ -60,18 +60,6 @@
 						</tr>
 					</thead>
 					<tbody>
-					<% if @print_settings.precision.to_i > 0
-						precision = @print_settings.precision
-					else
-						precision = 0
-					end
-					#check delimiter
-					if @print_settings.delimiter
-						delimiter = ","
-				    else
-						delimiter = ""
-				    end %>
-
 						<% grand_total = 0 %>
 						<% old_grand_total = 0 %>
 						<% after_rounding = 0 %>
@@ -105,18 +93,18 @@
 							</td>
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
-							<td><%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) %></td>
-							<td><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '0' %></td>
+							<td><%= number_format(result.total_amount, precision: precision.to_i, delimiter: delimiter) %></td>
+							<td><%= number_format(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '0' %></td>
               <% @tax_profiles.each do |tax| %>
                 <% if sale_tax = result.sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %>
-              <td><%= number_with_precision(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
+              <td><%= number_format(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
                 <% else %>
-              <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
                 <% end %>
               <% end %>
-              <td><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
             <% if @lookup.value.to_i == 1 %>
               <td>
 								<!-- ############### Need to Check SyncStatus ############# -->
@@ -134,18 +122,18 @@
 						<% end %>
 						<tr style="border-top:4px double #666;">
 							<td colspan="3">&nbsp;</td>
-							<td><b><%= number_with_precision(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
-							<td><b><%= number_with_precision(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
                 <% if sale_tax = @sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %>
-              <td><%= number_with_precision(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
+              <td><%= number_format(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
                 <% else %>
-              <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
                 <% end %>
               <% end %>
-							<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0'  %></b></td>
-							<td><b><%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
-							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0'  %></b></td>
+							<td><b><%= number_format(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 							<td></td>
 						</tr>
 						<tr>

app/views/reports/receipt_no/index.xls.erb

@@ -40,17 +40,6 @@
 						</tr>
 					</thead>
 					<tbody>
-					<% if @print_settings.precision.to_i > 0
-						precision = @print_settings.precision
-					else
-						precision = 0
-					end
-					#check delimiter
-					if @print_settings.delimiter
-						delimiter = ","
-				    else
-						delimiter = ""
-				    end %>
 
 						<% grand_total = 0 %>
 						<% old_grand_total = 0 %>
@@ -85,34 +74,34 @@
 							</td>
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
-							<td><%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.total_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
               <% @tax_profiles.each do |tax| %>
                 <% if sale_tax = result.sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %>
-              <td><%= number_with_precision(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
+              <td><%= number_format(sale_tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
                 <% else %>
-              <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
                 <% end %>
               <% end %>
-              <td><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
 						</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
 							<td colspan="3">&nbsp;</td>
-							<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
-							<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
                 <% if sale_tax = @sale_taxes.find { |sale_tax| sale_tax.tax_name == tax.name } %>
-              <td><%= number_with_precision(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
+              <td><%= number_format(sale_tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %> </td>
                 <% else %>
-              <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_format(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
                 <% end %>
               <% end %>
-              <td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0'  %></b></td>
-							<td><b><%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
-							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+              <td><b><%= number_format(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0'  %></b></td>
+							<td><b><%= number_format(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_format(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 						</tr>
 						<tr>
 							<td colspan="3">&nbsp;</td>

app/views/reports/receipt_no_detail/index.html.erb

@@ -43,34 +43,21 @@
 						    </tr>
 						</thead>
 						<tbody>
-							<% if @print_settings.precision.to_i > 0
-							      	 precision = @print_settings.precision
-								   else
-								   	precision = 0
-								   end
-								    #check delimiter
-								    if @print_settings.delimiter
-								        delimiter = ","
-								    else
-								        delimiter = ""
-								    end
-							    %>
 							<% grand_total = 0 %>
 						    <% @sale_data.each do |result| %>
 						    <% table_name=nil
 						     table_type =nil
-						     if result.table_id.to_i>0
-						      table = DiningFacility.find(result.table_id)
+						     if table = result.bookings[0].dining_facility
 						      table_type = table.type
 						      table_name = table.name
 						     end %>
-							    <% grand_total = grand_total.to_f + result.grand_total.to_f%>
+							    <% grand_total = grand_total + result.grand_total %>
 								<tr style="border-top:4px double #666;">
 									<td><%= @shift_from %> -  <%= @shift_to  %></td>
 									<td><%= table_type %> -  <%= table_name  %></td>
 									<td><%= result.receipt_no rescue '-' %> </td>
 									<td><%= result.cashier_name rescue '-' %></td>
-						  		  	<td><%= number_with_precision(result.grand_total, precision:precision.to_i,delimiter:delimiter) %></td>
+				  		  	<td><%= number_format(result.grand_total, precision: precision, delimiter: delimiter) %></td>
 									<!-- <td>&nbsp;</td> -->
 								</tr>
 
@@ -85,8 +72,8 @@
 								<% result.sale_items.each do |item|%>
 									<tr>
 										<td>
-											<% if item.price.to_i < 0.to_i %>
-												<% if item.qty.to_i < 0.to_i%>
+											<% if item.price < 0 %>
+												<% if item.qty < 0 %>
 													[PROMO QTY]<%= item.product_name rescue '-' %>
 												<% else %>
 													[PROMO PRICE]<%= item.product_name rescue '-' %>
@@ -96,15 +83,15 @@
 											<% end %>
 										</td>
 										<td><%= item.qty rescue '-' %></td>
-										<td><%= number_with_precision(item.unit_price, precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-										<td><%= number_with_precision(item.price, precision:precision.to_i,delimiter:delimiter) rescue '-' %></td>
-										<td><%=l item.created_at.utc.getlocal, :format => :short rescue '-' %> </td>
+										<td><%= number_format(item.unit_price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %></td>
+										<td><%= number_format(item.price, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) rescue '-' %></td>
+										<td><%=l item.created_at.getlocal, :format => :short rescue '-' %> </td>
 									</tr>
 								<% end %>
 
 								<tr><td colspan="5">&nbsp;</td></tr>
 
-								<%survey = Survey.find_by_receipt_no(result.receipt_no)%>
+								<%survey = result.survey%>
 								<% if !survey.nil?%>
 									<tr>
 									    <td>&nbsp;</td>
@@ -120,19 +107,19 @@
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-										<td><%= number_with_precision(result.total_amount, precision:precision.to_i,delimiter:delimiter) %></td>
+										<td><%= number_format(result.total_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></td>
 										<td>&nbsp;</td>
 									</tr>
 								<% end %>
 
-								<% if result.total_discount.to_f > 0 %>
+								<% if result.total_discount > 0 %>
 									<tr>
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td><%= t("views.right_panel.detail.total") %>
 											<%= t("views.right_panel.detail.discount") %>
 											<%= t("views.right_panel.detail.amount") %></td>
-										<td> - <%= number_with_precision(result.total_discount, precision:precision.to_i,delimiter:delimiter) %> </td>
+										<td> - <%= number_format(result.total_discount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> </td>
 										<td>&nbsp;</td>
 									</tr>
 								<% end %>
@@ -142,19 +129,19 @@
 										<td>&nbsp;</td>
 										<td>&nbsp;</td>
 										<td>Tax Amount </td>
-										<td><%= number_with_precision(result.total_tax, precision:precision.to_i,delimiter:delimiter) %> </td>
+										<td><%= number_format(result.total_tax, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> </td>
 										<td>&nbsp;</td>
 									</tr>
 								<% end %>
-								<% sale_payments = SalePayment.get_sale_payments(result) %>
+								<% sale_payments = result.sale_payments %>
 								<% if sale_payments.length > 0%>
 									<% sale_payments.each do |rec| %>
-										<%if rec.payment_amount.to_f > 0 %>
+										<% next if rec.payment_method == 'credit_note' && result.payments_for_credits_amount < rec.payment_amount %>
 										<tr>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td>Payment <%= rec.payment_method.upcase %></td>
-												<td><%= number_with_precision(rec.payment_amount, precision:precision.to_i,delimiter:delimiter) %> ( <%= rec.payment_status %> )</td>
+											<td><%= number_format(rec.payment_amount, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %> ( <%= rec.payment_status %> )</td>
 											<td>&nbsp;</td>
 										</tr>
 
@@ -168,13 +155,12 @@
 											</tr>
 										<% end %>
 									<% end %>
-									<% end %>
-									<% if result.amount_changed != 0 && !result.amount_changed.nil? %>
+									<% if result.amount_changed != 0 %>
 										<tr>
 											<td>&nbsp;</td>
 											<td>&nbsp;</td>
 											<td><%= t("views.right_panel.detail.change") %> <%= t("views.right_panel.detail.amount") %></td>
-											<td><%= number_with_precision(result.amount_changed, precision:precision.to_i,delimiter:delimiter) %></td>
+											<td><%= number_format(result.amount_changed, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></td>
 											<td>&nbsp;</td>
 										</tr>
 									<% end %>
@@ -196,7 +182,7 @@
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
 								<td>&nbsp;</td>
-								<td><b>Total Nett</b> - <b><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) %></b></td>
+								<td><b>Total Nett</b> - <b><%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></b></td>
 								<td>&nbsp;</td>
 							</tr>
 

app/views/reports/saleitem/index.html.erb

@@ -46,18 +46,6 @@
 							</tr>
 						</thead>
 						<tbody>
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>
 							 <% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>
 							<% p_qty = 0 %>
@@ -111,7 +99,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
 											<% grand_total += total %>
 											<% end %>
 											<% end %>
@@ -135,8 +123,8 @@
 									    <td><%= sale.total_item*(-1) rescue '-' %></td>
 							        <% end %>
 
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -161,7 +149,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -191,8 +179,8 @@
 										<td><%= product.product_code rescue '-' %></td>
 										<td><%= product.product_name rescue '-' %></td>
 										<td><%= product.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -205,7 +193,7 @@
 								    <td><b><%= p_qty %></b></td>
 
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						<!-- End Product Sale -->
@@ -229,8 +217,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -240,7 +228,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -249,18 +237,18 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								<td><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 							</tr>
 							<% if @type =="" || @type =="all" || @type.nil? %>
 								<tr class="foc_payment">
 									<td colspan="5">&nbsp;</td>
 									<td>Total FOC Amount</td>
-									<td><span><%= number_with_precision(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td><span><%= number_format(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 								<tr class="foc_payment" style="border-top:2px solid grey;border-bottom:2px solid grey;">
 									<td colspan="5">&nbsp;</td>
 									<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 							<% end %>
 							<% end %>
@@ -282,8 +270,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -293,7 +281,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						</tbody>

app/views/reports/saleitem/index.xls.erb

@@ -34,18 +34,6 @@
 							</tr>
 						</thead>
 						<tbody>
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>	
 							 <% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>
 							<% p_qty = 0 %>
@@ -110,8 +98,8 @@
 									    <td><%= sale.total_item*(-1) rescue '-' %></td>
 							        <% end %>
 
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -159,8 +147,8 @@
 										<td><%= product.product_code rescue '-' %></td>
 										<td><%= product.product_name rescue '-' %></td>
 										<td><%= product.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -173,7 +161,7 @@
 								    <td><b><%= p_qty %></b></td>
 
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						<!-- End Product Sale -->
@@ -197,8 +185,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -208,7 +196,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -217,18 +205,18 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
+								<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 							</tr>
 							<% if @type =="" || @type =="all" %>
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td>Total FOC Amount</td>
-									<td><span><%= number_with_precision(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td><span><%= number_format(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 								<tr style="border-top:2px solid grey;border-bottom:2px solid grey;">
 									<td colspan="5">&nbsp;</td>
 									<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 							<% end %>
 							<% end %>
@@ -250,8 +238,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -261,7 +249,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						</tbody>

app/views/reports/saleitem/indexbackup.html.erb

@@ -45,18 +45,6 @@
 							</tr>
 						</thead>
 						<tbody>
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>	
 							<% unless @sale_data.blank? %>
 							<% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>
@@ -101,7 +89,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
 											<% grand_total += total %>
 											<% end %>
 											<% end %>
@@ -120,8 +108,8 @@
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
 									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -140,7 +128,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -168,8 +156,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -179,7 +167,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -188,25 +176,25 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td> 
+								<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 							</tr>
 							<% end %>
 
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_with_precision(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
+								<td><span><%= number_format(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_format(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_sales") %></td>
 								<td>
-									<span><%= number_with_precision(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
+									<span><%= number_format(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
 								</td>
 							</tr>
 							<tr>
@@ -214,7 +202,7 @@
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 								<td style="border-bottom:2px solid grey;">
 									<span>
-										<%= number_with_precision(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
+										<%= number_format(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
 									</span>
 								</td>
 							</tr>
@@ -232,7 +220,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td> 
+								<td style="border-top:2px solid grey;"><%= number_format(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td>
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>

app/views/reports/shiftsale/index.html.erb

@@ -69,18 +69,6 @@
 				</tr>
 			</thead>
 			<tbody>
-			<% if @print_settings.precision.to_i > 0
-			    precision = @print_settings.precision
-		    else
-			    precision = 0
-		    end
-		     #check delimiter
-		    if @print_settings.delimiter
-			    delimiter = ","
-			else
-			    delimiter = ""
-			end
-			     %>
 				<% void = 0%>
 				<% cash = 0%>
 				<% credit = 0%>
@@ -104,16 +92,16 @@
 							<%= result[:shift_closed_at] ? result[:shift_closed_at].strftime("%e %b %I:%M%p") : '-'  %>
 						</td>
 						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision.to_i,delimiter:delimiter) %></td>
-						<td><%= number_with_precision(result[:credit_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+						<td><%= number_format(result[:cash_sales].to_f,  precision:precision.to_i,delimiter:delimiter) %></td>
+						<td><%= number_format(result[:credit_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->
-						<td class="d-none d-sm-table-cell"><%= number_with_precision(result[:other_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+						<td class="d-none d-sm-table-cell"><%= number_format(result[:other_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 						<td class="d-none d-sm-table-cell">
-						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%>
+						 	<%= number_format(result[:foc_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%>
 						</td>
-						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+						<td><%= number_format(result[:grand_total].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
             <td>
                <%= link_to "Print", reports_get_shift_id_path(result[:shift_id].to_i), class:"btn btn-info wave-effects" %>
             </td>
@@ -134,15 +122,15 @@
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
 						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-						<td><b><%= number_with_precision(cash,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
-						<td><b><%= number_with_precision(credit,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_format(cash,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_format(credit,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-						<td class="d-none d-sm-table-cell"><b><%= number_with_precision(card,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
-						<td class="d-none d-sm-table-cell"><b><%= number_with_precision(foc,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td class="d-none d-sm-table-cell"><b><%= number_format(card,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td class="d-none d-sm-table-cell"><b><%= number_format(foc,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->
-						<td><b><%= number_with_precision(g_total,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_format(g_total,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 					</tr>
 				</tbody>
 			</table>

app/views/reports/staff_meal/index.html.erb

@@ -46,18 +46,6 @@
 							</tr>
 						</thead>
 						<tbody>
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>
 							 <% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>
 							<% p_qty = 0 %>
@@ -111,7 +99,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
 											<% grand_total += total %>
 											<% end %>
 											<% end %>
@@ -135,8 +123,8 @@
 									    <td><%= sale.total_item*(-1) rescue '-' %></td>
 							        <% end %>
 
-									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -161,7 +149,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -191,8 +179,8 @@
 										<td><%= product.product_code rescue '-' %></td>
 										<td><%= product.product_name rescue '-' %></td>
 										<td><%= product.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -205,7 +193,7 @@
 								    <td><b><%= p_qty %></b></td>
 
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						<!-- End Product Sale -->
@@ -218,18 +206,18 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+								<td><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 							</tr>
 							<% if @type =="" || @type =="all" || @type.nil? %>
 								<!-- <tr class="foc_payment">
 									<td colspan="5">&nbsp;</td>
 									<td>Total FOC Amount</td>
-									<td><span><%= number_with_precision(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td><span><%= number_format(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr> -->
 								<!-- <tr class="foc_payment" style="border-top:2px solid grey;border-bottom:2px solid grey;">
 									<td colspan="5">&nbsp;</td>
 									<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr> -->
 							<% end %>
 							<% end %>
@@ -251,8 +239,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 
@@ -262,7 +250,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 						</tbody>

app/views/reports/staff_meal/index.xls.erb

@@ -34,18 +34,6 @@
   							</tr>
   						</thead>
   						<tbody>
-  							<% if @print_settings.precision.to_i > 0
-  								precision = @print_settings.precision
-  							else
-  								precision = 0
-  							end
-  							#check delimiter
-  							if @print_settings.delimiter
-  								delimiter = ","
-  						    else
-  								delimiter = ""
-  						    end
-  							 %>
   							 <% acc_arr = Array.new %>
   							<% cate_arr = Array.new %>
   							<% p_qty = 0 %>
@@ -99,7 +87,7 @@
   										<td>
   											<% @totalByAccount.each do |account, total| %>
   											<% if sale.account_id == account %>
-  											<b><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) %></b>
+  											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
   											<% grand_total += total %>
   											<% end %>
   											<% end %>
@@ -123,8 +111,8 @@
   									    <td><%= sale.total_item*(-1) rescue '-' %></td>
   							        <% end %>
 
-  									<td><%= number_with_precision(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-  									<td><%= number_with_precision(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
   								</tr>
   								<!-- sub total -->
 
@@ -149,7 +137,7 @@
   											<td><b>Total <%= sale.account_name %> Qty </b> </td>
   											<td><b><%= sub_qty %></b></td>
   											<td><%= t("views.right_panel.detail.sub_total") %></td>
-  											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
+  											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
   										</tr>
   										<% sub_total = 0.0%>
   										<% sub_qty = 0 %>
@@ -179,8 +167,8 @@
   										<td><%= product.product_code rescue '-' %></td>
   										<td><%= product.product_name rescue '-' %></td>
   										<td><%= product.total_item rescue '-' %></td>
-  										<td> <%= number_with_precision(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-  										<td> <%= number_with_precision(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  										<td> <%= number_format(product.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  										<td> <%= number_format(product.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
   									</tr>
   									<!-- sub total -->
 
@@ -193,7 +181,7 @@
   								    <td><b><%= p_qty %></b></td>
 
   									<td><%= t("views.right_panel.detail.sub_total") %></td>
-  									<td ><span><%=  number_with_precision(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+  									<td ><span><%=  number_format(product_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
   								</tr>
   						    <%end%>
   						<!-- End Product Sale -->
@@ -206,18 +194,18 @@
   								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
   								<td><span><%= total_qty%></span></td>
   								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-  								<td><span><%= number_with_precision(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+  								<td><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
   							</tr>
   							<% if @type =="" || @type =="all" || @type.nil? %>
   								<!-- <tr class="foc_payment">
   									<td colspan="5">&nbsp;</td>
   									<td>Total FOC Amount</td>
-  									<td><span><%= number_with_precision(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+  									<td><span><%= number_format(@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
   								</tr> -->
   								<!-- <tr class="foc_payment" style="border-top:2px solid grey;border-bottom:2px solid grey;">
   									<td colspan="5">&nbsp;</td>
   									<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.net_amount") %></td>
-  									<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+  									<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total -@foc_data ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
   								</tr> -->
   							<% end %>
   							<% end %>
@@ -238,8 +226,8 @@
   										<td><%= other.item_code rescue '-' %></td>
   										<td><%= other.product_name rescue '-' %></td>
   										<td><%= other.total_item rescue '-' %></td>
-  										<td> <%= number_with_precision(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-  										<td> <%= number_with_precision(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+  										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
   									</tr>
   									<!-- sub total -->
 
@@ -249,7 +237,7 @@
   								<tr>
   									<td colspan="5">&nbsp;</td>
   									<td><%= t("views.right_panel.detail.sub_total") %></td>
-  									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
+  									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
   								</tr>
   						    <%end%>
   						</tbody>

app/views/reports/stock_check/index.html.erb

@@ -28,18 +28,6 @@
   <div class="margin-top-20">
     <div class="card">
       <div class="table-responsive">
-        <% if @print_settings.precision.to_i > 0
-          precision = @print_settings.precision
-        else
-          precision = 0
-        end
-        #check delimiter
-        if @print_settings.delimiter
-          delimiter = ","
-        else
-          delimiter = ""
-        end
-        %> 
         <table class="table table-striped">
           <thead>
             <tr>
@@ -98,7 +86,7 @@
             <!-- <tr style="border-top: 3px solid grey;">
               <td colspan="3"></td>
               <td><b><%= total_stock_count rescue '-' %></b></td>
-              <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
+              <td><b><%= number_format(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
               <td><b><%= total_different rescue '-' %></b></td>
               <td></td>
             </tr> -->

app/views/reports/stock_check/index.xls.erb

@@ -66,7 +66,7 @@
           <!-- <tr style="border-top: 3px solid grey;">
             <td colspan="3"></td>
             <td><b><%= total_stock_count rescue '-' %></b></td>
-            <td><b><%= number_with_precision(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
+            <td><b><%= number_format(total_stock_balance, precision:precision.to_i,delimiter:delimiter) rescue '-' %></b></td>
             <td><b><%= total_different rescue '-' %></b></td>
             <td></td>
           </tr> -->

app/views/reports/void_sale/index.html.erb

@@ -52,18 +52,6 @@
 						</tr>
 					</thead>
 					<tbody>
-					<% if @print_settings.precision.to_i > 0
-					    precision = @print_settings.precision
-					    else
-						    precision = 0
-					    end
-					     #check delimiter
-					    if @print_settings.delimiter
-						    delimiter = ","
-						else
-						    delimiter = ""
-						end
-			    	 %>
 						<% total_amount = 0.0 %>
 						<% grand_total = 0.0 %>
 						<% rounding_adjustment = 0.0 %>
@@ -73,10 +61,10 @@
 						<tr>
 							<td><%= item.receipt_no rescue '-' %> </td>
 							<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
-							<td><%= number_with_precision(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %> </td>
-							<td><%= number_with_precision(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
-							<td><%= number_with_precision(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(item.grand_total.to_f + item.rounding_adjustment.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
+							<td><%= number_format(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %> </td>
+							<td><%= number_format(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
+							<td><%= number_format(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(item.grand_total.to_f + item.rounding_adjustment.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
 							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
 							<!-- <td><%= item.remarks rescue '-' %> </td> -->
 						</tr>
@@ -88,10 +76,10 @@
 						<% end %>
 						<tr style="border-top:4px double #666;font-weight:600;">
 							<td colspan="2" style="text-align:center;">Total Void Amount :</td>
-							<td><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
-							<td><%= number_with_precision(rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
-							<td colspan="3"><%= number_with_precision(grand_rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
+							<td><%= number_format(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_format(rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
+							<td colspan="3"><%= number_format(grand_rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
 						</tr>
 					</tbody>
 				</table>

app/views/reports/waste_and_spoilage/index.html.erb

@@ -45,18 +45,6 @@
 
 
 							<tbody>
-								<% if @print_settings.precision.to_i > 0
-								      	 precision = @print_settings.precision
-									   else
-									   	precision = 0
-									   end
-									    #check delimiter
-									    if @print_settings.delimiter
-									        delimiter = ","
-									    else
-									        delimiter = ""
-									    end
-								 %>
 								<% receipt_arr = Array.new %>
 								<% menu_cat_arr = Array.new %>
 								<% footer_arr = Array.new %>
@@ -79,8 +67,8 @@
 								  		<td><%= sale.product_name %></td>
 								  		<td><%= sale.product_code.to_i %></td>
 								  		<td><%= sale.qty.to_i %></td>
-								  		<td><%= number_with_precision(sale.unit_price, precision:precision.to_i,delimiter:delimiter) %></td>
-								  		<td><%= number_with_precision(sale.price, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.unit_price, precision:precision.to_i,delimiter:delimiter) %></td>
+								  		<td><%= number_format(sale.price, precision:precision.to_i,delimiter:delimiter) %></td>
 								  	</tr>
 
 
@@ -91,13 +79,13 @@
 							  			<td colspan="2" style="text-align:right"> <strong>Total Qty: </strong></td>
 							  			<td>
 							  				<span class="underline" style="text-align:right">
-							  					<strong><%= number_with_precision(waste_and_spoil_item_count, precision:precision.to_i,delimiter:delimiter) %></strong>
+							  					<strong><%= number_format(waste_and_spoil_item_count, precision:precision.to_i,delimiter:delimiter) %></strong>
 							  					<% waste_and_spoil_item_count = 0%>
 							  				</span></td>
 							  			<td style="text-align:right"> <strong>Grand Total: </strong></td>
 							  			<td >
 							  				<span class="underline" style="text-align:right">
-							  					<strong><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) %></strong>
+							  					<strong><%= number_format(grand_total, precision:precision.to_i,delimiter:delimiter) %></strong>
 							  				</span>
 							  		 	</td>
 							  		</tr>

app/views/transactions/order_reservations/index.html.erb

@@ -98,17 +98,6 @@
             </thead>
 
             <tbody>
-              <% if @print_settings.precision.to_i > 0
-                  precision = @print_settings.precision
-                else
-                  precision = 0
-                end
-                #check delimiter
-                if @print_settings.delimiter
-                  delimiter = ","
-                else
-                  delimiter = ""
-                end %>
               <%
                 discount_amount = 0.0
                 delivery_fee = 0.0
@@ -158,16 +147,16 @@
                         <td><%= order_reservation.status %></td>
                         <td><%= order_reservation.payment_type%></td>
                         <td><%= order_reservation.payment_status%></td>
-                        <td><%= number_with_precision(order_reservation.total_amount,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <!-- <td><%= number_with_precision(delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td> -->
-                        <td><%= number_with_precision(order_reservation.total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
-                        <td><%= number_with_precision(order_reservation.grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
-                        <td><%= number_with_precision(order_reservation.transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
+                        <td><%= number_format(order_reservation.total_amount,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(discount_amount ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(delivery_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(convenience_charge ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <!-- <td><%= number_format(delivery_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(convenience_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td> -->
+                        <td><%= number_format(order_reservation.total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+                        <td><%= number_format(order_reservation.grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
+                        <td><%= number_format(order_reservation.transaction_fee ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
                       </td>
                     </tr>
                   <% end %>

app/views/transactions/order_reservations/show.html.erb

@@ -9,17 +9,6 @@
   </ol>
 </div>
 <div class="row">
-  <% if @print_settings.precision.to_i > 0
-    precision = @print_settings.precision
-  else
-    precision = 0
-  end
-  #check delimiter
-  if @print_settings.delimiter
-    delimiter = ","
-  else
-    delimiter = ""
-  end %>
   <div class="col-lg-12 col-md-12 col-sm-12">
     <!-- Column One -->
 
@@ -75,8 +64,8 @@
                 <tr>
                   <td><%=item.item_name rescue ' '%></td>
                   <td><%=item.qty rescue ' '%></td>
-                  <td><%= number_with_precision(item.price > 0 ? item.price : item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
-                  <td><%= number_with_precision(item.price > 0 ? item.qty * item.price : item.qty * item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>  
+                  <td><%= number_format(item.price > 0 ? item.price : item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                  <td><%= number_format(item.price > 0 ? item.qty * item.price : item.qty * item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
                   <td><%=l item.created_at.utc.getlocal , :format => :short rescue ' ' %></td>
                   <td></td>
                   <td></td>
@@ -131,69 +120,69 @@
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.sub_total") %></td>
-                <td colspan="4"><%= number_with_precision(total_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% if total_discount_amount > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.discount_amount") %></td>
-                <td colspan="4"><%= number_with_precision(total_discount_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_discount_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if total_delivery_fee > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.delivery_fee") %></td>
-                <td colspan="4"><%= number_with_precision(total_delivery_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_delivery_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if total_convenience_charge > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.convenience_charge") %></td>
-                <td colspan="4"><%= number_with_precision(total_convenience_charge, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_convenience_charge, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <!-- <% if total_delivery_tax > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.delivery_tax") %></td>
-                <td colspan="3"><%= number_with_precision(total_delivery_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="3"><%= number_format(total_delivery_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if total_convenience_tax > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.convenience_tax") %></td>
-                <td colspan="3"><%= number_with_precision(total_convenience_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="3"><%= number_format(total_convenience_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if total_commercial_tax > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.commercial_tax") %></td>
-                <td colspan="3"><%= number_with_precision(total_commercial_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="3"><%= number_format(total_commercial_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %> -->
               <% if total_tax > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %></td>
-                <td colspan="4"><%= number_with_precision(total_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_tax, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if grand_total > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan="2" style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.grand_total") %> </td>
-                <td colspan="4"><%= number_with_precision(grand_total, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(grand_total, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
               <% if total_transaction_fee > 0 %>
               <tr style="border-top:2px solid #000">
                 <td colspan="2" style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.transaction_fee") %></td>
-                <td colspan="4"><%= number_with_precision(total_transaction_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
+                <td colspan="4"><%= number_format(total_transaction_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
               </tr>
               <% end %>
             </tbody>

app/views/transactions/sales/show.html.erb

@@ -83,8 +83,8 @@
                 <tr>
                   <td><%=s.product_name rescue ' '%></td>
                   <td><%=s.qty rescue ' '%></td>
-                  <td><%= number_with_precision(s.unit_price, :precision => 2, :delimiter => ',') rescue ' '%></td>
-                  <td><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                  <td><%= number_format(s.unit_price, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                  <td><%= number_format(s.price, :precision => 2, :delimiter => ',') rescue ' '%></td>
                   <td><%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %></td>
                   <td><%=s.remark rescue ' '%></td>
                 </tr>
@@ -92,42 +92,42 @@
               <tr style="border-top:2px solid #000">
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.total") %></td>
-                <td colspan="3"><%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                <td colspan="3"><%= number_format(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
               </tr>
               <tr>
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.discount") %></td>
-                <td colspan="3"><%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                <td colspan="3"><%= number_format(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%></td>
               </tr>
               <% @sale.sale_taxes.each do |r|%>
                 <tr>
                   <td colspan=2 style="text-align:center"></td>
                   <td><%= r.tax_name %> </td>
-                  <td colspan="3"><%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                  <td colspan="3"><%= number_format(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                 </tr>
               <% end %>
               <tr>
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.grand_total") %></td>
-                <td colspan="3"><%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                <td colspan="3"><%= number_format(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%></td>
               </tr>
               <tr><td colspan="5">&nbsp;<td></tr>
               <tr>
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.total_pay_amount") %></td>
-                <td colspan="3"><%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                <td colspan="3"><%= number_format(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%></td>
               </tr>
               <% @sale_receivables.each do |r|%>
                 <tr>
                   <td colspan=2 style="text-align:center"></td>
                   <td> <%= r.payment_method.capitalize rescue ' '%> Payment</td>
-                  <td colspan="3"><%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                  <td colspan="3"><%= number_format(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%></td>
                 </tr>
               <% end %>
               <tr>
                 <td colspan=2 style="text-align:center"></td>
                 <td><%= t("views.right_panel.detail.change") %></td>
-                <td colspan="3"><%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
+                <td colspan="3"><%= number_format(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%></td>
               </tr>
             </tbody>
           </table>

config/puma.rb

@@ -1,11 +1,11 @@
-application_path="#{File.expand_path("../..", __FILE__)}"
-directory application_path
-#environment ENV.fetch("RAILS_ENV") { "production" }
-environment "production"
-pidfile "#{application_path}/tmp/puma/pid"
-state_path "#{application_path}/tmp/puma/state"
-stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-port        ENV.fetch("PORT") { 62158 }
-workers 2
-preload_app!
-threads 1,1
+# application_path="#{File.expand_path("../..", __FILE__)}"
+# directory application_path
+# #environment ENV.fetch("RAILS_ENV") { "production" }
+# environment "production"
+# pidfile "#{application_path}/tmp/puma/pid"
+# state_path "#{application_path}/tmp/puma/state"
+# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+# port        ENV.fetch("PORT") { 62158 }
+# workers 2
+# preload_app!
+# threads 1,1

db/seeds.rb

@@ -107,6 +107,11 @@ units = Lookup.create([{lookup_type:'unit', name: 'PCS', value: 'pcs'},
 # Country
 countries =  Lookup.create({lookup_type:'country', name: 'Japan', value: 'Japan'})
 
+# number formats
+number_formats = Lookup.create([{lookup_type: 'number_format', name: 'precision', '2'},
+                                {lookup_type: 'number_format', name: 'delimiter', ','},
+                                {lookup_type: 'number_format', name: 'strip_insignificant_zeros', '0'}])
+
 # Default CUSTOMER
 customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]})
 customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]})