diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 0d51d83f..dcb24598 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -77,25 +77,17 @@ class SalePayment < ApplicationRecord if payment_for invoice_sale_payments = SalePayment.get_sale_payment_for_credit(invoice) amount_due = SalePayment.get_credit_amount_due_left(self.sale_id)[0] ? SalePayment.get_credit_amount_due_left(self.sale_id)[0].payment_amount.to_f : 0 - puts "amount_due => #{amount_due}" else invoice_sale_payments = invoice.sale_payments amount_due = invoice.grand_total - puts "amount_due => #{amount_due}" end - puts "amount_due => #{amount_due}" - invoice_sale_payments.each do |payment| if (payment.payment_status == "paid" ) amount_due = amount_due - payment.payment_amount end end - puts "Cash Amount -> #{cash_amount}" - puts "payment_method -> #{payment_method}" - - puts "Amount Due => #{amount_due}" if amount_due > 0 payment_status = false membership_data = nil @@ -941,7 +933,7 @@ class SalePayment < ApplicationRecord credit_sales = Sale.select("sales.sale_id, sales.receipt_no, sales.receipt_date as sale_date, sales.cashier_name") .select("sale_payments.sale_payment_id, sale_payments.payment_amount").select("customers.name as customer_name") .joins("JOIN (#{payments.to_sql}) AS sale_payments ON sale_payments.sale_id = sales.sale_id").joins(:customer).joins(:orders) - .completed.paid.where("sale_payments.payment_method = 'creditnote' AND sales.grand_total > sale_payments.total_payment_amount - sale_payments.payment_amount") + .completed.where("sale_payments.payment_method = 'creditnote' AND sales.grand_total > sale_payments.total_payment_amount - sale_payments.payment_amount") .group(:receipt_no) .order(:receipt_date).order(:receipt_no)