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

fix shift_sale double update

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-06-23 10:29:46 +06:30
parent 3e27990ac4
commit 276e437a07
4 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/sale_payment.rb
View File

@@ -633,9 +633,10 @@ class SalePayment < ApplicationRecord
def sale_update_payment_status(paid_amount, check_foc = false)
#update amount_outstanding
if ['completed'].include? sale.sale_status
if !self.sale || ['completed'].include?(self.sale.sale_status)
return
end
sale = self.sale
sale_payments = sale.sale_payments.reload
@@ -681,17 +682,8 @@ class SalePayment < ApplicationRecord
end
end
end
end
sale.save!
sale.save!
if check_foc
table_update_status(sale)
update_shift
elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
table_update_status(sale)
update_shift
elsif paid_amount.to_f == 0 && !is_credit
table_update_status(sale)
update_shift
end

2
app/models/shift_sale.rb
View File

@@ -153,7 +153,7 @@ class ShiftSale < ApplicationRecord
payment_methods = SalePayment.where.not(payment_method: ['cash', 'creditnote', 'foc']).distinct.pluck(:payment_method)
Sale.select("sales.sale_id,sale_payments.payment_method as name")
.select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as #{method}"}.join(', ')}")
.select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as #{method == 'paypar' ? 'redeem' : method}"}.join(', ')}")
.select("SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
.joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
.where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id)