Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge: Fix payment report with partial payments

Browse Source
This commit is contained in:
Hillel Coren 2017-10-17 14:15:55 +03:00
parent c7f0047ff0
commit 4996273928
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Ninja/Reports/PaymentReport.php
View File

@ -20,6 +20,7 @@ class PaymentReport extends AbstractReport
public function run()
{
$account = Auth::user()->account;
$invoiceMap = [];
$payments = Payment::scope()
->orderBy('payment_date', 'desc')
@ -48,7 +49,11 @@ class PaymentReport extends AbstractReport
$payment->present()->method,
];
$this->addToTotals($client->currency_id, 'amount', $invoice->amount);
if (! isset($invoiceMap[$invoice->id])) {
$this->addToTotals($client->currency_id, 'amount', $invoice->amount);
$invoiceMap[$invoice->id] = true;
}
$this->addToTotals($client->currency_id, 'paid', $payment->getCompletedAmount());
}
}