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

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-08-04 13:44:50 +03:00 committed by GitHub
commit 08d894ef4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats 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(); $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 = []; $years = [];
$y = $now->addYears(2); $y = $now->addYears(2);
for ($i = 0; $i < 10; $i++) { 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(); $y->subYear();
} }

7
app/Traits/DateTime.php
View File

@ -189,6 +189,13 @@ trait DateTime
return $date_picker_shortcuts; return $date_picker_shortcuts;
} }
public function getDailyDateFormat($year = null)
{
$format = 'd M Y';
return $format;
}
public function getMonthlyDateFormat($year = null) public function getMonthlyDateFormat($year = null)
{ {
$format = 'M Y'; $format = 'M Y';