fixed conflict

2019-12-02 17:43:02 +06:30
parent bf337495c1 cac6994ccb
commit de73bf9f7d
118 changed files with 14390 additions and 190 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2096,7 +2096,6 @@ end

 def unique_tax_profiles(order_source, customer_id)
  tax_data = TaxProfile.where(group_type: order_source,shop_code: self.shop_code)
-
  customer_tax_profiles = Customer.select(:tax_profiles).where(customer_id: customer_id).first
  if customer_tax_profiles.present?
    tax_data = tax_data.where(id: customer_tax_profiles.tax_profiles)