diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index c4b4cee4..14740851 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -179,7 +179,7 @@ class SalePayment < ApplicationRecord self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! - sale_update_payment_status(self.received_amount) + sale_update_payment_status(self.received_amount,true) return payment_status end @@ -198,7 +198,7 @@ class SalePayment < ApplicationRecord self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! - sale_update_payment_status(self.received_amount,1) + sale_update_payment_status(self.received_amount) return payment_status end @@ -290,7 +290,7 @@ class SalePayment < ApplicationRecord end - def sale_update_payment_status(paid_amount,check_foc = 0) + def sale_update_payment_status(paid_amount,check_foc = false) #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.save! @@ -350,7 +350,12 @@ class SalePayment < ApplicationRecord self.sale.save! 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 end end