kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Better fix for date.

Browse Source
This commit is contained in:
James Cole
2019-01-01 15:29:24 +01:00
parent 98d6a7f32e
commit 7aa5eee3aa
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/FiscalHelper.php
View File

@@ -74,18 +74,12 @@ class FiscalHelper implements FiscalHelperInterface
*/ */
public function startOfFiscalYear(Carbon $date): Carbon public function startOfFiscalYear(Carbon $date): Carbon
{ {
// because PHP is stupid:
if ($date->day >= 28) {
$date->day = 28;
Log::info(sprintf('Corrected date to %s', $date->format('Y-m-d')));
}
// get start mm-dd. Then create a start date in the year passed. // get start mm-dd. Then create a start date in the year passed.
$startDate = clone $date; $startDate = clone $date;
if (true === $this->useCustomFiscalYear) { if (true === $this->useCustomFiscalYear) {
$prefStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data; $prefStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
[$mth, $day] = explode('-', $prefStartStr); [$mth, $day] = explode('-', $prefStartStr);
$startDate->month((int)$mth)->day((int)$day); $startDate->day((int)$day)->month((int)$mth);
// if start date is after passed date, sub 1 year. // if start date is after passed date, sub 1 year.
if ($startDate > $date) { if ($startDate > $date) {