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

quarterly based reports should consider financial year start

Browse Source
This commit is contained in:
Sevan Nerse 2021-02-05 20:34:35 +03:00
parent 74ee6fd0d4
commit db11b0cf83
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Abstracts/Report.php
View File

@ -16,6 +16,7 @@ use App\Traits\Charts;
use App\Traits\DateTime;
use App\Traits\SearchString;
use App\Utilities\Chartjs;
use Carbon\CarbonPeriod;
use Date;
use Illuminate\Support\Str;
@ -388,15 +389,26 @@ abstract class Report
switch ($this->getSetting('period')) {
case 'yearly':
$i = $date->copy()->format($this->getYearlyDateFormat());
break;
case 'quarterly':
$start = $date->copy()->startOfQuarter()->format($this->getQuarterlyDateFormat($this->year));
$end = $date->copy()->endOfQuarter()->format($this->getQuarterlyDateFormat($this->year));
$quarters = $this->getFiscalBaseQuarters($this->year);
foreach ($quarters as $quarter) {
if ($date->lessThan($quarter->getStartDate()) || $date->greaterThan($quarter->getEndDate())) {
continue;
}
$start = $quarter->getStartDate()->format($this->getQuarterlyDateFormat($this->year));
$end = $quarter->getEndDate()->format($this->getQuarterlyDateFormat($this->year));
}
$i = $start . '-' . $end;
break;
default:
$i = $date->copy()->format($this->getMonthlyDateFormat($this->year));
break;
}
@ -502,4 +514,16 @@ abstract class Report
],
];
}
private function getFiscalBaseQuarters($year)
{
$periods = [];
$fiscal_start = $this->getFinancialStart($year);
for ($i = 0; $i < 4; $i++) {
$periods[] = CarbonPeriod::create($fiscal_start->copy()->addQuarters($i), $fiscal_start->copy()->addQuarters($i + 1)->subDay());
}
return $periods;
}
}