git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
yarzar_code
2020-01-14 14:25:55 +06:30
parent 4c69c1d5d2 60af9124bb
commit 48e6afa505
17 changed files with 589 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/sale.rb
View File

@@ -458,7 +458,7 @@ class Sale < ApplicationRecord
if order_source.to_s == "emenu"
order_source = "cashier"
elsif order_source.to_s == "app"
order_source = "food_court"
order_source = "online_order"
end
tax_profiles = unique_tax_profiles(order_source, self.customer_id)
@@ -592,6 +592,8 @@ class Sale < ApplicationRecord
# tax_profiles = TaxProfile.all.order("order_by asc")
if order_source.to_s == "emenu"
order_source = "cashier"
elsif order_source.to_s == "app"
order_source = "online_order"
end
# tax_data = TaxProfile.unscope(:order).where("group_type=?",order_source).pluck(:id)
@@ -2024,6 +2026,7 @@ def self.get_sale_data_for_other_payment_credit(sale_id)
end
def unique_tax_profiles(order_source, customer_id)
puts "unique_tax_profiles unique_tax_profiles"
tax_data = TaxProfile.where(group_type: order_source)
customer_tax_profiles = Customer.select(:tax_profiles).where(customer_id: customer_id).first