From 63118af4481cd262475f990e9be8656848618871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Ba=C5=9F?= Date: Thu, 27 Dec 2018 11:34:21 +0300 Subject: [PATCH] close#702 Fixed:Unopened report pages in Php version 5.6 --- .../Controllers/Reports/ExpenseSummary.php | 2 +- .../Reports/IncomeExpenseSummary.php | 19 +++++++++++-------- .../Controllers/Reports/IncomeSummary.php | 2 +- app/Http/Controllers/Reports/ProfitLoss.php | 2 +- app/Http/Controllers/Reports/TaxSummary.php | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 91697e4d0..2546b4b02 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -28,7 +28,7 @@ class ExpenseSummary extends Controller $year = request('year', Date::now()->year); // check and assign year start - if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + if (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) { // check if a specific year is requested if (!is_null(request('year'))) { $financial_start->year = $year; diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 7c9074489..c04f504e2 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -30,17 +30,20 @@ class IncomeExpenseSummary extends Controller $status = request('status'); $year = request('year', Date::now()->year); - + // check and assign year start - if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { - // check if a specific year is requested - if (!is_null(request('year'))) { - $financial_start->year = $year; + //if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + if (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) { + // check if a specific year is requested + if (!is_null(request('year'))) { + $financial_start->year = $year; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); } - $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; - $financial_start->subYear()->subMonth(); - } + $categories_filter = request('categories'); diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 66825cc24..0051e0f1d 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -28,7 +28,7 @@ class IncomeSummary extends Controller $year = request('year', Date::now()->year); // check and assign year start - if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + if (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) { // check if a specific year is requested if (!is_null(request('year'))) { $financial_start->year = $year; diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index fa640b6af..1b4b62abe 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -28,7 +28,7 @@ class ProfitLoss extends Controller $year = request('year', Date::now()->year); // check and assign year start - if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + if (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) { // check if a specific year is requested if (!is_null(request('year'))) { $financial_start->year = $year; diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php index 7a588a468..fca989aca 100644 --- a/app/Http/Controllers/Reports/TaxSummary.php +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -30,7 +30,7 @@ class TaxSummary extends Controller $year = request('year', Date::now()->year); // check and assign year start - if (($financial_start = Date::parse(setting('general.financial_start')))->month != 1) { + if (($financial_start = Date::parse(setting('general.financial_start'))->month) != 1) { // check if a specific year is requested if (!is_null(request('year'))) { $financial_start->year = $year;