Merge branch 'r-1902001-01' into foodcourt

2020-07-19 19:44:59 +06:30
parent 530d49bb64 ced6a09095
commit 53f4320371
17 changed files with 240 additions and 146 deletions
--- a/app/models/tax_profile.rb
+++ b/app/models/tax_profile.rb
@@ -4,10 +4,11 @@ class TaxProfile < ApplicationRecord
  default_scope { order('order_by asc') }
  # validations
  validates_presence_of :name, :rate, :group_type
+
  def self.calculate_tax(group_type)
    divided_value =0.0
    exclusive =0.0
-    tax_profiles = TaxProfile.where(group_type: group_type,tax_type: 'Percentage')
+    tax_profiles = TaxProfile.where(group_type: group_type, tax_type: 'Percentage')
    if !tax_profiles.empty?
      tax_profiles.each do |tax|
        #include or execulive