fixed #658

2018-12-03 01:05:59 +03:00
parent f027638d5b
commit 79075e3f5a
6 changed files with 112 additions and 6 deletions
--- 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;
+    }
 }
--- 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;
+    }
 }
--- 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;
+    }
 }
--- 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')
-<span class="new-button"><a href="{{ url('reports/expense-summary') }}?print=1&status={{ request('status') }}&year={{ request('year', $this_year) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
+<span class="new-button"><a href="{{ url($print_url) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
@endsection

@section('content')
--- 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')
-<span class="new-button"><a href="{{ url('reports/income-expense-summary') }}?print=1&status={{ request('status') }}&year={{ request('year', $this_year) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
+<span class="new-button"><a href="{{ url($print_url) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
@endsection

@section('content')
--- 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')
-<span class="new-button"><a href="{{ url('reports/income-summary') }}?print=1&status={{ request('status') }}&year={{ request('year', $this_year) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
+<span class="new-button"><a href="{{ url($print_url) }}" target="_blank" class="btn btn-success btn-sm"><span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}</a></span>
@endsection

@section('content')