fixed #658
This commit is contained in:
		| @@ -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; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -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; | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user