Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Adding charts to reports

Browse Source
This commit is contained in:
Hillel Coren 2018-02-28 10:12:23 +02:00
parent 5066a95da0
commit 238618a1c3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/Reports/AbstractReport.php
View File

@ -7,6 +7,7 @@ use Auth;
use DateInterval; use DateInterval;
use DatePeriod; use DatePeriod;
use stdClass; use stdClass;
use App\Models\Client;
class AbstractReport class AbstractReport
{ {
@ -154,7 +155,9 @@ class AbstractReport
if ($subgroup == 'user') { if ($subgroup == 'user') {
return $entity->user->getDisplayName(); return $entity->user->getDisplayName();
} elseif ($subgroup == 'client') { } elseif ($subgroup == 'client') {
if ($entity->client) { if ($entity instanceof Client) {
return $entity->getDisplayName();
} elseif ($entity->client) {
return $entity->client->getDisplayName(); return $entity->client->getDisplayName();
} else { } else {
return trans('texts.unset'); return trans('texts.unset');

9
app/Ninja/Reports/AgingReport.php
View File

@ -24,6 +24,7 @@ class AgingReport extends AbstractReport
public function run() public function run()
{ {
$account = Auth::user()->account; $account = Auth::user()->account;
$subgroup = $this->options['subgroup'];
$clients = Client::scope() $clients = Client::scope()
->orderBy('name') ->orderBy('name')
@ -56,6 +57,14 @@ class AgingReport extends AbstractReport
//$this->addToTotals($client->currency_id, 'paid', $payment ? $payment->getCompletedAmount() : 0); //$this->addToTotals($client->currency_id, 'paid', $payment ? $payment->getCompletedAmount() : 0);
//$this->addToTotals($client->currency_id, 'amount', $invoice->amount); //$this->addToTotals($client->currency_id, 'amount', $invoice->amount);
//$this->addToTotals($client->currency_id, 'balance', $invoice->balance); //$this->addToTotals($client->currency_id, 'balance', $invoice->balance);
if ($subgroup == 'age') {
$dimension = trans('texts.' .$invoice->present()->ageGroup);
} else {
$dimension = $this->getDimension($client);
}
$this->addChartData($dimension, $invoice->invoice_date, $invoice->balance);
} }
} }
} }