Skip to content

Commit

Permalink
Merge pull request #16506 from mattwire/invoicedue_countrefunded
Browse files Browse the repository at this point in the history
Count refunds when calculating amount due for an invoice
  • Loading branch information
mattwire authored Feb 17, 2020
2 parents 5790edc + 449b5e6 commit 435a9dc
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions CRM/Contribute/Form/Task/Invoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,24 +286,13 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
$invoiceDate = date("F j, Y");
$dueDate = date('F j, Y', strtotime($contributionReceiveDate . "+" . $prefixValue['due_date'] . "" . $prefixValue['due_date_period']));

$lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);

$resultPayments = civicrm_api3('Payment', 'get', [
'sequential' => 1,
'contribution_id' => $contribID,
]);
$amountPaid = 0;
foreach ($resultPayments['values'] as $singlePayment) {
// Only count payments that have been (status =) completed.
if ($singlePayment['status_id'] == 1) {
$amountPaid += $singlePayment['total_amount'];
}
}
$amountPaid = CRM_Core_BAO_FinancialTrxn::getTotalPayments($contribID, TRUE);
$amountDue = ($input['amount'] - $amountPaid);

// retrieving the subtotal and sum of same tax_rate
$dataArray = [];
$subTotal = 0;
$lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
foreach ($lineItem as $taxRate) {
if (isset($dataArray[(string) $taxRate['tax_rate']])) {
$dataArray[(string) $taxRate['tax_rate']] = $dataArray[(string) $taxRate['tax_rate']] + CRM_Utils_Array::value('tax_amount', $taxRate);
Expand Down

0 comments on commit 435a9dc

Please sign in to comment.