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

foc pdf fixed

Browse Source
This commit is contained in:
yarzar_code
2020-03-25 18:01:35 +06:30
parent f78c97e9ec
commit d45f725bee
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/sale_payment.rb
View File

@@ -142,9 +142,6 @@ class SalePayment < ApplicationRecord
remark = "#{self.sale_payment_id}||#{shift_sale_id} -> #{remark}" remark = "#{self.sale_payment_id}||#{shift_sale_id} -> #{remark}"
sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by.name) sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by.name)
if payment_method == "cash"
update_shift_for_credit_payment
end
else else
sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by.name) sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by.name)
end end
@@ -377,12 +374,8 @@ class SalePayment < ApplicationRecord
private private
def cash_payment(payment_for=false) def cash_payment(payment_for=false)
status = false
sale_payments_data = SalePayment.find_by_sale_id(self.sale_id)
if sale_payments_data.nil?
status = true
end
sale_payments_data = SalePayment.find_by_sale_id(self.sale_id)
payment_status = false payment_status = false
self.payment_method = "cash" self.payment_method = "cash"
@@ -397,8 +390,11 @@ class SalePayment < ApplicationRecord
self.payment_status = "paid" self.payment_status = "paid"
payment_status = self.save! payment_status = self.save!
if !payment_for if !payment_for
sale_update_payment_status(self.received_amount,status) sale_update_payment_status(self.received_amount)
else
update_shift_for_credit_payment()
end end
balance_amount =0.0 balance_amount =0.0
outstanding_amount =0.0 outstanding_amount =0.0
if self.sale.grand_total.to_f > self.received_amount.to_f if self.sale.grand_total.to_f > self.received_amount.to_f