Merge branch 'year-to-year-report'

app/Entities/Reports/ReportsRepository.php

@@ -106,6 +106,28 @@ class ReportsRepository extends BaseRepository
         return collect($reports);
     }
 
+    public function getYearToYearReports()
+    {
+        $rawQuery = 'YEAR(date) as year';
+        $rawQuery .= ', count(`id`) as count';
+        $rawQuery .= ', sum(if(in_out = 1, amount, 0)) AS cashin';
+        $rawQuery .= ', sum(if(in_out = 0, amount, 0)) AS cashout';
+
+        $reportsData = DB::table('payments')->select(DB::raw($rawQuery))
+            ->groupBy(DB::raw('YEAR(date)'))
+            ->orderBy('date', 'asc')
+            ->get();
+
+        $reports = [];
+        foreach ($reportsData as $report) {
+            $key = str_pad($report->year, 2, '0', STR_PAD_LEFT);
+            $reports[$key] = $report;
+            $reports[$key]->profit = $report->cashin - $report->cashout;
+        }
+
+        return collect($reports);
+    }
+
     /**
      * Get current credit/receiveble earnings report.
      *

app/Http/Controllers/ReportsController.php

@@ -61,6 +61,13 @@ class ReportsController extends Controller
         return view('reports.payments.yearly', compact('reports', 'years', 'year'));
     }
 
+    public function yearToYear(Request $request)
+    {
+        $reports = $this->repo->getYearToYearReports();
+
+        return view('reports.payments.year_to_year', compact('reports'));
+    }
+
     public function currentCredits()
     {
         $projects = $this->repo->getCurrentCredits();

resources/lang/de/report.php

@@ -26,4 +26,8 @@ return [
     'this_year'         => 'This Year',
     'view_yearly'       => 'View Yearly',
     'view_yearly_label' => 'View Report per',
+
+    // Year to year
+    'year_to_year'      => 'Year to Year Report',
+    'view_year_to_year' => 'View Year to Year Report',
 ];

resources/lang/en/report.php

@@ -26,4 +26,8 @@ return [
     'this_year'         => 'This Year',
     'view_yearly'       => 'View Yearly',
     'view_yearly_label' => 'View Report per',
+
+    // Year to year
+    'year_to_year'      => 'Year to Year Report',
+    'view_year_to_year' => 'View Year to Year Report',
 ];

resources/lang/id/report.php

@@ -26,4 +26,8 @@ return [
     'this_year'         => 'Tahun Ini',
     'view_yearly'       => 'Lihat Tahunan',
     'view_yearly_label' => 'Lihat Tahunan per',
+
+    // Year to year
+    'year_to_year'      => 'Laponan Tahun ke Tahun',
+    'view_year_to_year' => 'Lihat Laporan Tahun ke Tahun',
 ];

resources/views/reports/payments/year_to_year.blade.php

@@ -0,0 +1,98 @@
+@extends('layouts.app')
+
+@section('title', __('report.year_to_year'))
+
+@section('content')
+<ul class="breadcrumb hidden-print">
+    <li>{{ __('report.year_to_year') }}</li>
+</ul>
+
+<div class="panel panel-primary">
+    <div class="panel-heading"><h3 class="panel-title">{{ __('report.sales_graph') }}</h3></div>
+    <div class="panel-body">
+        <strong>{{ Option::get('money_sign', 'Rp') }}</strong>
+        <div id="year_to_year-chart" style="height: 350px;"></div>
+        <div class="text-center"><strong>{{ __('time.month') }}</strong></div>
+    </div>
+</div>
+
+<div class="panel panel-success table-responsive">
+    <div class="panel-heading"><h3 class="panel-title">{{ __('report.detail') }}</h3></div>
+    <div class="panel-body table-responsive">
+        <table class="table table-condensed">
+            <thead>
+                <th class="text-center">{{ __('time.month') }}</th>
+                <th class="text-center">{{ __('payment.payment') }}</th>
+                <th class="text-right">{{ __('payment.cash_in') }}</th>
+                <th class="text-right">{{ __('payment.cash_out') }}</th>
+                <th class="text-right">{{ __('report.profit') }}</th>
+                <th class="text-center">{{ __('app.action') }}</th>
+            </thead>
+            <tbody>
+                @php $chartData = []; @endphp
+                @foreach(get_years() as $year)
+                @php
+                    $any = isset($reports[$year]);
+                @endphp
+                <tr>
+                    <td class="text-center">{{ $year }}</td>
+                    <td class="text-center">{{ $any ? $reports[$year]->count : 0 }}</td>
+                    <td class="text-right">{{ format_money($any ? $reports[$year]->cashin : 0) }}</td>
+                    <td class="text-right">{{ format_money($any ? $reports[$year]->cashout : 0) }}</td>
+                    <td class="text-right">{{ format_money($profit = $any ? $reports[$year]->profit : 0) }}</td>
+                    <td class="text-center">
+                        {{ link_to_route(
+                            'reports.payments.yearly',
+                            __('report.view_yearly'),
+                            ['month' => $year, 'year' => $year],
+                            [
+                                'class' => 'btn btn-info btn-xs',
+                                'title' => __('report.yearly', ['year' => $year]),
+                            ]
+                        ) }}
+                    </td>
+                </tr>
+                @php
+                    $chartData[] = ['year' => $year, 'value' => $profit];
+                @endphp
+                @endforeach
+            </tbody>
+            <tfoot>
+                <tr>
+                    <th class="text-center">{{ trans('app.total') }}</th>
+                    <th class="text-center">{{ $reports->sum('count') }}</th>
+                    <th class="text-right">{{ format_money($reports->sum('cashin')) }}</th>
+                    <th class="text-right">{{ format_money($reports->sum('cashout')) }}</th>
+                    <th class="text-right">{{ format_money($reports->sum('profit')) }}</th>
+                    <td>&nbsp;</td>
+                </tr>
+            </tfoot>
+        </table>
+    </div>
+</div>
+@endsection
+
+@section('ext_css')
+    {{ Html::style(url('assets/css/plugins/morris.css')) }}
+@endsection
+
+@section('ext_js')
+    {{ Html::script(url('assets/js/plugins/morris/raphael.min.js')) }}
+    {{ Html::script(url('assets/js/plugins/morris/morris.min.js')) }}
+@endsection
+
+@section('script')
+<script>
+(function() {
+    new Morris.Bar({
+        element: 'year_to_year-chart',
+        data: {!! collect($chartData)->toJson() !!},
+        xkey: 'year',
+        ykeys: ['value'],
+        labels: ["{{ __('report.profit') }} {{ Option::get('money_sign', 'Rp') }}"],
+        parseTime: false,
+        barColors: ['#5CB85C']
+    });
+})();
+</script>
+@endsection

resources/views/reports/payments/yearly.blade.php

@@ -12,6 +12,7 @@
 {{ Form::select('year', $years, $year, ['class' => 'form-control']) }}
 {{ Form::submit(__('report.view_report'), ['class' => 'btn btn-info btn-sm']) }}
 {{ link_to_route('reports.payments.yearly', __('report.this_year'), [], ['class' => 'btn btn-default btn-sm']) }}
+{{ link_to_route('reports.payments.year_to_year', __('report.view_year_to_year'), [], ['class' => 'btn btn-success btn-sm']) }}
 {{ Form::close() }}
 
 <div class="panel panel-primary">

routes/web/reports.php

@@ -8,6 +8,7 @@ Route::group(['middleware' => ['web', 'role:admin'], 'prefix' => 'reports'], fun
     Route::get('payments/daily', 'ReportsController@daily')->name('reports.payments.daily');
     Route::get('payments/monthly', 'ReportsController@monthly')->name('reports.payments.monthly');
     Route::get('payments/yearly', 'ReportsController@yearly')->name('reports.payments.yearly');
+    Route::get('payments/year_to_year', 'ReportsController@yearToYear')->name('reports.payments.year_to_year');
     Route::get('current-credits', 'ReportsController@currentCredits')->name('reports.current-credits');
 
     /*