print reports

akaunting · Apr 7, 2018 · 7ecf691 · 7ecf691
1 parent fcc6107
commit 7ecf691
Show file tree

Hide file tree

Showing 15 changed files with 316 additions and 184 deletions.
diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php
@@ -91,19 +91,28 @@ public function index()
             $this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at');
         }
 
+        // Check if it's a print or normal request
+        if (request('print')) {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print';
+            $view_template = 'reports.expense_summary.print';
+        } else {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line';
+            $view_template = 'reports.expense_summary.index';
+        }
+
         // Expenses chart
         $chart = Charts::multi('line', 'chartjs')
             ->dimensions(0, 300)
             ->colors(['#F56954'])
             ->dataset(trans_choice('general.expenses', 1), $expenses_graph)
             ->labels($dates)
             ->credits(false)
-            ->view('vendor.consoletvs.charts.chartjs.multi.line');
+            ->view($chart_template);
 
         // Expenses Graph
         $expenses_graph = json_encode($expenses_graph);
 
-        return view('reports.expense_summary.index', compact('chart', 'dates', 'categories', 'expenses', 'totals'));
+        return view($view_template, compact('chart', 'dates', 'categories', 'expenses', 'totals'));
     }
 
     private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field)

diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
@@ -141,16 +141,25 @@ public function index()
             $this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at');
         }
 
+        // Check if it's a print or normal request
+        if (request('print')) {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print';
+            $view_template = 'reports.income_expense_summary.print';
+        } else {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line';
+            $view_template = 'reports.income_expense_summary.index';
+        }
+
         // Profit chart
         $chart = Charts::multi('line', 'chartjs')
             ->dimensions(0, 300)
             ->colors(['#6da252'])
             ->dataset(trans_choice('general.profits', 1), $profit_graph)
             ->labels($dates)
             ->credits(false)
-            ->view('vendor.consoletvs.charts.chartjs.multi.line');
+            ->view($chart_template);
 
-        return view('reports.income_expense_summary.index', compact('chart', 'dates', 'income_categories', 'expense_categories', 'compares', 'totals'));
+        return view($view_template, compact('chart', 'dates', 'income_categories', 'expense_categories', 'compares', 'totals'));
     }
 
     private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field)

diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php
@@ -91,16 +91,25 @@ public function index()
             $this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at');
         }
 
+        // Check if it's a print or normal request
+        if (request('print')) {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print';
+            $view_template = 'reports.income_summary.print';
+        } else {
+            $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line';
+            $view_template = 'reports.income_summary.index';
+        }
+
         // Incomes chart
         $chart = Charts::multi('line', 'chartjs')
             ->dimensions(0, 300)
             ->colors(['#00c0ef'])
             ->dataset(trans_choice('general.incomes', 1), $incomes_graph)
             ->labels($dates)
             ->credits(false)
-            ->view('vendor.consoletvs.charts.chartjs.multi.line');
+            ->view($chart_template);
 
-        return view('reports.income_summary.index', compact('chart', 'dates', 'categories', 'incomes', 'totals'));
+        return view($view_template, compact('chart', 'dates', 'categories', 'incomes', 'totals'));
     }
 
     private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field)

diff --git a/public/css/app.css b/public/css/app.css
@@ -515,6 +515,10 @@ ul.add-new.nav.navbar-nav.pull-left {
     opacity: 0.4;
 }
 
+.print-width {
+    max-width: 1500px;
+}
+
 /*
 .tooltip > .tooltip-inner {
     background-color: #6da252;

diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php
@@ -0,0 +1,7 @@
+<html>
+    @include('partials.admin.head')
+
+    <body onload="window.print();" class="print-width">
+        @yield('content')
+    </body>
+</html>
diff --git a/resources/views/reports/expense_summary/body.blade.php b/resources/views/reports/expense_summary/body.blade.php
@@ -0,0 +1,48 @@
+<div class="box-body">
+    {!! $chart->render() !!}
+
+    <hr>
+
+    <div class="table table-responsive">
+        <table class="table table-bordered table-striped table-hover" id="tbl-report-expenses">
+            <thead>
+            <tr>
+                <th>{{ trans_choice('general.categories', 1) }}</th>
+                @foreach($dates as $date)
+                    <th class="text-right">{{ $date }}</th>
+                @endforeach
+            </tr>
+            </thead>
+            <tbody>
+            @if ($expenses)
+                @foreach($expenses as $category_id =>  $category)
+                    <tr>
+                        <td>{{ $categories[$category_id] }}</td>
+                        @foreach($category as $item)
+                            <td class="text-right">@money($item['amount'], $item['currency_code'], true)</td>
+                        @endforeach
+                    </tr>
+                @endforeach
+            @else
+                <tr>
+                    <td colspan="4">
+                        <h5 class="text-center">{{ trans('general.no_records') }}</h5>
+                    </td>
+                </tr>
+            @endif
+            </tbody>
+            <tfoot>
+            <tr>
+                <th>{{ trans_choice('general.totals', 1) }}</th>
+                @foreach($totals as $total)
+                    <th class="text-right">@money($total['amount'], $total['currency_code'], true)</th>
+                @endforeach
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+
+@push('js')
+{!! Charts::assets() !!}
+@endpush
diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php
@@ -2,6 +2,10 @@
 
 @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>
+@endsection
+
 @section('content')
 <!-- Default box -->
 <div class="box box-success">
@@ -17,55 +21,8 @@
         </div>
         {!! Form::close() !!}
     </div>
-    <div class="box-body">
-        {!! $chart->render() !!}
-
-        <hr>
 
-        <div class="table table-responsive">
-            <table class="table table-bordered table-striped table-hover" id="tbl-report-expenses">
-                <thead>
-                <tr>
-                    <th>{{ trans_choice('general.categories', 1) }}</th>
-                    @foreach($dates as $date)
-                    <th class="text-right">{{ $date }}</th>
-                    @endforeach
-                </tr>
-                </thead>
-                <tbody>
-                @if ($expenses)
-                @foreach($expenses as $category_id =>  $category)
-                    <tr>
-                        <td>{{ $categories[$category_id] }}</td>
-                        @foreach($category as $item)
-                        <td class="text-right">@money($item['amount'], $item['currency_code'], true)</td>
-                        @endforeach
-                    </tr>
-                @endforeach
-                @else
-                    <tr>
-                        <td colspan="4">
-                            <h5 class="text-center">{{ trans('general.no_records') }}</h5>
-                        </td>
-                    </tr>
-                @endif
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <th>{{ trans_choice('general.totals', 1) }}</th>
-                        @foreach($totals as $total)
-                        <th class="text-right">@money($total['amount'], $total['currency_code'], true)</th>
-                        @endforeach
-                    </tr>
-                </tfoot>
-            </table>
-        </div>
-    </div>
-    <!-- /.box-body -->
+    @include('reports.expense_summary.body')
 </div>
 <!-- /.box -->
 @endsection
-
-@push('js')
-{!! Charts::assets() !!}
-@endpush
diff --git a/resources/views/reports/expense_summary/print.blade.php b/resources/views/reports/expense_summary/print.blade.php
@@ -0,0 +1,7 @@
+@extends('layouts.print')
+
+@section('title', trans('reports.summary.expense'))
+
+@section('content')
+    @include('reports.expense_summary.body')
+@endsection
diff --git a/resources/views/reports/income_expense_summary/body.blade.php b/resources/views/reports/income_expense_summary/body.blade.php
@@ -0,0 +1,66 @@
+<div class="box-body">
+    {!! $chart->render() !!}
+
+    <hr>
+
+    <div class="table table-responsive">
+        <table class="table table-bordered table-striped table-hover" id="tbl-payments">
+            <thead>
+            <tr>
+                <th>{{ trans_choice('general.categories', 1) }}</th>
+                @foreach($dates as $date)
+                    <th class="text-right">{{ $date }}</th>
+                @endforeach
+            </tr>
+            </thead>
+            <tbody>
+            @if ($compares)
+                @foreach($compares as $type =>  $categories)
+                    @foreach($categories as $category_id =>  $category)
+                        <tr>
+                            @if($type == 'income')
+                                <td>{{ $income_categories[$category_id] }}</td>
+                            @else
+                                <td>{{ $expense_categories[$category_id] }}</td>
+                            @endif
+                            @foreach($category as $item)
+                                @if($type == 'income')
+                                    <td class="text-right">@money($item['amount'], $item['currency_code'], true)</td>
+                                @else
+                                    <td class="text-right">@money(-$item['amount'], $item['currency_code'], true)</td>
+                                @endif
+                            @endforeach
+                        </tr>
+                    @endforeach
+                @endforeach
+            @else
+                <tr>
+                    <td colspan="13">
+                        <h5 class="text-center">{{ trans('general.no_records') }}</h5>
+                    </td>
+                </tr>
+            @endif
+            </tbody>
+            <tfoot>
+            <tr>
+                <th>{{ trans_choice('general.totals', 1) }}</th>
+                @foreach($totals as $total)
+                    <th class="text-right">
+                        @if($total['amount'] == 0)
+                            <span>@money($total['amount'], $total['currency_code'], true)</span>
+                        @elseif($total['amount'] > 0)
+                            <span class="text-green">@money($total['amount'], $total['currency_code'], true)</span>
+                        @else
+                            <span class="text-red">@money($total['amount'], $total['currency_code'], true)</span>
+                        @endif
+                    </th>
+                @endforeach
+            </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+
+@push('js')
+{!! Charts::assets() !!}
+@endpush
diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php
@@ -1,6 +1,10 @@
 @extends('layouts.admin')
 
-@section('title', trans_choice('reports.summary.income_expense', 1))
+@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>
+@endsection
 
 @section('content')
 <!-- Default box -->
@@ -17,73 +21,8 @@
         </div>
         {!! Form::close() !!}
     </div>
-    <div class="box-body">
-        {!! $chart->render() !!}
-
-        <hr>
 
-        <div class="table table-responsive">
-            <table class="table table-bordered table-striped table-hover" id="tbl-payments">
-                <thead>
-                <tr>
-                    <th>{{ trans_choice('general.categories', 1) }}</th>
-                    @foreach($dates as $date)
-                    <th class="text-right">{{ $date }}</th>
-                    @endforeach
-                </tr>
-                </thead>
-                <tbody>
-                @if ($compares)
-                    @foreach($compares as $type =>  $categories)
-                        @foreach($categories as $category_id =>  $category)
-                        <tr>
-                            @if($type == 'income')
-                            <td>{{ $income_categories[$category_id] }}</td>
-                            @else
-                            <td>{{ $expense_categories[$category_id] }}</td>
-                            @endif
-                            @foreach($category as $item)
-                            @if($type == 'income')
-                            <td class="text-right">@money($item['amount'], $item['currency_code'], true)</td>
-                            @else
-                            <td class="text-right">@money(-$item['amount'], $item['currency_code'], true)</td>
-                            @endif
-                            @endforeach
-                        </tr>
-                        @endforeach
-                    @endforeach
-                @else
-                    <tr>
-                        <td colspan="13">
-                            <h5 class="text-center">{{ trans('general.no_records') }}</h5>
-                        </td>
-                    </tr>
-                @endif
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <th>{{ trans_choice('general.totals', 1) }}</th>
-                        @foreach($totals as $total)
-                            <th class="text-right">
-                                @if($total['amount'] == 0)
-                                <span>@money($total['amount'], $total['currency_code'], true)</span>
-                                @elseif($total['amount'] > 0)
-                                <span class="text-green">@money($total['amount'], $total['currency_code'], true)</span>
-                                @else
-                                <span class="text-red">@money($total['amount'], $total['currency_code'], true)</span>
-                                @endif
-                            </th>
-                        @endforeach
-                    </tr>
-                </tfoot>
-            </table>
-        </div>
-    </div>
-    <!-- /.box-body -->
+    @include('reports.income_expense_summary.body')
 </div>
 <!-- /.box -->
 @endsection
-
-@push('js')
-{!! Charts::assets() !!}
-@endpush
diff --git a/resources/views/reports/income_expense_summary/print.blade.php b/resources/views/reports/income_expense_summary/print.blade.php
@@ -0,0 +1,7 @@
+@extends('layouts.print')
+
+@section('title', trans('reports.summary.income_expense'))
+
+@section('content')
+    @include('reports.income_expense_summary.body')
+@endsection