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

replaced revenues/payments with transactions

Browse Source
This commit is contained in:
denisdulici
2019-11-27 12:08:36 +03:00
parent e4d0de0677
commit 3a15c1d615
28 changed files with 139 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Reports/IncomeSummary.php
View File

@@ -36,12 +36,12 @@ class IncomeSummary extends Report
public function getTotals()
{
$revenues = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at'])->get();
$transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at'])->get();
switch ($this->report->basis) {
case 'cash':
// Revenues
$this->setTotals($revenues, 'paid_at');
// Transactions
$this->setTotals($transactions, 'paid_at');
break;
default:
@@ -50,9 +50,9 @@ class IncomeSummary extends Report
Recurring::reflect($invoices, 'invoice', 'invoiced_at');
$this->setTotals($invoices, 'invoiced_at');
// Revenues
Recurring::reflect($revenues, 'revenue', 'paid_at');
$this->setTotals($revenues, 'paid_at');
// Transactions
Recurring::reflect($transactions, 'transaction', 'paid_at');
$this->setTotals($transactions, 'paid_at');
break;
}