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

renamed function

Browse Source
This commit is contained in:
denisdulici 2020-01-29 01:06:12 +03:00
parent 05aba16b3d
commit 0d33ffd311
7 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Abstracts/Report.php
View File

@ -84,7 +84,7 @@ abstract class Report
$this->load();
}
abstract public function getTotals();
abstract public function setData();
public function load()
{
@ -94,7 +94,7 @@ abstract class Report
$this->setDates();
$this->setFilters();
$this->setRows();
$this->getTotals();
$this->setData();
$this->loaded = true;
}
@ -118,20 +118,24 @@ abstract class Report
return $this->icon;
}
public function getTotal()
public function getGrandTotal()
{
if (!$this->loaded) {
$this->load();
}
$sum = 0;
if (!empty($this->footer_totals)) {
$sum = 0;
foreach ($this->footer_totals as $total) {
$sum += is_array($total) ? array_sum($total) : $total;
foreach ($this->footer_totals as $total) {
$sum += is_array($total) ? array_sum($total) : $total;
}
$total = money($sum, setting('default.currency'), true);
} else {
$total = trans('general.na');
}
$total = money($sum, setting('default.currency'), true);
return $total;
}
@ -369,15 +373,15 @@ abstract class Report
{
$print_url = 'common/reports/' . $this->model->id . '/' . $action . '?year='. $this->year;
collect(request('accounts'))->each(function($item) use(&$print_url) {
collect(request('accounts'))->each(function($item) use (&$print_url) {
$print_url .= '&accounts[]=' . $item;
});
collect(request('customers'))->each(function($item) use(&$print_url) {
collect(request('customers'))->each(function($item) use (&$print_url) {
$print_url .= '&customers[]=' . $item;
});
collect(request('categories'))->each(function($item) use(&$print_url) {
collect(request('categories'))->each(function($item) use (&$print_url) {
$print_url .= '&categories[]=' . $item;
});

6
app/Http/Controllers/Common/Reports.php
View File

@ -38,7 +38,7 @@ class Reports extends Controller
$ttl = 3600 * 6; // 6 hours
$totals[$report->id] = Cache::remember('reports.totals.' . $report->id, $ttl, function () use ($class) {
return $class->getTotal();
return $class->getGrandTotal();
});
$icons[$report->id] = $class->getIcon();
@ -63,7 +63,7 @@ class Reports extends Controller
$class = Utility::getClassInstance($report);
// Update cache
Cache::put('reports.totals.' . $report->id, $class->getTotal());
Cache::put('reports.totals.' . $report->id, $class->getGrandTotal());
return $class->show();
}
@ -267,7 +267,7 @@ class Reports extends Controller
return;
}
Cache::put('reports.totals.' . $report->id, Utility::getClassInstance($report)->getTotal());
Cache::put('reports.totals.' . $report->id, Utility::getClassInstance($report)->getGrandTotal());
});
return redirect()->back();

2
app/Reports/ExpenseSummary.php
View File

@ -28,7 +28,7 @@ class ExpenseSummary extends Report
],
];
public function getTotals()
public function setData()
{
$transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']);

2
app/Reports/IncomeExpenseSummary.php
View File

@ -14,7 +14,7 @@ class IncomeExpenseSummary extends Report
public $icon = 'fa fa-chart-pie';
public function getTotals()
public function setData()
{
$income_transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']);
$expense_transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']);

2
app/Reports/IncomeSummary.php
View File

@ -28,7 +28,7 @@ class IncomeSummary extends Report
],
];
public function getTotals()
public function setData()
{
$transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']);

2
app/Reports/ProfitLoss.php
View File

@ -38,7 +38,7 @@ class ProfitLoss extends Report
];
}
public function getTotals()
public function setData()
{
$income_transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']);
$expense_transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']);

2
app/Reports/TaxSummary.php
View File

@ -42,7 +42,7 @@ class TaxSummary extends Report
$this->tables = array_combine($taxes, $taxes);
}
public function getTotals()
public function setData()
{
switch ($this->model->settings->basis) {
case 'cash':