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

formatting #1855

Browse Source
This commit is contained in:
Denis Duliçi
2021-02-12 23:05:50 +03:00
parent a64fe6f779
commit 8cdb9a2a21
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Report.php
View File

@@ -374,7 +374,7 @@ abstract class Report
$financial_year = $this->getFinancialYear($this->year);
if ($date->greaterThanOrEqualTo($financial_year->getStartDate()) && $date->lessThanOrEqualTo($financial_year->getEndDate())) {
if (setting('localisation.financial_year_denote') == 'begins') {
if (setting('localisation.financial_denote') == 'begins') {
$i = $financial_year->getStartDate()->copy()->format($this->getYearlyDateFormat());
} else {
$i = $financial_year->getEndDate()->copy()->format($this->getYearlyDateFormat());

8
app/Http/Controllers/Settings/Localisation.php
View File

@@ -41,9 +41,9 @@ class Localisation extends Controller
'both' => trans('settings.localisation.discount_location.both'),
];
$financial_year_denote_options = [
'begins' => trans('settings.localisation.financial_year_denote.begins'),
'ends' => trans('settings.localisation.financial_year_denote.ends'),
$financial_denote_options = [
'begins' => trans('settings.localisation.financial_denote.begins'),
'ends' => trans('settings.localisation.financial_denote.ends'),
];
return view('settings.localisation.edit', compact(
@@ -52,7 +52,7 @@ class Localisation extends Controller
'date_separators',
'percent_positions',
'discount_locations',
'financial_year_denote_options'
'financial_denote_options'
));
}
}

2
app/Traits/DateTime.php
View File

@@ -110,7 +110,7 @@ trait DateTime
$financial_start = Date::create($year, $month, $day);
if (setting('localisation.financial_year_denote') == 'ends' && $financial_start->dayOfYear != 1) {
if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1)) {
$financial_start->subYear();
}