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

fixed accept credit with multi payment

Browse Source
This commit is contained in:
NyanLinHtut
2020-01-15 13:12:00 +06:30
parent cf7d8c85d6
commit b742dfa2a0
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/payments_controller.rb
View File

@@ -242,7 +242,7 @@ class Origami::PaymentsController < BaseOrigamiController
end end
if path.include? ("credit_payment") 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 end
@member_discount = MembershipSetting.find_by_discount(1) @member_discount = MembershipSetting.find_by_discount(1)

1
app/models/sale_payment.rb
View File

@@ -956,7 +956,6 @@ class SalePayment < ApplicationRecord
def self.get_sale_payment_for_credit(sale_data) def self.get_sale_payment_for_credit(sale_data)
sale_data.sale_payments sale_data.sale_payments
.joins(:sale_audit) .joins(:sale_audit)
.where(created_at: 1.days.ago.beginning_of_day..DateTime::Infinity.new)
end end
def get_credit_payment_left def get_credit_payment_left