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

fixed financial year filter

Browse Source
This commit is contained in:
Denis Duliçi
2022-08-04 12:09:54 +03:00
parent 36d05dda44
commit a7a89ff28b
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Abstracts/Listeners/Report.php
View File

@@ -40,11 +40,32 @@ abstract class Report
{
$now = Date::now();
$financial_start = setting('localisation.financial_start');
$setting = explode('-', $financial_start);
$financial_start_day = ! empty($setting[0]) ? $setting[0] : '01';
$format = ($financial_start == '01-01')
? $this->getYearlyDateFormat()
: (($financial_start_day != '01') ? $this->getDailyDateFormat() : $this->getMonthlyDateFormat());
$years = [];
$y = $now->addYears(2);
for ($i = 0; $i < 10; $i++) {
$years[$y->year] = $y->year;
$financial_year = $this->getFinancialYear($y->year);
if ($financial_start == '01-01') {
$title = $financial_year->getStartDate()->copy()->format($format);
} else {
$start = $financial_year->getStartDate()->copy()->format($format);
$end = $financial_year->getEndDate()->copy()->format($format);
$title = $start . ' - ' . $end;
}
$years[$y->year] = $title;
$y->subYear();
}