From 1eeee80fb705d052fb4d2e7bdb784639fa89c9b1 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 11:20:28 +0530 Subject: [PATCH 01/20] Update Dashboard.php --- app/Http/Controllers/Common/Dashboard.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboard.php b/app/Http/Controllers/Common/Dashboard.php index 176953682..91649058a 100644 --- a/app/Http/Controllers/Common/Dashboard.php +++ b/app/Http/Controllers/Common/Dashboard.php @@ -11,6 +11,7 @@ use App\Models\Income\Invoice; use App\Models\Income\InvoicePayment; use App\Models\Income\Revenue; use App\Models\Setting\Category; +use App\Models\Setting\Setting; use App\Traits\Currencies; use Charts; use Date; @@ -20,6 +21,9 @@ class Dashboard extends Controller use Currencies; public $today; + + // get any custom financial year beginning + public $financial_start; public $income_donut = ['colors' => [], 'labels' => [], 'values' => []]; @@ -33,6 +37,7 @@ class Dashboard extends Controller public function index() { $this->today = Date::today(); + $this->financial_start = $financial_start = Date::parse(Setting::where('key', 'general.financial_start')->first()->value)->format('Y-m-d'); list($total_incomes, $total_expenses, $total_profit) = $this->getTotals(); @@ -55,7 +60,8 @@ class Dashboard extends Controller 'donut_expenses', 'accounts', 'latest_incomes', - 'latest_expenses' + 'latest_expenses', + 'financial_start' )); } @@ -123,8 +129,13 @@ class Dashboard extends Controller private function getCashFlow() { - $start = Date::parse(request('start', $this->today->startOfYear()->format('Y-m-d'))); - $end = Date::parse(request('end', $this->today->endOfYear()->format('Y-m-d'))); + // check and assign year start + if (($year_start = $this->today->startOfYear()->format('Y-m-d')) !== $this->financial_start) { + $year_start = $this->financial_start; + } + + $start = Date::parse(request('start', $year_start)); + $end = Date::parse(request('end', Date::parse($year_start)->addYear(1)->subDays(1)->format('Y-m-d'))); $period = request('period', 'month'); $range = request('range', 'custom'); From 7fb5fa4d417690a922d25fd6c988a19a2b62be0f Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 11:21:32 +0530 Subject: [PATCH 02/20] Update settings.php --- resources/lang/en-GB/settings.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php index 4ba42cacb..3b7409ced 100644 --- a/resources/lang/en-GB/settings.php +++ b/resources/lang/en-GB/settings.php @@ -12,13 +12,14 @@ return [ 'localisation' => [ 'tab' => 'Localisation', 'date' => [ - 'format' => 'Date Format', - 'separator' => 'Date Separator', - 'dash' => 'Dash (-)', - 'dot' => 'Dot (.)', - 'comma' => 'Comma (,)', - 'slash' => 'Slash (/)', - 'space' => 'Space ( )', + 'format' => 'Date Format', + 'financial_start' => 'Financial year start', + 'separator' => 'Date Separator', + 'dash' => 'Dash (-)', + 'dot' => 'Dot (.)', + 'comma' => 'Comma (,)', + 'slash' => 'Slash (/)', + 'space' => 'Space ( )', ], 'timezone' => 'Time Zone', 'percent' => [ From 20b51c91792157338945810e6fa1d59cf480d010 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 11:23:15 +0530 Subject: [PATCH 03/20] Update index.blade.php --- resources/views/common/dashboard/index.blade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/common/dashboard/index.blade.php b/resources/views/common/dashboard/index.blade.php index f1508d715..875d21b1a 100644 --- a/resources/views/common/dashboard/index.blade.php +++ b/resources/views/common/dashboard/index.blade.php @@ -252,8 +252,8 @@ @push('scripts') -@endpush \ No newline at end of file +@endpush From 2d76367e91365b3b6302087839f2bc9496bab5db Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 11:23:57 +0530 Subject: [PATCH 04/20] Update edit.blade.php --- resources/views/settings/settings/edit.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php index db20f3eee..6f84b4e0a 100644 --- a/resources/views/settings/settings/edit.blade.php +++ b/resources/views/settings/settings/edit.blade.php @@ -45,6 +45,8 @@
{{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, null, ['autocomplete' => 'off']) }} + + {{ Form::textGroup('financial_start', trans('settings.localisation.date.financial_start'), 'calendar-check-o', []) }} {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, null, []) }} From 1f4ff6175a1dc4a8dffac3e4857a0133de72dfc6 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 11:24:29 +0530 Subject: [PATCH 05/20] Update Settings.php --- database/seeds/Settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index 6856a7540..19d7b4a2e 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -28,6 +28,7 @@ class Settings extends Seeder Setting::set([ 'general.date_format' => 'd M Y', + 'general.financial_start' => '01 Jan', 'general.date_separator' => 'space', 'general.timezone' => 'Europe/London', 'general.percent_position' => 'after', From 54431e3bf500a15087d503e39e8f6f60f62be2d4 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:48:30 +0530 Subject: [PATCH 06/20] Update Dashboard.php --- app/Http/Controllers/Common/Dashboard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Common/Dashboard.php b/app/Http/Controllers/Common/Dashboard.php index 91649058a..d4e9d6f2a 100644 --- a/app/Http/Controllers/Common/Dashboard.php +++ b/app/Http/Controllers/Common/Dashboard.php @@ -37,7 +37,7 @@ class Dashboard extends Controller public function index() { $this->today = Date::today(); - $this->financial_start = $financial_start = Date::parse(Setting::where('key', 'general.financial_start')->first()->value)->format('Y-m-d'); + $this->financial_start = $financial_start = Date::parse(setting('general.financial_start'))->format('Y-m-d'); list($total_incomes, $total_expenses, $total_profit) = $this->getTotals(); From af5a891c36bc22c3df3b1a6f8cc39c36287e64b8 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:48:58 +0530 Subject: [PATCH 07/20] Update Dashboard.php --- app/Http/Controllers/Common/Dashboard.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Common/Dashboard.php b/app/Http/Controllers/Common/Dashboard.php index d4e9d6f2a..a33f8fb42 100644 --- a/app/Http/Controllers/Common/Dashboard.php +++ b/app/Http/Controllers/Common/Dashboard.php @@ -11,7 +11,6 @@ use App\Models\Income\Invoice; use App\Models\Income\InvoicePayment; use App\Models\Income\Revenue; use App\Models\Setting\Category; -use App\Models\Setting\Setting; use App\Traits\Currencies; use Charts; use Date; From 51a4e5e91fd4a4cbc6c9d39ec0178094f3fa85ba Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:52:34 +0530 Subject: [PATCH 08/20] Update index.blade.php --- resources/views/common/dashboard/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/common/dashboard/index.blade.php b/resources/views/common/dashboard/index.blade.php index 875d21b1a..f15277e18 100644 --- a/resources/views/common/dashboard/index.blade.php +++ b/resources/views/common/dashboard/index.blade.php @@ -266,7 +266,7 @@ '{{ trans("reports.this_year") }}': [start, end], '{{ trans("reports.previous_year") }}': [moment('{{ $financial_start }}').subtract(1, 'year'), moment('{{ $financial_start }}').subtract('1', 'days')], '{{ trans("reports.this_quarter") }}': [moment().subtract(2, 'months').startOf('month'), moment().endOf('month')], - '{{ trans("reports.previous_quarter") }}': [moment().subtract(5, 'months').startOf('month'), moment().subtract(3, 'months').endOf('month')], + '{{ trans("reports.previous_quarter") }}': [moment().subtract(1, 'quarter').startOf('quarter'), moment().subtract(1, 'quarter').endOf('quarter')], '{{ trans("reports.last_12_months") }}': [moment().subtract(11, 'months').startOf('month'), moment().endOf('month')] } }, cb); From f7a9b8cbdf7f3942fd25e8533118d8dae6de1908 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:54:05 +0530 Subject: [PATCH 09/20] Update index.blade.php --- resources/views/common/dashboard/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/common/dashboard/index.blade.php b/resources/views/common/dashboard/index.blade.php index f15277e18..384c53ad1 100644 --- a/resources/views/common/dashboard/index.blade.php +++ b/resources/views/common/dashboard/index.blade.php @@ -265,7 +265,7 @@ ranges: { '{{ trans("reports.this_year") }}': [start, end], '{{ trans("reports.previous_year") }}': [moment('{{ $financial_start }}').subtract(1, 'year'), moment('{{ $financial_start }}').subtract('1', 'days')], - '{{ trans("reports.this_quarter") }}': [moment().subtract(2, 'months').startOf('month'), moment().endOf('month')], + '{{ trans("reports.this_quarter") }}': [moment().startOf('quarter'), moment().endOf('quarter')], '{{ trans("reports.previous_quarter") }}': [moment().subtract(1, 'quarter').startOf('quarter'), moment().subtract(1, 'quarter').endOf('quarter')], '{{ trans("reports.last_12_months") }}': [moment().subtract(11, 'months').startOf('month'), moment().endOf('month')] } From 78b090b188e5037b154a1e4a77200d60ae14e197 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:57:54 +0530 Subject: [PATCH 10/20] Update ExpenseSummary.php --- app/Http/Controllers/Reports/ExpenseSummary.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index d3d5ea2fe..6e682d129 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -26,6 +26,17 @@ class ExpenseSummary 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; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); + } $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id')->toArray(); @@ -39,7 +50,8 @@ class ExpenseSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->format('F'); + $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + $dates[$j] = Date::parse($ym_string)->format('F'); $expenses_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; From d1fd63e308235ebc1c26c8e1cca220704388d6d2 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 19:59:12 +0530 Subject: [PATCH 11/20] Update IncomeExpenseSummary.php --- .../Reports/IncomeExpenseSummary.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 0f80a0bbd..c5a863e13 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -30,6 +30,18 @@ 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; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); + } + $categories_filter = request('categories'); $income_categories = Category::enabled()->type('income')->when($categories_filter, function ($query) use ($categories_filter) { @@ -42,9 +54,11 @@ class IncomeExpenseSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->format('F'); + $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + + $dates[$j] = Date::parse($ym_string)->format('F'); - $profit_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; + $profit_graph[Date::parse($ym_string)->format('F-Y')] = 0; // Totals $totals[$dates[$j]] = array( From 9f81918e4c92f7d000f191630935d0583bea2afc Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:00:01 +0530 Subject: [PATCH 12/20] Update ExpenseSummary.php --- app/Http/Controllers/Reports/ExpenseSummary.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 6e682d129..1ee5f7043 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -51,9 +51,10 @@ class ExpenseSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + $dates[$j] = Date::parse($ym_string)->format('F'); - $expenses_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; + $expenses_graph[Date::parse($ym_string)->format('F-Y')] = 0; // Totals $totals[$dates[$j]] = array( From a85d979bf278eb983b11474111e7c16fb288d4fd Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:00:47 +0530 Subject: [PATCH 13/20] Update IncomeSummary.php --- app/Http/Controllers/Reports/IncomeSummary.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 50a02a5f4..76f8dda10 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -26,6 +26,17 @@ class IncomeSummary 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; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); + } $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')->toArray(); @@ -39,9 +50,11 @@ class IncomeSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->format('F'); + $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + + $dates[$j] = Date::parse($ym_string)->format('F'); - $incomes_graph[Date::parse($year . '-' . $j)->format('F-Y')] = 0; + $incomes_graph[Date::parse($ym_string)->format('F-Y')] = 0; // Totals $totals[$dates[$j]] = array( From 3422d29868c46c42d039cd5f70d6d58539a9a512 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:01:30 +0530 Subject: [PATCH 14/20] Update ProfitLoss.php --- app/Http/Controllers/Reports/ProfitLoss.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 9b4d6e62b..b05c13f5c 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -26,6 +26,17 @@ class ProfitLoss 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; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subQuarter(); + } $income_categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')->toArray(); @@ -33,7 +44,9 @@ class ProfitLoss extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->quarter; + $ym_string = is_array($year) ? $financial_start->addQuarter()->format('Y-m') : $year . '-' . $j; + + $dates[$j] = Date::parse($ym_string)->quarter; // Totals $totals[$dates[$j]] = array( From 8a998b1a3adc03145042466edf7a4b6a7797bd20 Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:02:35 +0530 Subject: [PATCH 15/20] Update TaxSummary.php --- app/Http/Controllers/Reports/TaxSummary.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php index 1907ac90d..7a588a468 100644 --- a/app/Http/Controllers/Reports/TaxSummary.php +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -28,6 +28,17 @@ class TaxSummary 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; + } + + $year = [$financial_start->format('Y'), $financial_start->addYear()->format('Y')]; + $financial_start->subYear()->subMonth(); + } $t = Tax::enabled()->where('rate', '<>', '0')->pluck('name')->toArray(); @@ -35,7 +46,9 @@ class TaxSummary extends Controller // Dates for ($j = 1; $j <= 12; $j++) { - $dates[$j] = Date::parse($year . '-' . $j)->format('M'); + $ym_string = is_array($year) ? $financial_start->addMonth()->format('Y-m') : $year . '-' . $j; + + $dates[$j] = Date::parse($ym_string)->format('M'); foreach ($taxes as $tax_name) { $incomes[$tax_name][$dates[$j]] = [ From a90b3cc6ce446069c3aedd63aa2dc78549d8e22d Mon Sep 17 00:00:00 2001 From: sausin Date: Fri, 14 Dec 2018 20:03:18 +0530 Subject: [PATCH 16/20] Update DateTime.php --- app/Traits/DateTime.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index afa8e346b..549f68af9 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -29,6 +29,18 @@ trait DateTime $start = Date::parse($year . '-01-01')->format('Y-m-d'); $end = Date::parse($year . '-12-31')->format('Y-m-d'); + + // check if financial year has been customized + $financial_start = Date::parse(setting('general.financial_start')); + + if (Date::now()->startOfYear()->format('Y-m-d') !== $financial_start->format('Y-m-d')) { + if (!is_null(request('year'))) { + $financial_start->year = $year; + } + + $start = $financial_start->format('Y-m-d'); + $end = $financial_start->addYear(1)->subDays(1)->format('Y-m-d'); + } return $query->whereBetween($field, [$start, $end]); } @@ -70,4 +82,4 @@ trait DateTime return $groups; } -} \ No newline at end of file +} From e3e83e200babf74dc386740d331cfc286d4c936b Mon Sep 17 00:00:00 2001 From: sausin Date: Tue, 18 Dec 2018 09:13:54 +0530 Subject: [PATCH 17/20] Update Settings.php Fix seeder to have locale based date string --- database/seeds/Settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index 19d7b4a2e..a1d3217ff 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -4,6 +4,7 @@ namespace Database\Seeds; use App\Models\Model; use Illuminate\Database\Seeder; +use Date; use Setting; class Settings extends Seeder @@ -28,7 +29,7 @@ class Settings extends Seeder Setting::set([ 'general.date_format' => 'd M Y', - 'general.financial_start' => '01 Jan', + 'general.financial_start' => Date::now()->startOfYear()->format('d F'), 'general.date_separator' => 'space', 'general.timezone' => 'Europe/London', 'general.percent_position' => 'after', From f2d65d00320fb12663494b0711fa0823d2c18b41 Mon Sep 17 00:00:00 2001 From: sausin Date: Sun, 23 Dec 2018 15:06:19 +0530 Subject: [PATCH 18/20] Update IncomeExpenseSummary.php Include missing modification --- app/Http/Controllers/Reports/IncomeExpenseSummary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index c5a863e13..7c9074489 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -167,7 +167,7 @@ class IncomeExpenseSummary extends Controller $view_template = 'reports.income_expense_summary.index'; } - $print_url = $this->getPrintUrl($year); + $print_url = $this->getPrintUrl(is_array($year) ? $year[0] : $year); // Profit chart $chart = Charts::multi('line', 'chartjs') From 46d68f3e8c5d46b435d8d51629d176f9b358561e Mon Sep 17 00:00:00 2001 From: sausin Date: Sun, 23 Dec 2018 15:06:49 +0530 Subject: [PATCH 19/20] Update ExpenseSummary.php Include missing modification --- app/Http/Controllers/Reports/ExpenseSummary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 1ee5f7043..91697e4d0 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -125,7 +125,7 @@ class ExpenseSummary extends Controller $view_template = 'reports.expense_summary.index'; } - $print_url = $this->getPrintUrl($year); + $print_url = $this->getPrintUrl(is_array($year) ? $year[0] : $year); // Expenses chart $chart = Charts::multi('line', 'chartjs') From 27088e0d9ae986be8b50af3f17d4f52681c04462 Mon Sep 17 00:00:00 2001 From: sausin Date: Sun, 23 Dec 2018 15:07:18 +0530 Subject: [PATCH 20/20] Update IncomeSummary.php --- app/Http/Controllers/Reports/IncomeSummary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 76f8dda10..66825cc24 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -125,7 +125,7 @@ class IncomeSummary extends Controller $view_template = 'reports.income_summary.index'; } - $print_url = $this->getPrintUrl($year); + $print_url = $this->getPrintUrl(is_array($year) ? $year[0] : $year); // Incomes chart $chart = Charts::multi('line', 'chartjs')