diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php
index 151873539..d3d5ea2fe 100644
--- a/app/Http/Controllers/Reports/ExpenseSummary.php
+++ b/app/Http/Controllers/Reports/ExpenseSummary.php
@@ -112,6 +112,8 @@ class ExpenseSummary extends Controller
$view_template = 'reports.expense_summary.index';
}
+ $print_url = $this->getPrintUrl($year);
+
// Expenses chart
$chart = Charts::multi('line', 'chartjs')
->dimensions(0, 300)
@@ -121,7 +123,17 @@ class ExpenseSummary extends Controller
->credits(false)
->view($chart_template);
- return view($view_template, compact('chart', 'dates', 'categories', 'statuses', 'accounts', 'vendors', 'expenses', 'totals'));
+ return view($view_template, compact(
+ 'chart',
+ 'dates',
+ 'categories',
+ 'statuses',
+ 'accounts',
+ 'vendors',
+ 'expenses',
+ 'totals',
+ 'print_url'
+ ));
}
private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field)
@@ -175,4 +187,25 @@ class ExpenseSummary extends Controller
$totals[$month]['amount'] += $amount;
}
}
+
+ private function getPrintUrl($year)
+ {
+ $print_url = 'reports/expense-summary?print=1'
+ . '&status=' . request('status')
+ . '&year='. request('year', $year);
+
+ collect(request('accounts'))->each(function($item) use(&$print_url) {
+ $print_url .= '&accounts[]=' . $item;
+ });
+
+ collect(request('vendors'))->each(function($item) use(&$print_url) {
+ $print_url .= '&vendors[]=' . $item;
+ });
+
+ collect(request('categories'))->each(function($item) use(&$print_url) {
+ $print_url .= '&categories[]=' . $item;
+ });
+
+ return $print_url;
+ }
}
diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
index 2362551ec..0f80a0bbd 100644
--- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php
+++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
@@ -153,6 +153,8 @@ class IncomeExpenseSummary extends Controller
$view_template = 'reports.income_expense_summary.index';
}
+ $print_url = $this->getPrintUrl($year);
+
// Profit chart
$chart = Charts::multi('line', 'chartjs')
->dimensions(0, 300)
@@ -162,7 +164,20 @@ class IncomeExpenseSummary extends Controller
->credits(false)
->view($chart_template);
- return view($view_template, compact('chart', 'dates', 'income_categories', 'expense_categories', 'categories', 'statuses', 'accounts', 'customers', 'vendors', 'compares', 'totals'));
+ return view($view_template, compact(
+ 'chart',
+ 'dates',
+ 'income_categories',
+ 'expense_categories',
+ 'categories',
+ 'statuses',
+ 'accounts',
+ 'customers',
+ 'vendors',
+ 'compares',
+ 'totals',
+ 'print_url'
+ ));
}
private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field)
@@ -242,4 +257,29 @@ class IncomeExpenseSummary extends Controller
}
}
}
+
+ private function getPrintUrl($year)
+ {
+ $print_url = 'reports/income-expense-summary?print=1'
+ . '&status=' . request('status')
+ . '&year='. request('year', $year);
+
+ collect(request('accounts'))->each(function($item) use(&$print_url) {
+ $print_url .= '&accounts[]=' . $item;
+ });
+
+ collect(request('customers'))->each(function($item) use(&$print_url) {
+ $print_url .= '&customers[]=' . $item;
+ });
+
+ collect(request('vendors'))->each(function($item) use(&$print_url) {
+ $print_url .= '&vendors[]=' . $item;
+ });
+
+ collect(request('categories'))->each(function($item) use(&$print_url) {
+ $print_url .= '&categories[]=' . $item;
+ });
+
+ return $print_url;
+ }
}
diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php
index a6b37ab28..50a02a5f4 100644
--- a/app/Http/Controllers/Reports/IncomeSummary.php
+++ b/app/Http/Controllers/Reports/IncomeSummary.php
@@ -112,6 +112,8 @@ class IncomeSummary extends Controller
$view_template = 'reports.income_summary.index';
}
+ $print_url = $this->getPrintUrl($year);
+
// Incomes chart
$chart = Charts::multi('line', 'chartjs')
->dimensions(0, 300)
@@ -121,7 +123,17 @@ class IncomeSummary extends Controller
->credits(false)
->view($chart_template);
- return view($view_template, compact('chart', 'dates', 'categories', 'statuses', 'accounts', 'customers', 'incomes', 'totals'));
+ return view($view_template, compact(
+ 'chart',
+ 'dates',
+ 'categories',
+ 'statuses',
+ 'accounts',
+ 'customers',
+ 'incomes',
+ 'totals',
+ 'print_url'
+ ));
}
private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field)
@@ -175,4 +187,25 @@ class IncomeSummary extends Controller
$totals[$month]['amount'] += $amount;
}
}
+
+ private function getPrintUrl($year)
+ {
+ $print_url = 'reports/income-summary?print=1'
+ . '&status=' . request('status')
+ . '&year='. request('year', $year);
+
+ collect(request('accounts'))->each(function($item) use(&$print_url) {
+ $print_url .= '&accounts[]=' . $item;
+ });
+
+ collect(request('customers'))->each(function($item) use(&$print_url) {
+ $print_url .= '&customers[]=' . $item;
+ });
+
+ collect(request('categories'))->each(function($item) use(&$print_url) {
+ $print_url .= '&categories[]=' . $item;
+ });
+
+ return $print_url;
+ }
}
diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php
index 7014b1b5b..bc2cada3e 100644
--- a/resources/views/reports/expense_summary/index.blade.php
+++ b/resources/views/reports/expense_summary/index.blade.php
@@ -3,7 +3,7 @@
@section('title', trans('reports.summary.expense'))
@section('new_button')
- {{ trans('general.print') }}
+ {{ trans('general.print') }}
@endsection
@section('content')
diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php
index 8b5ad9c16..39b278854 100644
--- a/resources/views/reports/income_expense_summary/index.blade.php
+++ b/resources/views/reports/income_expense_summary/index.blade.php
@@ -3,7 +3,7 @@
@section('title', trans('reports.summary.income_expense'))
@section('new_button')
- {{ trans('general.print') }}
+ {{ trans('general.print') }}
@endsection
@section('content')
diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php
index 46ffa5ae8..629bad120 100644
--- a/resources/views/reports/income_summary/index.blade.php
+++ b/resources/views/reports/income_summary/index.blade.php
@@ -3,7 +3,7 @@
@section('title', trans('reports.summary.income'))
@section('new_button')
- {{ trans('general.print') }}
+ {{ trans('general.print') }}
@endsection
@section('content')