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

fix shift sale balance

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-04-29 14:15:41 +06:30
parent eb9b4a9ec0
commit d60853e9e5
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/sale.rb
View File

@@ -1424,7 +1424,7 @@ end
def get_cash_amount def get_cash_amount
self.sale_payments.where(payment_method: 'cash', payment_status: 'paid') self.sale_payments.where(payment_method: 'cash', payment_status: 'paid')
.pluck(:payment_amount).reduce(:+) .pluck(:payment_amount).reduce(0, :+) - self.amount_changed
end end
def get_credit_amount def get_credit_amount
@@ -2309,7 +2309,6 @@ private
end end
def round_to_precision 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) if (self.total_amount % 1 > 0 || self.total_discount % 1 > 0 || self.total_tax % 1 > 0)
self.total_amount = self.total_amount.round(precision) self.total_amount = self.total_amount.round(precision)
self.total_discount = self.total_discount.round(precision) self.total_discount = self.total_discount.round(precision)
@@ -2318,7 +2317,6 @@ private
end end
adjust_rounding adjust_rounding
end end
end
def update_stock_journal def update_stock_journal
if self.sale_status == "void" && self.sale_status_before_last_save != "void" if self.sale_status == "void" && self.sale_status_before_last_save != "void"

3
app/models/sale_payment.rb
View File

@@ -636,6 +636,9 @@ class SalePayment < ApplicationRecord
def sale_update_payment_status(paid_amount, check_foc = false) def sale_update_payment_status(paid_amount, check_foc = false)
#update amount_outstanding #update amount_outstanding
if ['completed'].include? sale.sale_status
return
end
sale = self.sale sale = self.sale
sale_payments = sale.sale_payments.reload sale_payments = sale.sale_payments.reload