shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored report listener

Browse Source
This commit is contained in:
denisdulici
2020-01-27 22:41:08 +03:00
parent 877d299533
commit 9c6e3c2751
31 changed files with 484 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Reports/ExpenseSummary.php
View File

@ -30,11 +30,12 @@ class ExpenseSummary extends Report
public function getTotals()
{
$payments = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at'])->get();
$transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']);
switch ($this->model->settings->basis) {
case 'cash':
// Payments
$payments = $transactions->get();
$this->setTotals($payments, 'paid_at');
break;
@ -45,6 +46,7 @@ class ExpenseSummary extends Report
$this->setTotals($bills, 'billed_at');
// Payments
$payments = $transactions->isNotDocument()->get();
Recurring::reflect($payments, 'paid_at');
$this->setTotals($payments, 'paid_at');