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

change sale payment for paid_amount=0

Browse Source
This commit is contained in:
phyusin
2017-12-20 16:20:43 +06:30
parent fce3785912
commit 643cfaa179
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/sale_payment.rb
View File

@@ -179,7 +179,7 @@ class SalePayment < ApplicationRecord
self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
self.payment_status = "paid" self.payment_status = "paid"
payment_method = self.save! payment_method = self.save!
sale_update_payment_status(self.received_amount) sale_update_payment_status(self.received_amount,true)
return payment_status return payment_status
end end
@@ -198,7 +198,7 @@ class SalePayment < ApplicationRecord
self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
self.payment_status = "paid" self.payment_status = "paid"
payment_method = self.save! payment_method = self.save!
sale_update_payment_status(self.received_amount,1) sale_update_payment_status(self.received_amount)
return payment_status return payment_status
end end
@@ -290,7 +290,7 @@ class SalePayment < ApplicationRecord
end end
def sale_update_payment_status(paid_amount,check_foc = 0) def sale_update_payment_status(paid_amount,check_foc = false)
#update amount_outstanding #update amount_outstanding
self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f
self.sale.save! self.sale.save!
@@ -350,7 +350,12 @@ class SalePayment < ApplicationRecord
self.sale.save! self.sale.save!
table_update_status(sObj) table_update_status(sObj)
if paid_amount != "0.0" || check_foc > 0 puts "check_foc"
puts check_foc
if check_foc
update_shift
elsif paid_amount != "0.0"
update_shift update_shift
end end
end end