From b742dfa2a012e830b31595412d76955aef8fd6ac Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Wed, 15 Jan 2020 13:12:00 +0630 Subject: [PATCH] fixed accept credit with multi payment --- app/controllers/origami/payments_controller.rb | 2 +- app/models/sale_payment.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 2138aeed..82e76119 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -242,7 +242,7 @@ class Origami::PaymentsController < BaseOrigamiController end if path.include? ("credit_payment") - @sale_payment = SalePayment.get_credit_amount_due_left(sale_id) + @sale_payment = SalePayment.where(sale_id: sale_id, payment_method: 'creditnote').select("SUM(payment_amount) as payment_amount") end @member_discount = MembershipSetting.find_by_discount(1) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b5c65b21..d489fdf5 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -956,7 +956,6 @@ class SalePayment < ApplicationRecord def self.get_sale_payment_for_credit(sale_data) sale_data.sale_payments .joins(:sale_audit) - .where(created_at: 1.days.ago.beginning_of_day..DateTime::Infinity.new) end def get_credit_payment_left