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

fixed quarterly #141

Browse Source
This commit is contained in:
denisdulici
2017-12-12 19:30:36 +03:00
parent 48eeec7fab
commit bf80679a9b
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/Dashboard/Dashboard.php
View File

@ -270,38 +270,54 @@ class Dashboard extends Controller
$date_format = 'Y-m'; $date_format = 'Y-m';
$n = 1; if ($period == 'month') {
if ($period == 'quarter') { $n = 1;
$start_date = $start->format($date_format);
$end_date = $end->format($date_format);
$next_date = $start_date;
} else {
$n = 3; $n = 3;
$start_date = $start->quarter;
$end_date = $end->quarter;
$next_date = $start_date;
} }
$start_date = $start->format($date_format); $s = clone $start;
$end_date = $end->format($date_format);
$next_date = $start_date;
$totals[$start_date] = 0;
do {
$next_date = Date::parse($next_date)->addMonths($n)->format($date_format);
//$totals[$start_date] = 0;
while ($next_date <= $end_date) {
$totals[$next_date] = 0; $totals[$next_date] = 0;
} while ($next_date < $end_date);
if ($period == 'month') {
$next_date = $s->addMonths($n)->format($date_format);
} else {
if (isset($totals[4])) {
break;
}
$next_date = $s->addMonths($n)->quarter;
}
}
$items_1 = $m1::whereBetween('paid_at', [$start, $end])->get(); $items_1 = $m1::whereBetween('paid_at', [$start, $end])->get();
$this->setCashFlowTotals($totals, $items_1, $date_format); $this->setCashFlowTotals($totals, $items_1, $date_format, $period);
$items_2 = $m2::whereBetween('paid_at', [$start, $end])->get(); $items_2 = $m2::whereBetween('paid_at', [$start, $end])->get();
$this->setCashFlowTotals($totals, $items_2, $date_format); $this->setCashFlowTotals($totals, $items_2, $date_format, $period);
return $totals; return $totals;
} }
private function setCashFlowTotals(&$totals, $items, $date_format) private function setCashFlowTotals(&$totals, $items, $date_format, $period)
{ {
foreach ($items as $item) { foreach ($items as $item) {
$i = Date::parse($item->paid_at)->format($date_format); if ($period == 'month') {
$i = Date::parse($item->paid_at)->format($date_format);
} else {
$i = Date::parse($item->paid_at)->quarter;
}
$totals[$i] += $item->getConvertedAmount(); $totals[$i] += $item->getConvertedAmount();
} }