From 590790bf3c9858eec3ce473473e75e51be5afbd5 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 22 Dec 2018 21:59:20 +0800
Subject: [PATCH 001/113] Change getMonths() to get_months()

---
 app/Http/Controllers/ReportsController.php        | 2 +-
 app/helpers.php                                   | 6 +++---
 resources/views/reports/payments/daily.blade.php  | 2 +-
 resources/views/reports/payments/yearly.blade.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index df90803..5c6d438 100755
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -45,7 +45,7 @@ class ReportsController extends Controller
             $month = $req->get('month');
         }
         $reports = $this->repo->getMonthlyReports($year, $month);
-        $months = \getMonths();
+        $months = \get_months();
         $years = \getYears();
 
         return view('reports.payments.monthly', compact('reports', 'months', 'years', 'month', 'year'));
diff --git a/app/helpers.php b/app/helpers.php
index 3fdf5da..ee6efcf 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -80,7 +80,7 @@ function dateId($date)
     $explodedDate = explode('-', $date);
 
     if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
-        $months = getMonths();
+        $months = get_months();
 
         return $explodedDate[2].' '.$months[$explodedDate[1]].' '.$explodedDate[0];
     }
@@ -111,7 +111,7 @@ function monthId($monthNumber)
         return $monthNumber;
     }
 
-    $months = getMonths();
+    $months = get_months();
     $monthNumber = monthNumber($monthNumber);
 
     return $months[$monthNumber];
@@ -122,7 +122,7 @@ function monthId($monthNumber)
  *
  * @return array
  */
-function getMonths()
+function get_months()
 {
     return [
         '01' => __('time.months.01'),
diff --git a/resources/views/reports/payments/daily.blade.php b/resources/views/reports/payments/daily.blade.php
index c766457..3ddf240 100755
--- a/resources/views/reports/payments/daily.blade.php
+++ b/resources/views/reports/payments/daily.blade.php
@@ -8,7 +8,7 @@
 
 <ul class="breadcrumb hidden-print">
     <li>{{ link_to_route('reports.payments.yearly', __('report.yearly', ['year' => $dt->year]), ['year' => $dt->year]) }}</li>
-    <li>{{ link_to_route('reports.payments.monthly', getMonths()[monthNumber($dt->month)], ['year' => $dt->year,'month' => monthNumber($dt->month)]) }}</li>
+    <li>{{ link_to_route('reports.payments.monthly', get_months()[monthNumber($dt->month)], ['year' => $dt->year,'month' => monthNumber($dt->month)]) }}</li>
     <li class="active">{{ $dt->format('d') }}</li>
 </ul>
 
diff --git a/resources/views/reports/payments/yearly.blade.php b/resources/views/reports/payments/yearly.blade.php
index 2728cc9..7739e33 100755
--- a/resources/views/reports/payments/yearly.blade.php
+++ b/resources/views/reports/payments/yearly.blade.php
@@ -37,7 +37,7 @@
             </thead>
             <tbody>
                 @php $chartData = []; @endphp
-                @foreach(getMonths() as $monthNumber => $monthName)
+                @foreach(get_months() as $monthNumber => $monthName)
                 @php
                     $any = isset($reports[$monthNumber]);
                 @endphp

From 2f436da1f45c1862df669bae8d2bebd8b85422c7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 22 Dec 2018 22:26:43 +0800
Subject: [PATCH 002/113] Change monthId() to month_id()

---
 app/helpers.php                                   | 2 +-
 resources/views/reports/payments/yearly.blade.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index ee6efcf..1f47c17 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -105,7 +105,7 @@ function monthNumber($number)
  * @param  int|string  $monthNumber
  * @return string
  */
-function monthId($monthNumber)
+function month_id($monthNumber)
 {
     if (is_null($monthNumber)) {
         return $monthNumber;
diff --git a/resources/views/reports/payments/yearly.blade.php b/resources/views/reports/payments/yearly.blade.php
index 7739e33..d9209bf 100755
--- a/resources/views/reports/payments/yearly.blade.php
+++ b/resources/views/reports/payments/yearly.blade.php
@@ -42,7 +42,7 @@
                     $any = isset($reports[$monthNumber]);
                 @endphp
                 <tr>
-                    <td class="text-center">{{ monthId($monthNumber) }}</td>
+                    <td class="text-center">{{ month_id($monthNumber) }}</td>
                     <td class="text-center">{{ $any ? $reports[$monthNumber]->count : 0 }}</td>
                     <td class="text-right">{{ formatRp($any ? $reports[$monthNumber]->cashin : 0) }}</td>
                     <td class="text-right">{{ formatRp($any ? $reports[$monthNumber]->cashout : 0) }}</td>
@@ -54,14 +54,14 @@
                             ['month' => $monthNumber, 'year' => $year],
                             [
                                 'class' => 'btn btn-info btn-xs',
-                                'title' => __('report.monthly', ['year_month' => monthId($monthNumber)]),
-                                'title' => __('report.monthly', ['year_month' => monthId($monthNumber).' '.$year]),
+                                'title' => __('report.monthly', ['year_month' => month_id($monthNumber)]),
+                                'title' => __('report.monthly', ['year_month' => month_id($monthNumber).' '.$year]),
                             ]
                         ) }}
                     </td>
                 </tr>
                 @php
-                    $chartData[] = ['month' => monthId($monthNumber), 'value' => $profit];
+                    $chartData[] = ['month' => month_id($monthNumber), 'value' => $profit];
                 @endphp
                 @endforeach
             </tbody>

From d7f5cc333b0f790ef4a15787e4a30f581b821123 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 22 Dec 2018 22:26:56 +0800
Subject: [PATCH 003/113] Change getYears() to get_years()

---
 app/Http/Controllers/ReportsController.php | 4 ++--
 app/helpers.php                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 5c6d438..52eed1b 100755
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -46,7 +46,7 @@ class ReportsController extends Controller
         }
         $reports = $this->repo->getMonthlyReports($year, $month);
         $months = \get_months();
-        $years = \getYears();
+        $years = \get_years();
 
         return view('reports.payments.monthly', compact('reports', 'months', 'years', 'month', 'year'));
     }
@@ -56,7 +56,7 @@ class ReportsController extends Controller
         $year = $req->get('year', date('Y'));
 
         $reports = $this->repo->getYearlyReports($year);
-        $years = \getYears();
+        $years = \get_years();
 
         return view('reports.payments.yearly', compact('reports', 'years', 'year'));
     }
diff --git a/app/helpers.php b/app/helpers.php
index 1f47c17..9d44fdd 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -145,7 +145,7 @@ function get_months()
  *
  * @return array
  */
-function getYears()
+function get_years()
 {
     $yearRange = range(2014, date('Y'));
     foreach ($yearRange as $year) {

From 35d68ee520eed692de17d2d33aa7880b3a88b364 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 22 Dec 2018 22:29:21 +0800
Subject: [PATCH 004/113] Change monthNumber() to month_number()

---
 app/helpers.php                                  | 4 ++--
 resources/views/reports/payments/daily.blade.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 9d44fdd..e9369e4 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -94,7 +94,7 @@ function dateId($date)
  * @param  int|string $number
  * @return string
  */
-function monthNumber($number)
+function month_number($number)
 {
     return str_pad($number, 2, '0', STR_PAD_LEFT);
 }
@@ -112,7 +112,7 @@ function month_id($monthNumber)
     }
 
     $months = get_months();
-    $monthNumber = monthNumber($monthNumber);
+    $monthNumber = month_number($monthNumber);
 
     return $months[$monthNumber];
 }
diff --git a/resources/views/reports/payments/daily.blade.php b/resources/views/reports/payments/daily.blade.php
index 3ddf240..7850f52 100755
--- a/resources/views/reports/payments/daily.blade.php
+++ b/resources/views/reports/payments/daily.blade.php
@@ -8,7 +8,7 @@
 
 <ul class="breadcrumb hidden-print">
     <li>{{ link_to_route('reports.payments.yearly', __('report.yearly', ['year' => $dt->year]), ['year' => $dt->year]) }}</li>
-    <li>{{ link_to_route('reports.payments.monthly', get_months()[monthNumber($dt->month)], ['year' => $dt->year,'month' => monthNumber($dt->month)]) }}</li>
+    <li>{{ link_to_route('reports.payments.monthly', get_months()[month_number($dt->month)], ['year' => $dt->year,'month' => month_number($dt->month)]) }}</li>
     <li class="active">{{ $dt->format('d') }}</li>
 </ul>
 
@@ -20,7 +20,7 @@
 {{ link_to_route(
     'reports.payments.monthly',
     __('report.view_monthly'),
-    ['month' => monthNumber($dt->month), 'year' => $dt->year],
+    ['month' => month_number($dt->month), 'year' => $dt->year],
     ['class' => 'btn btn-default btn-sm']
 ) }}
 {{ Form::close() }}

From e03ce9dcedf02bf2c774de1e2b01249c261b2d13 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 20:29:06 +0800
Subject: [PATCH 005/113] Chang dateId() to date_id()

---
 app/Entities/Subscriptions/Subscription.php                       | 4 ++--
 app/helpers.php                                                   | 2 +-
 resources/views/customers/subscriptions.blade.php                 | 2 +-
 resources/views/invoices/pdf.blade.php                            | 6 +++---
 resources/views/payments/pdf.blade.php                            | 2 +-
 resources/views/projects/partials/project-show.blade.php          | 8 ++++----
 resources/views/projects/subscriptions.blade.php                  | 4 ++--
 resources/views/reports/payments/daily.blade.php                  | 2 +-
 resources/views/reports/payments/monthly.blade.php                | 4 ++--
 resources/views/subscriptions/index.blade.php                     | 2 +-
 .../views/subscriptions/partials/subscription-show.blade.php      | 4 ++--
 tests/Feature/ManageSubscriptionsTest.php                         | 4 ++--
 tests/Unit/Models/SubscriptionTest.php                            | 6 +++---
 13 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/Entities/Subscriptions/Subscription.php b/app/Entities/Subscriptions/Subscription.php
index 1dff03e..1829921 100755
--- a/app/Entities/Subscriptions/Subscription.php
+++ b/app/Entities/Subscriptions/Subscription.php
@@ -61,8 +61,8 @@ class Subscription extends Model
      */
     public function dueDateDescription()
     {
-        $dueDateDescription = __('subscription.start_date').' : '.dateId($this->start_date)."\n";
-        $dueDateDescription .= __('subscription.due_date').' : '.dateId($this->due_date);
+        $dueDateDescription = __('subscription.start_date').' : '.date_id($this->start_date)."\n";
+        $dueDateDescription .= __('subscription.due_date').' : '.date_id($this->due_date);
 
         return $dueDateDescription;
     }
diff --git a/app/helpers.php b/app/helpers.php
index e9369e4..e9632d9 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -71,7 +71,7 @@ function formatDate($date)
  * @param  string  $date
  * @return string
  */
-function dateId($date)
+function date_id($date)
 {
     if (is_null($date) || $date == '0000-00-00') {
         return '-';
diff --git a/resources/views/customers/subscriptions.blade.php b/resources/views/customers/subscriptions.blade.php
index b07c629..bc35479 100755
--- a/resources/views/customers/subscriptions.blade.php
+++ b/resources/views/customers/subscriptions.blade.php
@@ -24,7 +24,7 @@
                 <td class="text-center">{!! $subscription->type_label !!}</td>
                 <td>{{ $subscription->customer->name }}</td>
                 <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
-                    {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
+                    {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
                 </td>
                 <td class="text-right">{{ formatRp($subscription->price) }}</td>
                 <td>{{ $subscription->vendor->name }}</td>
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index c830812..30b9003 100755
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -61,7 +61,7 @@
                 <td style="width:270px; text-align: center;">
                     <h3 style="margin: 3px 0; font-size: 24px">{{ __('invoice.invoice') }}</h3>
                     <div style="margin: 5px">{{ __('invoice.number') }} : INV-{{ $invoice->number }}</div>
-                    <div>{{ __('app.date') }} : {{ dateId($invoice->date) }}</div>
+                    <div>{{ __('app.date') }} : {{ date_id($invoice->date) }}</div>
                 </td>
             </tr>
             <tr>
@@ -87,7 +87,7 @@
                 <td class="text-center text-top">
                     @if ($invoice->due_date)
                         <h4 style="margin: 30px 3px 0;">{{ __('invoice.due_date') }}</h4>
-                        <p>{{ dateId($invoice->due_date) }}</p>
+                        <p>{{ date_id($invoice->due_date) }}</p>
                     @endif
                     @if ($taxId = Option::get('agency_tax_id'))
                         <h4 style="margin: 30px 3px 0;">{{ __('agency.tax_id') }}</h4>
@@ -176,7 +176,7 @@
             <tr>
                 <td colspan="3" class="text-center">
                     {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }}
-                    {{ dateId($invoice->date) }} <br><br><br><br>
+                    {{ date_id($invoice->date) }} <br><br><br><br>
                     <div style="font-weight: bold;">{{ Option::get('agency_name') }}</div>
                 </td>
             </tr>
diff --git a/resources/views/payments/pdf.blade.php b/resources/views/payments/pdf.blade.php
index f6e3601..6680e20 100755
--- a/resources/views/payments/pdf.blade.php
+++ b/resources/views/payments/pdf.blade.php
@@ -63,7 +63,7 @@
                 <td>&nbsp;</td>
                 <td>&nbsp;</td>
                 <td style="text-align: center;">
-                    {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }} {{ dateId($payment->date) }}
+                    {{ Option::get('agency_city') ? Option::get('agency_city').', ' : '' }} {{ date_id($payment->date) }}
                 </td>
             </tr>
             <tr>
diff --git a/resources/views/projects/partials/project-show.blade.php b/resources/views/projects/partials/project-show.blade.php
index eee023e..ad8e058 100644
--- a/resources/views/projects/partials/project-show.blade.php
+++ b/resources/views/projects/partials/project-show.blade.php
@@ -5,14 +5,14 @@
             <tbody>
                 <tr><td class="col-xs-3">{{ trans('project.name') }}</td><td class="col-xs-9">{{ $project->name }}</td></tr>
                 <tr><td>{{ trans('project.description') }}</td><td>{!! nl2br($project->description) !!}</td></tr>
-                <tr><td>{{ trans('project.proposal_date') }}</td><td>{{ dateId($project->proposal_date) }}</td></tr>
+                <tr><td>{{ trans('project.proposal_date') }}</td><td>{{ date_id($project->proposal_date) }}</td></tr>
                 @can('see-pricings', $project)
                 <tr><td>{{ trans('project.proposal_value') }}</td><td class="text-right">{{ formatRp($project->proposal_value) }}</td></tr>
                 <tr><td>{{ trans('project.project_value') }}</td><td class="text-right">{{ formatRp($project->project_value) }}</td></tr>
                 @endcan
-                <tr><td>{{ trans('project.start_date') }}</td><td>{{ dateId($project->start_date) }}</td></tr>
-                <tr><td>{{ trans('project.end_date') }}</td><td>{{ dateId($project->end_date) }}</td></tr>
-                <tr><td>{{ trans('project.due_date') }}</td><td>{{ dateId($project->due_date) }}</td></tr>
+                <tr><td>{{ trans('project.start_date') }}</td><td>{{ date_id($project->start_date) }}</td></tr>
+                <tr><td>{{ trans('project.end_date') }}</td><td>{{ date_id($project->end_date) }}</td></tr>
+                <tr><td>{{ trans('project.due_date') }}</td><td>{{ date_id($project->due_date) }}</td></tr>
                 <tr><td>{{ trans('app.status') }}</td><td>{{ $project->present()->status }}</td></tr>
                 <tr>
                     <td>{{ trans('project.customer') }}</td>
diff --git a/resources/views/projects/subscriptions.blade.php b/resources/views/projects/subscriptions.blade.php
index 021411f..a74418e 100755
--- a/resources/views/projects/subscriptions.blade.php
+++ b/resources/views/projects/subscriptions.blade.php
@@ -31,8 +31,8 @@
             <td>{{ 1 + $key }}</td>
             <td class="text-center">{{ $subscription->type }}</td>
             <td>{{ $subscription->nameLink() }}</td>
-            <td class="text-right">{{ dateId($subscription->start_date) }}</td>
-            <td class="text-right">{{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
+            <td class="text-right">{{ date_id($subscription->start_date) }}</td>
+            <td class="text-right">{{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
             <td class="text-right">{{ formatRp($subscription->price) }}</td>
             <td>
                 {!! link_to_route('subscriptions.show',trans('app.show'),[$subscription->id],['class'=>'btn btn-info btn-xs']) !!}
diff --git a/resources/views/reports/payments/daily.blade.php b/resources/views/reports/payments/daily.blade.php
index 7850f52..89a9809 100755
--- a/resources/views/reports/payments/daily.blade.php
+++ b/resources/views/reports/payments/daily.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.app')
 
-@section('title', __('report.daily', ['date' => dateId($date)]))
+@section('title', __('report.daily', ['date' => date_id($date)]))
 
 @section('content')
 
diff --git a/resources/views/reports/payments/monthly.blade.php b/resources/views/reports/payments/monthly.blade.php
index 201e907..7345caa 100755
--- a/resources/views/reports/payments/monthly.blade.php
+++ b/resources/views/reports/payments/monthly.blade.php
@@ -48,7 +48,7 @@
                 @endphp
                 @if ($any)
                     <tr>
-                        <td class="text-center">{{ dateId($date = $year.'-'.$month.'-'.$dateNumber) }}</td>
+                        <td class="text-center">{{ date_id($date = $year.'-'.$month.'-'.$dateNumber) }}</td>
                         <td class="text-center">{{ $count }}</td>
                         <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashin : 0) }}</td>
                         <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashout : 0) }}</td>
@@ -60,7 +60,7 @@
                                 ['date' => $date],
                                 [
                                     'class' => 'btn btn-info btn-xs',
-                                    'title' => __('report.daily', ['date' => dateId($date)]),
+                                    'title' => __('report.daily', ['date' => date_id($date)]),
                                 ]
                             ) }}
                         </td>
diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php
index e93be92..7f077c5 100755
--- a/resources/views/subscriptions/index.blade.php
+++ b/resources/views/subscriptions/index.blade.php
@@ -34,7 +34,7 @@
             <td class="text-center">{!! $subscription->type_label !!}</td>
             <td>{{ $subscription->customer->name }}</td>
             <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
-                {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
+                {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
             </td>
             <td class="text-right">{{ formatRp($subscription->price) }}</td>
             <td>{{ $subscription->vendor->name }}</td>
diff --git a/resources/views/subscriptions/partials/subscription-show.blade.php b/resources/views/subscriptions/partials/subscription-show.blade.php
index 8234b9c..89c6866 100644
--- a/resources/views/subscriptions/partials/subscription-show.blade.php
+++ b/resources/views/subscriptions/partials/subscription-show.blade.php
@@ -3,8 +3,8 @@
         <tr><td>{{ trans('subscription.name') }}</td><td>{{ $subscription->name }}</td></tr>
         <tr><td>{{ trans('subscription.price') }}</td><td>{{ formatRp($subscription->price) }}</td></tr>
         <tr><td>{{ trans('subscription.type') }}</td><td>{{ $subscription->type }}</td></tr>
-        <tr><td>{{ trans('subscription.start_date') }}</td><td>{{ dateId($subscription->start_date) }}</td></tr>
-        <tr><td>{{ trans('subscription.due_date') }}</td><td>{{ dateId($subscription->due_date) }}</td></tr>
+        <tr><td>{{ trans('subscription.start_date') }}</td><td>{{ date_id($subscription->start_date) }}</td></tr>
+        <tr><td>{{ trans('subscription.due_date') }}</td><td>{{ date_id($subscription->due_date) }}</td></tr>
         <tr><td>{{ trans('subscription.customer') }}</td><td>{{ $subscription->customer->nameLink() }}</td></tr>
         <tr>
             <td>{{ trans('subscription.project') }}</td>
diff --git a/tests/Feature/ManageSubscriptionsTest.php b/tests/Feature/ManageSubscriptionsTest.php
index 96e4683..69ebaf6 100644
--- a/tests/Feature/ManageSubscriptionsTest.php
+++ b/tests/Feature/ManageSubscriptionsTest.php
@@ -112,7 +112,7 @@ class ManageSubscriptionsTest extends TestCase
 
         $this->see($subscription->name);
         $this->see(formatRp($subscription->price));
-        $this->see(dateId($subscription->start_date));
-        $this->see(dateId($subscription->due_date));
+        $this->see(date_id($subscription->start_date));
+        $this->see(date_id($subscription->due_date));
     }
 }
diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php
index af0f041..3d2c17a 100644
--- a/tests/Unit/Models/SubscriptionTest.php
+++ b/tests/Unit/Models/SubscriptionTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Models;
 
 use Carbon\Carbon;
-use Tests\TestCase as TestCase;
+use Tests\TestCase;
 use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
@@ -69,8 +69,8 @@ class SubscriptionTest extends TestCase
         $next3Months = Carbon::now()->addMonths(2)->format('Y-m-d');
         $subscription = factory(Subscription::class)->make(['due_date' => $next3Months]);
 
-        $dueDateDescription = trans('subscription.start_date').' : '.dateId($subscription->start_date)."\n";
-        $dueDateDescription .= trans('subscription.due_date').' : '.dateId($subscription->due_date);
+        $dueDateDescription = trans('subscription.start_date').' : '.date_id($subscription->start_date)."\n";
+        $dueDateDescription .= trans('subscription.due_date').' : '.date_id($subscription->due_date);
 
         $this->assertEquals($dueDateDescription, $subscription->dueDateDescription());
     }

From a22146bc35b4b71d932eca05a28f46807f41f6fc Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 20:38:43 +0800
Subject: [PATCH 006/113] Remove unused helper function

---
 app/helpers.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index e9632d9..af0f591 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -43,29 +43,6 @@ function formatDecimal($number)
 }
 
 /**
- * Format date in indonesian format dd-mm-yyyy.
- *
- * @param  string  $date
- * @return string
- */
-function formatDate($date)
-{
-    if (!$date || $date == '0000-00-00') {
-        return;
-    }
-
-    $explodedDate = explode('-', $date);
-
-    if (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[0], $explodedDate[2])) {
-        return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0];
-    } elseif (count($explodedDate) == 3 && checkdate($explodedDate[1], $explodedDate[2], $explodedDate[0])) {
-        return $explodedDate[2].'-'.$explodedDate[1].'-'.$explodedDate[0];
-    }
-
-    throw new App\Exceptions\InvalidDateException('Invalid date format.');
-}
-
-/**
  * Get Indonesian date format.
  *
  * @param  string  $date

From 1380bc523cef0e250914e0821da211f276104e1e Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 20:58:10 +0800
Subject: [PATCH 007/113] Change formatDecimal() to format_decimal()

---
 app/helpers.php                                              | 2 +-
 resources/views/jobs/partials/job-show.blade.php             | 2 +-
 resources/views/jobs/partials/job-tasks.blade.php            | 2 +-
 resources/views/jobs/unfinished.blade.php                    | 4 ++--
 resources/views/projects/index.blade.php                     | 2 +-
 resources/views/projects/jobs/index.blade.php                | 6 +++---
 resources/views/projects/jobs/progress-export-html.blade.php | 4 ++--
 resources/views/projects/partials/project-stats.blade.php    | 2 +-
 resources/views/users/jobs.blade.php                         | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index af0f591..cb40161 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -37,7 +37,7 @@ function formatRp($number)
  * @param  int|string  $number
  * @return string
  */
-function formatDecimal($number)
+function format_decimal($number)
 {
     return number_format($number, 2, ',', '.');
 }
diff --git a/resources/views/jobs/partials/job-show.blade.php b/resources/views/jobs/partials/job-show.blade.php
index 36b993c..3574e19 100644
--- a/resources/views/jobs/partials/job-show.blade.php
+++ b/resources/views/jobs/partials/job-show.blade.php
@@ -7,7 +7,7 @@
             @can('see-pricings', $job)
             <tr><th>{{ __('job.price') }}</th><td>{{ formatRp($job->price) }}</td></tr>
             @endcan
-            <tr><th>{{ __('job.progress') }}</th><td>{{ formatDecimal($job->progress) }}%</td></tr>
+            <tr><th>{{ __('job.progress') }}</th><td>{{ format_decimal($job->progress) }}%</td></tr>
             <tr><th>{{ __('job.worker') }}</th><td>{{ $job->worker->name }}</td></tr>
             <tr><th>{{ __('time.updated_at') }}</th><td>{{ $job->updated_at }}</td></tr>
             <tr><th>{{ __('job.description') }}</th><td>{!! nl2br($job->description) !!}</td></tr>
diff --git a/resources/views/jobs/partials/job-tasks.blade.php b/resources/views/jobs/partials/job-tasks.blade.php
index ea906d0..20fe1d1 100644
--- a/resources/views/jobs/partials/job-tasks.blade.php
+++ b/resources/views/jobs/partials/job-tasks.blade.php
@@ -66,7 +66,7 @@
         <tfoot>
             <tr>
                 <th class="text-right" colspan="2">{{ __('app.total') }}</th>
-                <th class="text-center">{{ formatDecimal($job->tasks->avg('progress')) }} %</th>
+                <th class="text-center">{{ format_decimal($job->tasks->avg('progress')) }} %</th>
                 <th>
                     @if (request('action') == 'sort_tasks')
                         {{ link_to_route('jobs.show', __('app.done'), [$job], ['class' => 'btn btn-default btn-xs pull-right']) }}
diff --git a/resources/views/jobs/unfinished.blade.php b/resources/views/jobs/unfinished.blade.php
index 74dfcae..1f4d86f 100755
--- a/resources/views/jobs/unfinished.blade.php
+++ b/resources/views/jobs/unfinished.blade.php
@@ -46,7 +46,7 @@
                     @endif
                 </td>
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
-                <td class="text-center">{{ formatDecimal($job->progress) }} %</td>
+                <td class="text-center">{{ format_decimal($job->progress) }} %</td>
                 @can('see-pricings', $job)
                 <td class="text-right">{{ formatRp($job->price) }}</td>
                 @endcan
@@ -63,7 +63,7 @@
             <tr>
                 <th class="text-right" colspan="3">{{ __('app.total') }}</th>
                 <th class="text-center">{{ $jobs->sum('tasks_count') }}</th>
-                <th class="text-center">{{ formatDecimal($jobs->avg('progress')) }} %</th>
+                <th class="text-center">{{ format_decimal($jobs->avg('progress')) }} %</th>
                 @can('see-pricings', new App\Entities\Projects\Job)
                 <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
                 @endcan
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index f5027bd..7b7aa6a 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -44,7 +44,7 @@
                 <td class="text-center">{{ $project->start_date }}</td>
                 <td class="text-right">{{ $project->work_duration }}</td>
                 @if (request('status_id') == 2)
-                <td class="text-right">{{ formatDecimal($project->getJobOveralProgress()) }} %</td>
+                <td class="text-right">{{ format_decimal($project->getJobOveralProgress()) }} %</td>
                 <td class="text-center">{{ $project->due_date }}</td>
                 @endif
                 @can('see-pricings', new App\Entities\Projects\Project)
diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php
index 9435629..0b724b6 100755
--- a/resources/views/projects/jobs/index.blade.php
+++ b/resources/views/projects/jobs/index.blade.php
@@ -82,7 +82,7 @@
                     @endif
                 </td>
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
-                <td class="text-center">{{ formatDecimal($job->progress) }} %</td>
+                <td class="text-center">{{ format_decimal($job->progress) }} %</td>
                 @can('see-pricings', $job)
                 <td class="text-right">{{ formatRp($job->price) }}</td>
                 @endcan
@@ -108,8 +108,8 @@
                 <th class="text-right" colspan="2">Total</th>
                 <th class="text-center">{{ $groupedJobs->sum('tasks_count') }}</th>
                 <th class="text-center">
-                    <span title="Total Progress">{{ formatDecimal($groupedJobs->sum('progress') / $groupedJobs->count()) }} %</span>
-                    <span title="Overal Progress" style="font-weight:300">({{ formatDecimal($project->getJobOveralProgress()) }} %)</span>
+                    <span title="Total Progress">{{ format_decimal($groupedJobs->sum('progress') / $groupedJobs->count()) }} %</span>
+                    <span title="Overal Progress" style="font-weight:300">({{ format_decimal($project->getJobOveralProgress()) }} %)</span>
                 </th>
                 @can('see-pricings', new App\Entities\Projects\Job)
                 <th class="text-right">{{ formatRp($groupedJobs->sum('price')) }}</th>
diff --git a/resources/views/projects/jobs/progress-export-html.blade.php b/resources/views/projects/jobs/progress-export-html.blade.php
index cb7aa38..f1c78fa 100755
--- a/resources/views/projects/jobs/progress-export-html.blade.php
+++ b/resources/views/projects/jobs/progress-export-html.blade.php
@@ -31,7 +31,7 @@
                     <td class="text-center">{{ 1 + $key }}</td>
                     <td>{{ $job->name }}</td>
                     <td class="text-right">{{ formatRp($job->price) }}</td>
-                    <td class="text-right">{{ formatDecimal($job->progress) }} %</td>
+                    <td class="text-right">{{ format_decimal($job->progress) }} %</td>
                     <td class="text-right">{{ formatRp($job->receiveable_earning) }}</td>
                 </tr>
                 @endforeach
@@ -40,7 +40,7 @@
                 <tr>
                     <th class="text-right" colspan="2">{{ __('app.total') }}</th>
                     <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
-                    <th class="text-right">{{ formatDecimal($project->getJobOveralProgress()) }} %</th>
+                    <th class="text-right">{{ format_decimal($project->getJobOveralProgress()) }} %</th>
                     <th class="text-right">{{ formatRp($jobs->sum('receiveable_earning')) }}</th>
                 </tr>
             </tfoot>
diff --git a/resources/views/projects/partials/project-stats.blade.php b/resources/views/projects/partials/project-stats.blade.php
index 16a52b3..75194b6 100644
--- a/resources/views/projects/partials/project-stats.blade.php
+++ b/resources/views/projects/partials/project-stats.blade.php
@@ -6,7 +6,7 @@
                 <div class="row">
                     <div class="col-xs-3"><i class="fa fa-tasks fa-4x"></i></div>
                     <div class="col-xs-9 text-right">
-                        <div class="huge" style="font-size: 38px;">{{ formatDecimal($project->getJobOveralProgress()) }} %</div>
+                        <div class="huge" style="font-size: 38px;">{{ format_decimal($project->getJobOveralProgress()) }} %</div>
                         <div class="lead">{{ __('project.overall_progress') }}</div>
                     </div>
                 </div>
diff --git a/resources/views/users/jobs.blade.php b/resources/views/users/jobs.blade.php
index 6a2f113..e61b9e2 100755
--- a/resources/views/users/jobs.blade.php
+++ b/resources/views/users/jobs.blade.php
@@ -33,7 +33,7 @@
                     @endif
                 </td>
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
-                <td class="text-center">{{ formatDecimal($job->progress = $job->progress) }} %</td>
+                <td class="text-center">{{ format_decimal($job->progress = $job->progress) }} %</td>
                 <td class="text-right">{{ formatRp($job->price) }}</td>
                 <td class="text-center">
                     {!! html_link_to_route('jobs.show', '', [$job], [

From bf7c359ab14801fa017ba1421c7a0da628ba036a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 21:03:19 +0800
Subject: [PATCH 008/113] Change from formatRp() to format_money()

---
 app/Entities/Payments/PaymentPresenter.php               |  2 +-
 app/helpers.php                                          |  3 ++-
 resources/views/customers/invoices.blade.php             |  4 ++--
 resources/views/customers/payments.blade.php             |  2 +-
 resources/views/customers/projects.blade.php             |  2 +-
 resources/views/customers/subscriptions.blade.php        |  2 +-
 .../invoice-drafts/partials/draft-confirm.blade.php      |  6 +++---
 .../invoice-drafts/partials/draft-item-list.blade.php    |  2 +-
 resources/views/invoices/index.blade.php                 |  4 ++--
 resources/views/invoices/partials/detail.blade.php       |  2 +-
 resources/views/invoices/partials/item-list.blade.php    |  2 +-
 resources/views/invoices/pdf.blade.php                   |  8 ++++----
 resources/views/invoices/show.blade.php                  |  8 ++++----
 resources/views/jobs/partials/job-show.blade.php         |  2 +-
 resources/views/jobs/unfinished.blade.php                |  4 ++--
 resources/views/options/page-1.blade.php                 |  2 +-
 resources/views/pages/home.blade.php                     |  6 +++---
 resources/views/payments/pdf.blade.php                   |  2 +-
 resources/views/projects/index.blade.php                 |  2 +-
 resources/views/projects/invoices.blade.php              |  4 ++--
 resources/views/projects/jobs/export-html.blade.php      |  4 ++--
 resources/views/projects/jobs/index.blade.php            |  4 ++--
 .../views/projects/jobs/progress-export-html.blade.php   |  8 ++++----
 .../views/projects/partials/payment-summary.blade.php    | 16 ++++++++--------
 resources/views/projects/partials/project-show.blade.php |  4 ++--
 .../views/projects/partials/project-stats.blade.php      |  2 +-
 resources/views/projects/payments.blade.php              |  4 ++--
 resources/views/projects/subscriptions.blade.php         |  2 +-
 resources/views/reports/current-credits.blade.php        |  8 ++++----
 resources/views/reports/payments/daily.blade.php         |  2 +-
 resources/views/reports/payments/monthly.blade.php       | 12 ++++++------
 resources/views/reports/payments/yearly.blade.php        | 12 ++++++------
 resources/views/subscriptions/index.blade.php            |  2 +-
 .../subscriptions/partials/subscription-show.blade.php   |  2 +-
 resources/views/users/jobs.blade.php                     |  2 +-
 resources/views/users/projects.blade.php                 |  2 +-
 resources/views/vendors/show.blade.php                   |  4 ++--
 tests/Feature/Invoices/InvoiceEntryTest.php              |  6 +++---
 tests/Feature/ManageJobsTest.php                         |  2 +-
 tests/Feature/ManageSubscriptionsTest.php                |  2 +-
 tests/Feature/Payments/ManagePaymentsTest.php            |  2 +-
 tests/Unit/Helpers/MoneyFormatTest.php                   | 12 ++++++------
 42 files changed, 92 insertions(+), 91 deletions(-)

diff --git a/app/Entities/Payments/PaymentPresenter.php b/app/Entities/Payments/PaymentPresenter.php
index c086fe4..25a13d4 100644
--- a/app/Entities/Payments/PaymentPresenter.php
+++ b/app/Entities/Payments/PaymentPresenter.php
@@ -8,7 +8,7 @@ class PaymentPresenter extends Presenter
 {
     public function amount()
     {
-        return $this->entity->in_out == 0 ? formatRp(-$this->entity->amount) : formatRp($this->entity->amount);
+        return $this->entity->in_out == 0 ? format_money(-$this->entity->amount) : format_money($this->entity->amount);
     }
 
     public function projectLink()
diff --git a/app/helpers.php b/app/helpers.php
index cb40161..6894fa1 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -13,10 +13,11 @@ function formatNo($number)
 
 /**
  * Get number in money currency format.
+ *
  * @param  int|string  $number
  * @return string
  */
-function formatRp($number)
+function format_money($number)
 {
     $moneySign = Option::get('money_sign', 'Rp.');
 
diff --git a/resources/views/customers/invoices.blade.php b/resources/views/customers/invoices.blade.php
index b866f81..f92b869 100755
--- a/resources/views/customers/invoices.blade.php
+++ b/resources/views/customers/invoices.blade.php
@@ -22,7 +22,7 @@
                 <td class="text-center">{{ $invoice->created_at->format('Y-m-d') }}</td>
                 <td>{{ $invoice->project->nameLink() }}</td>
                 <td>{{ $invoice->project->customer->nameLink() }}</td>
-                <td class="text-right">{{ formatRp($invoice->amount) }}</td>
+                <td class="text-right">{{ format_money($invoice->amount) }}</td>
                 <td class="text-center">
                     {!! html_link_to_route(
                         'invoices.show', '', [$invoice->number],
@@ -49,7 +49,7 @@
         <tfoot>
             <tr>
                 <th colspan="5" class="text-right">{{ trans('app.total') }}</th>
-                <th class="text-right">{{ formatRp($invoices->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money($invoices->sum('amount')) }}</th>
                 <th></th>
             </tr>
         </tfoot>
diff --git a/resources/views/customers/payments.blade.php b/resources/views/customers/payments.blade.php
index 38364f8..66a584d 100755
--- a/resources/views/customers/payments.blade.php
+++ b/resources/views/customers/payments.blade.php
@@ -42,7 +42,7 @@
         <tfoot>
             <tr>
                 <th colspan="4" class="text-right">{{ __('app.total') }}</th>
-                <th class="text-right">{{ formatRp($payments->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money($payments->sum('amount')) }}</th>
                 <th colspan="2">&nbsp;</th>
             </tr>
         </tfoot>
diff --git a/resources/views/customers/projects.blade.php b/resources/views/customers/projects.blade.php
index c426a79..c7eaa7b 100755
--- a/resources/views/customers/projects.blade.php
+++ b/resources/views/customers/projects.blade.php
@@ -21,7 +21,7 @@
                 <td>{{ $project->nameLink() }}</td>
                 <td class="text-center">{{ $project->start_date }}</td>
                 <td class="text-right">{{ $project->work_duration }}</td>
-                <td class="text-right">{{ formatRp($project->project_value) }}</td>
+                <td class="text-right">{{ format_money($project->project_value) }}</td>
                 <td class="text-center">{{ $project->present()->status }}</td>
                 <td class="text-center">
                     {!! html_link_to_route('projects.show', '', [$project->id], ['icon' => 'search', 'class' => 'btn btn-info btn-xs', 'title' => trans('app.show')]) !!}
diff --git a/resources/views/customers/subscriptions.blade.php b/resources/views/customers/subscriptions.blade.php
index bc35479..96271c9 100755
--- a/resources/views/customers/subscriptions.blade.php
+++ b/resources/views/customers/subscriptions.blade.php
@@ -26,7 +26,7 @@
                 <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
                     {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
                 </td>
-                <td class="text-right">{{ formatRp($subscription->price) }}</td>
+                <td class="text-right">{{ format_money($subscription->price) }}</td>
                 <td>{{ $subscription->vendor->name }}</td>
                 <td class="text-center">{{ $subscription->status() }}</td>
             </tr>
diff --git a/resources/views/invoice-drafts/partials/draft-confirm.blade.php b/resources/views/invoice-drafts/partials/draft-confirm.blade.php
index a8fbef3..eaef2f7 100644
--- a/resources/views/invoice-drafts/partials/draft-confirm.blade.php
+++ b/resources/views/invoice-drafts/partials/draft-confirm.blade.php
@@ -18,7 +18,7 @@
                     <tr><td>{{ trans('invoice.due_date') }}</td><td>{{ $draft->dueDate }}</td></tr>
                     <tr>
                         <td>{{ trans('invoice.total') }}</td>
-                        <th class="text-right lead">{{ formatRp($draft->getTotal()) }}</th>
+                        <th class="text-right lead">{{ format_money($draft->getTotal()) }}</th>
                     </tr>
                     <tr><td>{{ trans('invoice.notes') }}</td><td>{{ $draft->notes }}</td></tr>
                 </tbody>
@@ -48,7 +48,7 @@
                         <tr>
                             <td width="5%">{{ $key + 1 }}</td>
                             <td width="70%">{!! nl2br($item->description) !!}</td>
-                            <td width="25%" class="text-right">{{ formatRp($item->amount) }}</td>
+                            <td width="25%" class="text-right">{{ format_money($item->amount) }}</td>
                         </tr>
                         @empty
                         @endforelse
@@ -56,7 +56,7 @@
                     <tfoot>
                         <tr>
                             <th colspan="2" class="text-right">{{ trans('invoice.total') }} :</th>
-                            <th class="text-right">{{ formatRp($draft->getTotal()) }}</th>
+                            <th class="text-right">{{ format_money($draft->getTotal()) }}</th>
                         </tr>
                     </tfoot>
                 </table>
diff --git a/resources/views/invoice-drafts/partials/draft-item-list.blade.php b/resources/views/invoice-drafts/partials/draft-item-list.blade.php
index 65f8217..eadf7f5 100644
--- a/resources/views/invoice-drafts/partials/draft-item-list.blade.php
+++ b/resources/views/invoice-drafts/partials/draft-item-list.blade.php
@@ -51,7 +51,7 @@
             @endforeach
             <tr>
                 <th colspan="2" class="text-right">{{ trans('invoice.amount') }} :</th>
-                <th class="text-right">{{ formatRp($draft->getTotal()) }}</th>
+                <th class="text-right">{{ format_money($draft->getTotal()) }}</th>
                 <th>&nbsp;</th>
             </tr>
             <tr>
diff --git a/resources/views/invoices/index.blade.php b/resources/views/invoices/index.blade.php
index b6c6f95..7a48368 100755
--- a/resources/views/invoices/index.blade.php
+++ b/resources/views/invoices/index.blade.php
@@ -34,7 +34,7 @@
                 <td class="text-center">{{ $invoice->created_at->format('Y-m-d') }}</td>
                 <td>{{ $invoice->project->nameLink() }}</td>
                 <td>{{ $invoice->project->customer->nameLink() }}</td>
-                <td class="text-right">{{ formatRp($invoice->amount) }}</td>
+                <td class="text-right">{{ format_money($invoice->amount) }}</td>
                 <td class="text-center">
                     {!! html_link_to_route(
                         'invoices.show', '', [$invoice->number],
@@ -61,7 +61,7 @@
         <tfoot>
             <tr>
                 <th colspan="5" class="text-right">{{ trans('app.total') }}</th>
-                <th class="text-right">{{ formatRp($invoices->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money($invoices->sum('amount')) }}</th>
                 <th>&nbsp;</th>
             </tr>
         </tfoot>
diff --git a/resources/views/invoices/partials/detail.blade.php b/resources/views/invoices/partials/detail.blade.php
index eed4668..d613565 100644
--- a/resources/views/invoices/partials/detail.blade.php
+++ b/resources/views/invoices/partials/detail.blade.php
@@ -7,6 +7,6 @@
         <tr><th>{{ trans('invoice.customer') }}</th><td>{{ $invoice->project->customer->nameLink() }}</td></tr>
         <tr><th>{{ trans('invoice.items_count') }}</th><td>{{ $invoice->items_count }}</td></tr>
         <tr><th>{{ trans('invoice.creator') }}</th><td>{{ $invoice->creator->name }}</td></tr>
-        <tr><th>{{ trans('invoice.amount') }}</th><td class="text-right lead">{{ formatRp($invoice->amount) }}</td></tr>
+        <tr><th>{{ trans('invoice.amount') }}</th><td class="text-right lead">{{ format_money($invoice->amount) }}</td></tr>
     </tbody>
 </table>
diff --git a/resources/views/invoices/partials/item-list.blade.php b/resources/views/invoices/partials/item-list.blade.php
index 7834873..5f3d09d 100644
--- a/resources/views/invoices/partials/item-list.blade.php
+++ b/resources/views/invoices/partials/item-list.blade.php
@@ -77,7 +77,7 @@
         <tfoot>
             <tr>
                 <th colspan="2" class="text-right">{{ trans('invoice.amount') }} :</th>
-                <th class="text-right">{{ formatRp(collect($invoice->items)->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money(collect($invoice->items)->sum('amount')) }}</th>
                 <th></th>
             </tr>
         </tfoot>
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index 30b9003..004a517 100755
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -114,7 +114,7 @@
                             <tr>
                                 <td class="text-center text-top">{{ 1 + $key }}</td>
                                 <td>{!! nl2br($item['description']) !!}</td>
-                                <td class="text-right text-top">{{ formatRp($item['amount']) }}</td>
+                                <td class="text-right text-top">{{ format_money($item['amount']) }}</td>
                             </tr>
                             @php
                                 $subtotal += $item['amount'];
@@ -123,19 +123,19 @@
                         @if ($invoice->discount)
                         <tr>
                             <th colspan="2" class="text-right">{{ __('invoice.subtotal') }} :</th>
-                            <th class="text-right">{{ formatRp($subtotal) }}</th>
+                            <th class="text-right">{{ format_money($subtotal) }}</th>
                         </tr>
                         <tr>
                             <td colspan="2" class="text-right">
                                 <strong>{{ __('invoice.discount') }}</strong>
                                 {{ $invoice->discount_notes ? '('.$invoice->discount_notes.')': '' }} :
                             </td>
-                            <th class="text-right">- {{ formatRp($invoice->discount) }}</th>
+                            <th class="text-right">- {{ format_money($invoice->discount) }}</th>
                         </tr>
                         @endif
                         <tr>
                             <th colspan="2" class="text-right">{{ __('app.total') }}</th>
-                            <th colspan="2" class="text-right">{{ formatRp($invoice->amount) }}</th>
+                            <th colspan="2" class="text-right">{{ format_money($invoice->amount) }}</th>
                         </tr>
                     </tbody>
                 </table>
diff --git a/resources/views/invoices/show.blade.php b/resources/views/invoices/show.blade.php
index d0737b5..f96b3fc 100644
--- a/resources/views/invoices/show.blade.php
+++ b/resources/views/invoices/show.blade.php
@@ -39,7 +39,7 @@
                         <tr>
                             <td>{{ $key + 1 }}</td>
                             <td>{!! nl2br($item['description']) !!}</td>
-                            <td class="text-right">{{ formatRp($item['amount']) }}</td>
+                            <td class="text-right">{{ format_money($item['amount']) }}</td>
                         </tr>
                         @php
                             $subtotal += $item['amount'];
@@ -50,19 +50,19 @@
                         @if ($invoice->discount)
                         <tr>
                             <th colspan="2" class="text-right">{{ __('invoice.subtotal') }} :</th>
-                            <th class="text-right">{{ formatRp($subtotal) }}</th>
+                            <th class="text-right">{{ format_money($subtotal) }}</th>
                         </tr>
                         <tr>
                             <td colspan="2" class="text-right">
                                 <strong>{{ __('invoice.discount') }}</strong>
                                 {{ $invoice->discount_notes ? '('.$invoice->discount_notes.')': '' }} :
                             </td>
-                            <th class="text-right">- {{ formatRp($invoice->discount) }}</th>
+                            <th class="text-right">- {{ format_money($invoice->discount) }}</th>
                         </tr>
                         @endif
                         <tr>
                             <th colspan="2" class="text-right">{{ trans('app.total') }} :</th>
-                            <th class="text-right">{{ formatRp($invoice->amount) }}</th>
+                            <th class="text-right">{{ format_money($invoice->amount) }}</th>
                         </tr>
                     </tfoot>
                 </table>
diff --git a/resources/views/jobs/partials/job-show.blade.php b/resources/views/jobs/partials/job-show.blade.php
index 3574e19..8f983a7 100644
--- a/resources/views/jobs/partials/job-show.blade.php
+++ b/resources/views/jobs/partials/job-show.blade.php
@@ -5,7 +5,7 @@
             <tr><th class="col-md-4">{{ __('job.name') }}</th><td class="col-md-8">{{ $job->name }}</td></tr>
             <tr><th>{{ __('job.type') }}</th><td>{{ $job->type() }}</td></tr>
             @can('see-pricings', $job)
-            <tr><th>{{ __('job.price') }}</th><td>{{ formatRp($job->price) }}</td></tr>
+            <tr><th>{{ __('job.price') }}</th><td>{{ format_money($job->price) }}</td></tr>
             @endcan
             <tr><th>{{ __('job.progress') }}</th><td>{{ format_decimal($job->progress) }}%</td></tr>
             <tr><th>{{ __('job.worker') }}</th><td>{{ $job->worker->name }}</td></tr>
diff --git a/resources/views/jobs/unfinished.blade.php b/resources/views/jobs/unfinished.blade.php
index 1f4d86f..8d31f01 100755
--- a/resources/views/jobs/unfinished.blade.php
+++ b/resources/views/jobs/unfinished.blade.php
@@ -48,7 +48,7 @@
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
                 <td class="text-center">{{ format_decimal($job->progress) }} %</td>
                 @can('see-pricings', $job)
-                <td class="text-right">{{ formatRp($job->price) }}</td>
+                <td class="text-right">{{ format_money($job->price) }}</td>
                 @endcan
                 <td>{{ $job->worker->name }}</td>
                 <td>
@@ -65,7 +65,7 @@
                 <th class="text-center">{{ $jobs->sum('tasks_count') }}</th>
                 <th class="text-center">{{ format_decimal($jobs->avg('progress')) }} %</th>
                 @can('see-pricings', new App\Entities\Projects\Job)
-                <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
+                <th class="text-right">{{ format_money($jobs->sum('price')) }}</th>
                 @endcan
                 <th colspan="2"></th>
             </tr>
diff --git a/resources/views/options/page-1.blade.php b/resources/views/options/page-1.blade.php
index 6d0a1b8..58729c9 100755
--- a/resources/views/options/page-1.blade.php
+++ b/resources/views/options/page-1.blade.php
@@ -17,7 +17,7 @@
                             ['class' => 'form-control', 'maxlength' => 3]
                         ) }}
                         <span class="text-info small">
-                            Money sign like : <strong>{{ formatRp('9900') }}</strong><br>(Max 3 characters)
+                            Money sign like : <strong>{{ format_money('9900') }}</strong><br>(Max 3 characters)
                         </span>
                     </td>
                 </tr>
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 6bdbf4a..8f930d4 100755
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -32,13 +32,13 @@
                 </tr>
                 <tr>
                     <td class="text-center text-primary lead" style="border-top: none;">
-                        {{ $totalEarnings = formatRp(AdminDashboard::totalEarnings($queriedYear)) }}
+                        {{ $totalEarnings = format_money(AdminDashboard::totalEarnings($queriedYear)) }}
                     </td>
                     <td class="text-center text-primary lead" style="border-top: none;">
                         {{ $totalFinishedProjects = AdminDashboard::totalFinishedProjects($queriedYear) }} Projects
                     </td>
                     <td class="text-center text-primary lead" style="border-top: none;">
-                        {{ $currentOutstandingCustomerPayment = formatRp(AdminDashboard::currentOutstandingCustomerPayment($queriedYear)) }}
+                        {{ $currentOutstandingCustomerPayment = format_money(AdminDashboard::currentOutstandingCustomerPayment($queriedYear)) }}
                     </td>
                 </tr>
             </table>
@@ -73,7 +73,7 @@
                 <tr>
                     <td>{{ $subscription->nameLink() }}</td>
                     <td>{{ $subscription->customer->name }}</td>
-                    <td class="text-right">{{ formatRp($subscription->price) }}</td>
+                    <td class="text-right">{{ format_money($subscription->price) }}</td>
                     <td class="text-center">
                         {{ $subscription->due_date }}
                         {!! $subscription->nearOfDueDateSign() !!}
diff --git a/resources/views/payments/pdf.blade.php b/resources/views/payments/pdf.blade.php
index 6680e20..9131635 100755
--- a/resources/views/payments/pdf.blade.php
+++ b/resources/views/payments/pdf.blade.php
@@ -69,7 +69,7 @@
             <tr>
                 <td style="font-size: 20px; font-weight: bold; text-align: center;height: 100px;vertical-align: bottom;">@lang('payment.cash_amount')</td>
                 <td style="font-size: 20px; font-weight: bold; vertical-align: bottom;">
-                {{ formatRp($payment->amount) }},-
+                {{ format_money($payment->amount) }},-
                 </td>
                 <td style="text-align: center;vertical-align: bottom;">
                     <strong>{{ auth()->user()->name }}</strong> <br>
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index 7b7aa6a..df9c6e8 100755
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -48,7 +48,7 @@
                 <td class="text-center">{{ $project->due_date }}</td>
                 @endif
                 @can('see-pricings', new App\Entities\Projects\Project)
-                <td class="text-right">{{ formatRp($project->project_value) }}</td>
+                <td class="text-right">{{ format_money($project->project_value) }}</td>
                 @endcan
                 <td class="text-center">{{ $project->present()->status }}</td>
                 <td>{{ $project->customer->name }}</td>
diff --git a/resources/views/projects/invoices.blade.php b/resources/views/projects/invoices.blade.php
index a6b12d2..7f46d50 100755
--- a/resources/views/projects/invoices.blade.php
+++ b/resources/views/projects/invoices.blade.php
@@ -40,7 +40,7 @@
                 <td class="text-center">{{ $invoice->date }}</td>
                 <td class="text-center">{{ $invoice->due_date }}</td>
                 <td>{{ $project->customer->nameLink() }}</td>
-                <td class="text-right">{{ formatRp($invoice->amount) }}</td>
+                <td class="text-right">{{ format_money($invoice->amount) }}</td>
                 <td class="text-center">
                     {!! html_link_to_route(
                         'invoices.show', '', [$invoice->number],
@@ -68,7 +68,7 @@
         <tfoot>
             <tr>
                 <th colspan="5" class="text-right">{{ trans('app.total') }}</th>
-                <th class="text-right">{{ formatRp($project->invoices->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money($project->invoices->sum('amount')) }}</th>
                 <th>&nbsp;</th>
             </tr>
         </tfoot>
diff --git a/resources/views/projects/jobs/export-html.blade.php b/resources/views/projects/jobs/export-html.blade.php
index 164d815..80bc2e1 100755
--- a/resources/views/projects/jobs/export-html.blade.php
+++ b/resources/views/projects/jobs/export-html.blade.php
@@ -52,14 +52,14 @@
                 <tr>
                     <td class="text-center">{{ 1 + $key }}</td>
                     <td>{{ $job->name }}</td>
-                    <td class="text-right">{{ formatRp($job->price) }}</td>
+                    <td class="text-right">{{ format_money($job->price) }}</td>
                 </tr>
                 @endforeach
             </tbody>
             <tfoot>
                 <tr>
                     <th class="text-right" colspan="2">Total</th>
-                    <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
+                    <th class="text-right">{{ format_money($jobs->sum('price')) }}</th>
                 </tr>
             </tfoot>
         </table>
diff --git a/resources/views/projects/jobs/index.blade.php b/resources/views/projects/jobs/index.blade.php
index 0b724b6..3e13ffb 100755
--- a/resources/views/projects/jobs/index.blade.php
+++ b/resources/views/projects/jobs/index.blade.php
@@ -84,7 +84,7 @@
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
                 <td class="text-center">{{ format_decimal($job->progress) }} %</td>
                 @can('see-pricings', $job)
-                <td class="text-right">{{ formatRp($job->price) }}</td>
+                <td class="text-right">{{ format_money($job->price) }}</td>
                 @endcan
                 <td class="text-center">
                     {{ $job->updated_at->diffForHumans() }} <br>
@@ -112,7 +112,7 @@
                     <span title="Overal Progress" style="font-weight:300">({{ format_decimal($project->getJobOveralProgress()) }} %)</span>
                 </th>
                 @can('see-pricings', new App\Entities\Projects\Job)
-                <th class="text-right">{{ formatRp($groupedJobs->sum('price')) }}</th>
+                <th class="text-right">{{ format_money($groupedJobs->sum('price')) }}</th>
                 @endcan
                 <th colspan="2">
                     @can('update', $project)
diff --git a/resources/views/projects/jobs/progress-export-html.blade.php b/resources/views/projects/jobs/progress-export-html.blade.php
index f1c78fa..7fe80fb 100755
--- a/resources/views/projects/jobs/progress-export-html.blade.php
+++ b/resources/views/projects/jobs/progress-export-html.blade.php
@@ -30,18 +30,18 @@
                 <tr>
                     <td class="text-center">{{ 1 + $key }}</td>
                     <td>{{ $job->name }}</td>
-                    <td class="text-right">{{ formatRp($job->price) }}</td>
+                    <td class="text-right">{{ format_money($job->price) }}</td>
                     <td class="text-right">{{ format_decimal($job->progress) }} %</td>
-                    <td class="text-right">{{ formatRp($job->receiveable_earning) }}</td>
+                    <td class="text-right">{{ format_money($job->receiveable_earning) }}</td>
                 </tr>
                 @endforeach
             </tbody>
             <tfoot>
                 <tr>
                     <th class="text-right" colspan="2">{{ __('app.total') }}</th>
-                    <th class="text-right">{{ formatRp($jobs->sum('price')) }}</th>
+                    <th class="text-right">{{ format_money($jobs->sum('price')) }}</th>
                     <th class="text-right">{{ format_decimal($project->getJobOveralProgress()) }} %</th>
-                    <th class="text-right">{{ formatRp($jobs->sum('receiveable_earning')) }}</th>
+                    <th class="text-right">{{ format_money($jobs->sum('receiveable_earning')) }}</th>
                 </tr>
             </tfoot>
         </table>
diff --git a/resources/views/projects/partials/payment-summary.blade.php b/resources/views/projects/partials/payment-summary.blade.php
index 8c4f410..1733a78 100644
--- a/resources/views/projects/partials/payment-summary.blade.php
+++ b/resources/views/projects/partials/payment-summary.blade.php
@@ -8,19 +8,19 @@
             <td class="col-xs-2 text-center">{{ trans('project.payment_status') }}</td>
         </tr>
         <tr>
-            <td class="text-center lead" style="border-top: none;">{{ formatRp($project->project_value) }}</td>
-            <td class="text-center lead" style="border-top: none;">{{ formatRp($project->cashInTotal()) }}</td>
-            <td class="text-center lead" style="border-top: none;">{{ formatRp($project->cashOutTotal()) }}</td>
-            <td class="text-center lead" style="border-top: none;">{{ formatRp($balance = $project->project_value - $project->cashInTotal()) }}</td>
+            <td class="text-center lead" style="border-top: none;">{{ format_money($project->project_value) }}</td>
+            <td class="text-center lead" style="border-top: none;">{{ format_money($project->cashInTotal()) }}</td>
+            <td class="text-center lead" style="border-top: none;">{{ format_money($project->cashOutTotal()) }}</td>
+            <td class="text-center lead" style="border-top: none;">{{ format_money($balance = $project->project_value - $project->cashInTotal()) }}</td>
             <td class="text-center lead" style="border-top: none;">{{ $balance > 0 ? trans('project.payment_statuses.outstanding') : trans('project.payment_statuses.paid') }}</td>
         </tr>
     </table>
 </div>
 
 <ul class="list-group visible-xs">
-    <li class="list-group-item">{{ trans('project.project_value') }} <span class="pull-right">{{ formatRp($project->project_value) }}</span></li>
-    <li class="list-group-item">{{ trans('project.cash_in_total') }} <span class="pull-right">{{ formatRp($project->cashInTotal()) }}</span></li>
-    <li class="list-group-item">{{ trans('project.cash_out_total') }} <span class="pull-right">{{ formatRp($project->cashOutTotal()) }}</span></li>
-    <li class="list-group-item">{{ trans('project.payment_remaining') }} <span class="pull-right">{{ formatRp($balance = $project->project_value - $project->cashInTotal()) }}</span></li>
+    <li class="list-group-item">{{ trans('project.project_value') }} <span class="pull-right">{{ format_money($project->project_value) }}</span></li>
+    <li class="list-group-item">{{ trans('project.cash_in_total') }} <span class="pull-right">{{ format_money($project->cashInTotal()) }}</span></li>
+    <li class="list-group-item">{{ trans('project.cash_out_total') }} <span class="pull-right">{{ format_money($project->cashOutTotal()) }}</span></li>
+    <li class="list-group-item">{{ trans('project.payment_remaining') }} <span class="pull-right">{{ format_money($balance = $project->project_value - $project->cashInTotal()) }}</span></li>
     <li class="list-group-item">{{ trans('project.payment_status') }} <span class="pull-right">{{ $balance > 0 ? trans('project.payment_statuses.outstanding') : trans('project.payment_statuses.paid') }}</span></li>
 </ul>
diff --git a/resources/views/projects/partials/project-show.blade.php b/resources/views/projects/partials/project-show.blade.php
index ad8e058..a2d6ea0 100644
--- a/resources/views/projects/partials/project-show.blade.php
+++ b/resources/views/projects/partials/project-show.blade.php
@@ -7,8 +7,8 @@
                 <tr><td>{{ trans('project.description') }}</td><td>{!! nl2br($project->description) !!}</td></tr>
                 <tr><td>{{ trans('project.proposal_date') }}</td><td>{{ date_id($project->proposal_date) }}</td></tr>
                 @can('see-pricings', $project)
-                <tr><td>{{ trans('project.proposal_value') }}</td><td class="text-right">{{ formatRp($project->proposal_value) }}</td></tr>
-                <tr><td>{{ trans('project.project_value') }}</td><td class="text-right">{{ formatRp($project->project_value) }}</td></tr>
+                <tr><td>{{ trans('project.proposal_value') }}</td><td class="text-right">{{ format_money($project->proposal_value) }}</td></tr>
+                <tr><td>{{ trans('project.project_value') }}</td><td class="text-right">{{ format_money($project->project_value) }}</td></tr>
                 @endcan
                 <tr><td>{{ trans('project.start_date') }}</td><td>{{ date_id($project->start_date) }}</td></tr>
                 <tr><td>{{ trans('project.end_date') }}</td><td>{{ date_id($project->end_date) }}</td></tr>
diff --git a/resources/views/projects/partials/project-stats.blade.php b/resources/views/projects/partials/project-stats.blade.php
index 75194b6..767ab85 100644
--- a/resources/views/projects/partials/project-stats.blade.php
+++ b/resources/views/projects/partials/project-stats.blade.php
@@ -38,7 +38,7 @@
                     <div class="col-xs-12 text-right">
                         <i class="fa fa-money fa-2x pull-left"></i>
                         <div class="lead">Collectibe Earnings</div>
-                        <div class="lead" style="font-size: 30px;">{{ formatRp($project->getCollectibeEarnings()) }}</div>
+                        <div class="lead" style="font-size: 30px;">{{ format_money($project->getCollectibeEarnings()) }}</div>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php
index 923162e..59d61d0 100755
--- a/resources/views/projects/payments.blade.php
+++ b/resources/views/projects/payments.blade.php
@@ -36,7 +36,7 @@
             <tr>
                 <td class="text-center">{{ 1 + $key }}</td>
                 <td class="text-center">{{ $payment->date }}</td>
-                <td class="text-right">{{ formatRp($payment->amount) }}</td>
+                <td class="text-right">{{ format_money($payment->amount) }}</td>
                 <td>{{ $payment->partner->name }}</td>
                 <td>{{ $payment->description }} [{{ $payment->type() }}]</td>
                 <td class="text-center">
@@ -53,7 +53,7 @@
         <tfoot>
             <tr>
                 <th colspan="2" class="text-right">{{ trans('app.total') }}</th>
-                <th class="text-right">{{ formatRp($payments->sum('amount')) }}</th>
+                <th class="text-right">{{ format_money($payments->sum('amount')) }}</th>
                 <th colspan="5"></th>
             </tr>
         </tfoot>
diff --git a/resources/views/projects/subscriptions.blade.php b/resources/views/projects/subscriptions.blade.php
index a74418e..29e1e35 100755
--- a/resources/views/projects/subscriptions.blade.php
+++ b/resources/views/projects/subscriptions.blade.php
@@ -33,7 +33,7 @@
             <td>{{ $subscription->nameLink() }}</td>
             <td class="text-right">{{ date_id($subscription->start_date) }}</td>
             <td class="text-right">{{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
-            <td class="text-right">{{ formatRp($subscription->price) }}</td>
+            <td class="text-right">{{ format_money($subscription->price) }}</td>
             <td>
                 {!! link_to_route('subscriptions.show',trans('app.show'),[$subscription->id],['class'=>'btn btn-info btn-xs']) !!}
                 {!! link_to_route('subscriptions.edit',trans('app.edit'),[$subscription->id],['class'=>'btn btn-warning btn-xs']) !!}
diff --git a/resources/views/reports/current-credits.blade.php b/resources/views/reports/current-credits.blade.php
index b5bf46b..be2e2a9 100644
--- a/resources/views/reports/current-credits.blade.php
+++ b/resources/views/reports/current-credits.blade.php
@@ -23,9 +23,9 @@
         <tr>
             <td>{{ 1 + $key }}</td>
             <td>{!! link_to_route('projects.payments', $project->name, [$project->id], ['title' => __('project.view_payments'), 'target' => '_blank']) !!}</td>
-            <td class="text-right">{{ formatRp($project->project_value) }}</td>
-            <td class="text-right">{{ formatRp($project->cashInTotal()) }}</td>
-            <td class="text-right">{{ formatRp($project->balance = $project->project_value - $project->cashInTotal()) }}</td>
+            <td class="text-right">{{ format_money($project->project_value) }}</td>
+            <td class="text-right">{{ format_money($project->cashInTotal()) }}</td>
+            <td class="text-right">{{ format_money($project->balance = $project->project_value - $project->cashInTotal()) }}</td>
             <td>{{ $project->customer->name }}</td>
             <td class="text-center">{{ $project->present()->status }}</td>
         </tr>
@@ -36,7 +36,7 @@
     <tfoot>
         <tr>
             <th class="text-right" colspan="4">{{ __('app.total') }}</th>
-            <th class="text-right">{{ formatRp($projects->sum('balance')) }}</th>
+            <th class="text-right">{{ format_money($projects->sum('balance')) }}</th>
             <th colspan="3">&nbsp;</th>
         </tr>
     </tfoot>
diff --git a/resources/views/reports/payments/daily.blade.php b/resources/views/reports/payments/daily.blade.php
index 89a9809..a277da3 100755
--- a/resources/views/reports/payments/daily.blade.php
+++ b/resources/views/reports/payments/daily.blade.php
@@ -67,7 +67,7 @@
         <tfoot>
             <tr>
                 <th class="text-right" colspan="3">{{ __('app.total') }}</th>
-                <th class="text-right">{{ formatRp($total) }}</th>
+                <th class="text-right">{{ format_money($total) }}</th>
                 <th colspan="3">&nbsp;</th>
             </tr>
         </tfoot>
diff --git a/resources/views/reports/payments/monthly.blade.php b/resources/views/reports/payments/monthly.blade.php
index 7345caa..13b947e 100755
--- a/resources/views/reports/payments/monthly.blade.php
+++ b/resources/views/reports/payments/monthly.blade.php
@@ -50,9 +50,9 @@
                     <tr>
                         <td class="text-center">{{ date_id($date = $year.'-'.$month.'-'.$dateNumber) }}</td>
                         <td class="text-center">{{ $count }}</td>
-                        <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashin : 0) }}</td>
-                        <td class="text-right">{{ formatRp($any ? $reports[$dateNumber]->cashout : 0) }}</td>
-                        <td class="text-right">{{ formatRp($profit) }}</td>
+                        <td class="text-right">{{ format_money($any ? $reports[$dateNumber]->cashin : 0) }}</td>
+                        <td class="text-right">{{ format_money($any ? $reports[$dateNumber]->cashout : 0) }}</td>
+                        <td class="text-right">{{ format_money($profit) }}</td>
                         <td class="text-center">
                             {{ link_to_route(
                                 'reports.payments.daily',
@@ -75,9 +75,9 @@
                 <tr>
                     <th class="text-right">{{ __('app.total') }}</th>
                     <th class="text-center">{{ $reports->sum('count') }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('cashin')) }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('cashout')) }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('profit')) }}</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>
diff --git a/resources/views/reports/payments/yearly.blade.php b/resources/views/reports/payments/yearly.blade.php
index d9209bf..ca28dd9 100755
--- a/resources/views/reports/payments/yearly.blade.php
+++ b/resources/views/reports/payments/yearly.blade.php
@@ -44,9 +44,9 @@
                 <tr>
                     <td class="text-center">{{ month_id($monthNumber) }}</td>
                     <td class="text-center">{{ $any ? $reports[$monthNumber]->count : 0 }}</td>
-                    <td class="text-right">{{ formatRp($any ? $reports[$monthNumber]->cashin : 0) }}</td>
-                    <td class="text-right">{{ formatRp($any ? $reports[$monthNumber]->cashout : 0) }}</td>
-                    <td class="text-right">{{ formatRp($profit = $any ? $reports[$monthNumber]->profit : 0) }}</td>
+                    <td class="text-right">{{ format_money($any ? $reports[$monthNumber]->cashin : 0) }}</td>
+                    <td class="text-right">{{ format_money($any ? $reports[$monthNumber]->cashout : 0) }}</td>
+                    <td class="text-right">{{ format_money($profit = $any ? $reports[$monthNumber]->profit : 0) }}</td>
                     <td class="text-center">
                         {{ link_to_route(
                             'reports.payments.monthly',
@@ -69,9 +69,9 @@
                 <tr>
                     <th class="text-center">{{ trans('app.total') }}</th>
                     <th class="text-center">{{ $reports->sum('count') }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('cashin')) }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('cashout')) }}</th>
-                    <th class="text-right">{{ formatRp($reports->sum('profit')) }}</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>
diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php
index 7f077c5..2d0fdda 100755
--- a/resources/views/subscriptions/index.blade.php
+++ b/resources/views/subscriptions/index.blade.php
@@ -36,7 +36,7 @@
             <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
                 {{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}
             </td>
-            <td class="text-right">{{ formatRp($subscription->price) }}</td>
+            <td class="text-right">{{ format_money($subscription->price) }}</td>
             <td>{{ $subscription->vendor->name }}</td>
             <td class="text-center">{{ $subscription->status() }}</td>
         </tr>
diff --git a/resources/views/subscriptions/partials/subscription-show.blade.php b/resources/views/subscriptions/partials/subscription-show.blade.php
index 89c6866..7d4f422 100644
--- a/resources/views/subscriptions/partials/subscription-show.blade.php
+++ b/resources/views/subscriptions/partials/subscription-show.blade.php
@@ -1,7 +1,7 @@
 <table class="table table-condensed">
     <tbody>
         <tr><td>{{ trans('subscription.name') }}</td><td>{{ $subscription->name }}</td></tr>
-        <tr><td>{{ trans('subscription.price') }}</td><td>{{ formatRp($subscription->price) }}</td></tr>
+        <tr><td>{{ trans('subscription.price') }}</td><td>{{ format_money($subscription->price) }}</td></tr>
         <tr><td>{{ trans('subscription.type') }}</td><td>{{ $subscription->type }}</td></tr>
         <tr><td>{{ trans('subscription.start_date') }}</td><td>{{ date_id($subscription->start_date) }}</td></tr>
         <tr><td>{{ trans('subscription.due_date') }}</td><td>{{ date_id($subscription->due_date) }}</td></tr>
diff --git a/resources/views/users/jobs.blade.php b/resources/views/users/jobs.blade.php
index e61b9e2..682875d 100755
--- a/resources/views/users/jobs.blade.php
+++ b/resources/views/users/jobs.blade.php
@@ -34,7 +34,7 @@
                 </td>
                 <td class="text-center">{{ $job->tasks_count = $job->tasks->count() }}</td>
                 <td class="text-center">{{ format_decimal($job->progress = $job->progress) }} %</td>
-                <td class="text-right">{{ formatRp($job->price) }}</td>
+                <td class="text-right">{{ format_money($job->price) }}</td>
                 <td class="text-center">
                     {!! html_link_to_route('jobs.show', '', [$job], [
                         'icon' => 'search',
diff --git a/resources/views/users/projects.blade.php b/resources/views/users/projects.blade.php
index 34e1075..9c625d2 100755
--- a/resources/views/users/projects.blade.php
+++ b/resources/views/users/projects.blade.php
@@ -30,7 +30,7 @@
                 <td>{{ $project->nameLink() }}</td>
                 <td class="text-center">{{ $project->start_date }}</td>
                 <td class="text-right">{{ $project->work_duration }}</td>
-                <td class="text-right">{{ formatRp($project->project_value) }}</td>
+                <td class="text-right">{{ format_money($project->project_value) }}</td>
                 <td class="text-center">{{ $project->present()->status }}</td>
                 <td>{{ $project->customer->name }}</td>
                 <td>
diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php
index 953dc32..1f0db62 100755
--- a/resources/views/vendors/show.blade.php
+++ b/resources/views/vendors/show.blade.php
@@ -44,7 +44,7 @@
                         <td class="text-center">{{ 1 + $key }}</td>
                         <td>{{ $payment->project->name }}</td>
                         <td class="text-center">{{ $payment->date }}</td>
-                        <td class="text-right">{{ formatRp($payment->amount) }}</td>
+                        <td class="text-right">{{ format_money($payment->amount) }}</td>
                         <td>{{ $payment->description }}</td>
                     </tr>
                 @endforeach
@@ -52,7 +52,7 @@
             <tfoot>
                 <tr>
                     <th class="text-right" colspan="3">{{ __('app.total') }}</th>
-                    <th class="text-right">{{ formatRp($vendor->payments->sum('amount')) }}</th>
+                    <th class="text-right">{{ format_money($vendor->payments->sum('amount')) }}</th>
                     <th>&nbsp;</th>
                 </tr>
             </tfoot>
diff --git a/tests/Feature/Invoices/InvoiceEntryTest.php b/tests/Feature/Invoices/InvoiceEntryTest.php
index b635e7b..0401c98 100644
--- a/tests/Feature/Invoices/InvoiceEntryTest.php
+++ b/tests/Feature/Invoices/InvoiceEntryTest.php
@@ -87,7 +87,7 @@ class InvoiceEntryTest extends TestCase
 
         $this->seePageIs(route('invoice-drafts.show', $draft->draftKey));
         $this->assertEquals(5000, $draft->getTotal());
-        $this->see(formatRp(5000));
+        $this->see(format_money(5000));
     }
 
     /** @test */
@@ -137,7 +137,7 @@ class InvoiceEntryTest extends TestCase
 
         $this->assertEquals(200, $draft->getTotal());
 
-        $this->see(formatRp($draft->getTotal()));
+        $this->see(format_money($draft->getTotal()));
     }
 
     /** @test */
@@ -174,7 +174,7 @@ class InvoiceEntryTest extends TestCase
         $this->see($project->name);
         $this->see($project->customer->name);
         $this->see($draft->notes);
-        $this->see(formatRp(3000));
+        $this->see(format_money(3000));
         $this->seeElement('input', ['id' => 'save-invoice-draft']);
     }
 
diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php
index c9972d9..a5aa6e2 100644
--- a/tests/Feature/ManageJobsTest.php
+++ b/tests/Feature/ManageJobsTest.php
@@ -142,7 +142,7 @@ class ManageJobsTest extends TestCase
         $this->seePageIs(route('jobs.show', $project->id));
         $this->see(trans('job.detail'));
         $this->see($job->name);
-        $this->see(formatRp($job->price));
+        $this->see(format_money($job->price));
         $this->see($job->worker->name);
     }
 
diff --git a/tests/Feature/ManageSubscriptionsTest.php b/tests/Feature/ManageSubscriptionsTest.php
index 69ebaf6..8046f58 100644
--- a/tests/Feature/ManageSubscriptionsTest.php
+++ b/tests/Feature/ManageSubscriptionsTest.php
@@ -111,7 +111,7 @@ class ManageSubscriptionsTest extends TestCase
         $this->visit(route('subscriptions.show', $subscription->id));
 
         $this->see($subscription->name);
-        $this->see(formatRp($subscription->price));
+        $this->see(format_money($subscription->price));
         $this->see(date_id($subscription->start_date));
         $this->see(date_id($subscription->due_date));
     }
diff --git a/tests/Feature/Payments/ManagePaymentsTest.php b/tests/Feature/Payments/ManagePaymentsTest.php
index 9d0133b..8f2cbdc 100644
--- a/tests/Feature/Payments/ManagePaymentsTest.php
+++ b/tests/Feature/Payments/ManagePaymentsTest.php
@@ -216,7 +216,7 @@ class ManagePaymentsTest extends TestCase
         $this->seePageIs(route('payments.show', $payment->id));
         $this->see(trans('payment.detail'));
         $this->see($payment->date);
-        $this->see(formatRp($payment->amount));
+        $this->see(format_money($payment->amount));
         $this->see($payment->description);
         $this->see($payment->partner->name);
     }
diff --git a/tests/Unit/Helpers/MoneyFormatTest.php b/tests/Unit/Helpers/MoneyFormatTest.php
index fc0384c..483d96c 100644
--- a/tests/Unit/Helpers/MoneyFormatTest.php
+++ b/tests/Unit/Helpers/MoneyFormatTest.php
@@ -17,9 +17,9 @@ class MoneyFormatTest extends TestCase
     /** @test */
     public function format_money_returns_string_with_default_money_sign()
     {
-        $this->assertEquals('Rp. 1.000', formatRp(1000));
-        $this->assertEquals('Rp. 0', formatRp(0));
-        $this->assertEquals('- Rp. 1.000', formatRp(-1000));
+        $this->assertEquals('Rp. 1.000', format_money(1000));
+        $this->assertEquals('Rp. 0', format_money(0));
+        $this->assertEquals('- Rp. 1.000', format_money(-1000));
     }
 
     /** @test */
@@ -30,8 +30,8 @@ class MoneyFormatTest extends TestCase
             'value' => 'USD',
         ]);
 
-        $this->assertEquals('USD 1.000', formatRp(1000));
-        $this->assertEquals('USD 0', formatRp(0));
-        $this->assertEquals('- USD 1.000', formatRp(-1000));
+        $this->assertEquals('USD 1.000', format_money(1000));
+        $this->assertEquals('USD 0', format_money(0));
+        $this->assertEquals('- USD 1.000', format_money(-1000));
     }
 }

From b0dfc805e93f4c5b30f813d84c7bad699951ee74 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 21:10:03 +0800
Subject: [PATCH 009/113] Change formatSizeUnits() to format_size_units()

---
 app/helpers.php                             |  2 +-
 resources/views/backups/index.blade.php     |  2 +-
 resources/views/projects/files.blade.php    | 46 ++++++++++++++---------------
 resources/views/reports/log-files.blade.php | 26 +++++++---------
 4 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 6894fa1..8fb5c3c 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -150,7 +150,7 @@ function str_split_ucwords($string)
  * @param  int  $bytes File size.
  * @return string Converted file size with unit.
  */
-function formatSizeUnits($bytes)
+function format_size_units($bytes)
 {
     if ($bytes >= 1073741824) {
         $bytes = number_format($bytes / 1073741824, 2).' GB';
diff --git a/resources/views/backups/index.blade.php b/resources/views/backups/index.blade.php
index 8976fdc..d9efab9 100644
--- a/resources/views/backups/index.blade.php
+++ b/resources/views/backups/index.blade.php
@@ -24,7 +24,7 @@
                     <tr>
                         <td>{{ $key + 1 }}</td>
                         <td>{{ $backup->getFilename() }}</td>
-                        <td>{{ formatSizeUnits($backup->getSize()) }}</td>
+                        <td>{{ format_size_units($backup->getSize()) }}</td>
                         <td>{{ date('Y-m-d H:i:s', $backup->getMTime()) }}</td>
                         <td class="text-center">
                             <a href="{{ route('backups.index', ['action' => 'restore', 'file_name' => $backup->getFilename()]) }}"
diff --git a/resources/views/projects/files.blade.php b/resources/views/projects/files.blade.php
index f10949f..890cf69 100755
--- a/resources/views/projects/files.blade.php
+++ b/resources/views/projects/files.blade.php
@@ -1,12 +1,12 @@
 @extends('layouts.app')
 
-@section('title', trans('project.files') . ' | ' . $project->name)
+@section('title', __('project.files').' | '.$project->name)
 
 @section('content')
-@include('projects.partials.breadcrumb',['title' => trans('project.files')])
+@include('projects.partials.breadcrumb',['title' => __('project.files')])
 
 <h1 class="page-header">
-    {{ $project->name }} <small>{{ trans('project.files') }}</small>
+    {{ $project->name }} <small>{{ __('project.files') }}</small>
 </h1>
 
 @include('projects.partials.nav-tabs')
@@ -14,16 +14,16 @@
     <div class="col-md-8">
         <div class="panel panel-default table-responsive">
             <div class="panel-heading">
-                <h3 class="panel-title">{{ trans('project.files') }}</h3>
+                <h3 class="panel-title">{{ __('project.files') }}</h3>
             </div>
             <table class="table table-condensed table-striped">
                 <thead>
-                    <th>{{ trans('app.table_no') }}</th>
-                    <th>{{ trans('file.file') }}</th>
-                    <th class="text-center">{{ trans('file.updated_at') }}</th>
-                    <th class="text-right">{{ trans('file.size') }}</th>
-                    <th class="text-center">{{ trans('file.download') }}</th>
-                    <th class="text-center">{{ trans('app.action') }}</th>
+                    <th>{{ __('app.table_no') }}</th>
+                    <th>{{ __('file.file') }}</th>
+                    <th class="text-center">{{ __('file.updated_at') }}</th>
+                    <th class="text-right">{{ __('file.size') }}</th>
+                    <th class="text-center">{{ __('file.download') }}</th>
+                    <th class="text-center">{{ __('app.action') }}</th>
                 </thead>
                 <tbody class="sort-files">
                     @forelse($files as $key => $file)
@@ -37,16 +37,16 @@
                             <div class="">{{ $file->getDate() }}</div>
                             <div class="text-info small">{{ $file->getTime() }}</div>
                         </td>
-                        <td class="text-right">{{ formatSizeUnits($file->getSize()) }}</td>
+                        <td class="text-right">{{ format_size_units($file->getSize()) }}</td>
                         <td class="text-center">
-                            {!! html_link_to_route('files.download', '', [$file->id], ['icon' => 'file', 'title' => trans('file.download')]) !!}
+                            {!! html_link_to_route('files.download', '', [$file->id], ['icon' => 'file', 'title' => __('file.download')]) !!}
                         </td>
                         <td class="text-center">
-                            {!! html_link_to_route('projects.files', '', [$project->id, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => trans('file.edit')]) !!}
+                            {!! html_link_to_route('projects.files', '', [$project->id, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => __('file.edit')]) !!}
                         </td>
                     </tr>
                     @empty
-                    <tr><td colspan="6">{{ trans('file.empty') }}</td></tr>
+                    <tr><td colspan="6">{{ __('file.empty') }}</td></tr>
                     @endforelse
                 </tbody>
             </table>
@@ -55,27 +55,27 @@
     <div class="col-md-4">
         @if (Request::has('action') == false)
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('file.create') }}</h3></div>
+            <div class="panel-heading"><h3 class="panel-title">{{ __('file.create') }}</h3></div>
             <div class="panel-body">
                 {!! Form::open(['route' => ['files.upload', $project->id], 'id' => 'upload-file', 'files' => true]) !!}
                 {{ Form::hidden('fileable_type', get_class($project)) }}
-                {!! FormField::file('file', ['label' => trans('file.select')]) !!}
+                {!! FormField::file('file', ['label' => __('file.select')]) !!}
                 {!! FormField::text('title') !!}
                 {!! FormField::textarea('description') !!}
-                {!! Form::submit(trans('file.upload'), ['class' => 'btn btn-info']) !!}
+                {!! Form::submit(__('file.upload'), ['class' => 'btn btn-info']) !!}
                 {!! Form::close() !!}
             </div>
         </div>
         @endif
         @if (Request::get('action') == 'edit' && $editableFile)
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ trans('file.edit') }} : {{ $editableFile->title }}</h3></div>
+            <div class="panel-heading"><h3 class="panel-title">{{ __('file.edit') }} : {{ $editableFile->title }}</h3></div>
             <div class="panel-body">
                 {!! Form::model($editableFile, ['route' => ['files.update', $editableFile->id],'method' => 'patch']) !!}
-                {!! FormField::text('title', ['label' => trans('file.title'), 'required' => true]) !!}
-                {!! FormField::textarea('description', ['label' => trans('file.description')]) !!}
-                {!! Form::submit(trans('file.update'), ['class' => 'btn btn-success']) !!}
-                {{ link_to_route('projects.files', trans('app.cancel'), [$project->id], ['class' => 'btn btn-default']) }}
+                {!! FormField::text('title', ['label' => __('file.title'), 'required' => true]) !!}
+                {!! FormField::textarea('description', ['label' => __('file.description')]) !!}
+                {!! Form::submit(__('file.update'), ['class' => 'btn btn-success']) !!}
+                {{ link_to_route('projects.files', __('app.cancel'), [$project->id], ['class' => 'btn btn-default']) }}
                 {!! Form::close() !!}
             </div>
         </div>
@@ -84,4 +84,4 @@
 </div>
 
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/reports/log-files.blade.php b/resources/views/reports/log-files.blade.php
index a651c9f..16b2c50 100755
--- a/resources/views/reports/log-files.blade.php
+++ b/resources/views/reports/log-files.blade.php
@@ -1,11 +1,9 @@
 @extends('layouts.app')
 
-@section('title','Log Files')
+@section('title', 'Log Files')
 
 @section('content')
-<h3 class="page-header">
-    Log Files
-</h3>
+<h3 class="page-header">Log Files</h3>
 <div class="row">
     <div class="col-md-8">
         <div class="panel panel-default">
@@ -15,35 +13,33 @@
                     <th>Nama File</th>
                     <th>Ukuran</th>
                     <th>Tanggal Jam</th>
-                    <th>{{ trans('app.action') }}</th>
+                    <th>{{ __('app.action') }}</th>
                 </thead>
                 <tbody>
                     @forelse($logFiles as $key => $logFile)
                     <tr>
                         <td>{{ $key + 1 }}</td>
                         <td>{{ $logFile->getFilename() }}</td>
-                        <td>{{ formatSizeUnits($logFile->getSize()) }}</td>
+                        <td>{{ format_size_units($logFile->getSize()) }}</td>
                         <td>{{ date('Y-m-d H:i:s', $logFile->getMTime()) }}</td>
                         <td>
-                            {!! html_link_to_route('log-files.download','',[$logFile->getFilename()],[
+                            {!! html_link_to_route('log-files.download', '', [$logFile->getFilename()], [
                                 'class'=>'btn btn-default btn-xs',
                                 'icon' => 'download',
-                                'id' => 'download-' . $logFile->getFilename(),
-                                'title' => 'Download file ' . $logFile->getFilename()
+                                'id' => 'download-'.$logFile->getFilename(),
+                                'title' => 'Download file '.$logFile->getFilename()
                             ]) !!}
-                            {!! html_link_to_route('log-files.show','',[$logFile->getFilename()],[
+                            {!! html_link_to_route('log-files.show', '', [$logFile->getFilename()], [
                                 'class'=>'btn btn-default btn-xs',
                                 'icon' => 'search',
-                                'id' => 'view-' . $logFile->getFilename(),
-                                'title' => 'View file ' . $logFile->getFilename(),
+                                'id' => 'view-'.$logFile->getFilename(),
+                                'title' => 'View file '.$logFile->getFilename(),
                                 'target' => '_blank',
                             ]) !!}
                         </td>
                     </tr>
                     @empty
-                    <tr>
-                        <td colspan="3">Belum ada file logFile</td>
-                    </tr>
+                    <tr><td colspan="5">Belum ada file logFile</td></tr>
                     @endforelse
                 </tbody>
             </table>

From 5c54caa65cef328c41df5bfa34a33db676dd95b4 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 23 Dec 2018 21:11:59 +0800
Subject: [PATCH 010/113] Change formatNo() to format_no()

---
 app/helpers.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 8fb5c3c..d0b2d36 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -6,7 +6,7 @@
  * @param  int  $number money in integer format
  * @return string money in string format
  */
-function formatNo($number)
+function format_no($number)
 {
     return number_format($number, 0, ',', '.');
 }
@@ -26,10 +26,10 @@ function format_money($number)
     }
 
     if ($number < 0) {
-        return '- '.$moneySign.' '.formatNo(abs($number));
+        return '- '.$moneySign.' '.format_no(abs($number));
     }
 
-    return $moneySign.' '.formatNo($number);
+    return $moneySign.' '.format_no($number);
 }
 
 /**

From 350e4196f9d2e563e838deaac9e51802788df362 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 25 Dec 2018 14:14:18 +0800
Subject: [PATCH 011/113] Change monthDateArray() to month_date_array()

---
 app/helpers.php                                    | 2 +-
 resources/views/reports/payments/monthly.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index d0b2d36..4d801c6 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -244,7 +244,7 @@ function appLogoPath()
  * @param  string  $month
  * @return array
  */
-function monthDateArray($year, $month)
+function month_date_array($year, $month)
 {
     $dateCount = Carbon::parse($year.'-'.$month)->format('t');
     $dates = [];
diff --git a/resources/views/reports/payments/monthly.blade.php b/resources/views/reports/payments/monthly.blade.php
index 13b947e..8c9711c 100755
--- a/resources/views/reports/payments/monthly.blade.php
+++ b/resources/views/reports/payments/monthly.blade.php
@@ -40,7 +40,7 @@
             </thead>
             <tbody>
                 @php $chartData = []; @endphp
-                @foreach(monthDateArray($year, $month) as $dateNumber)
+                @foreach(month_date_array($year, $month) as $dateNumber)
                 @php
                     $any = isset($reports[$dateNumber]);
                     $count = $any ? $reports[$dateNumber]->count : 0;

From 3cc999c0bc2ea787025d9bc28d3aae4c31393cbb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 25 Dec 2018 14:16:46 +0800
Subject: [PATCH 012/113] Change logo function helpers name

Change appLogoImage() to app_logo_image()
Change appLogoPath() to app_logo_path()
---
 app/helpers.php                                    |  6 +++---
 resources/views/auth/app-install.blade.php         |  2 +-
 resources/views/auth/login.blade.php               |  2 +-
 resources/views/invoices/pdf.blade.php             |  2 +-
 resources/views/layouts/partials/sidebar.blade.php |  2 +-
 resources/views/payments/pdf.blade.php             |  2 +-
 resources/views/users/agency/edit.blade.php        |  2 +-
 resources/views/users/agency/show.blade.php        |  2 +-
 tests/Unit/Helpers/AppLogoImageTest.php            | 12 ++++++------
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 4d801c6..368fd3c 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -211,10 +211,10 @@ function dateDifference($date1, $date2, $differenceFormat = '%a')
  * @param  array  $attributes
  * @return \Illuminate\Support\HtmlString
  */
-function appLogoImage($attributes = [])
+function app_logo_image($attributes = [])
 {
     return Html::image(
-        appLogoPath(),
+        app_logo_path(),
         'Logo '.Option::get('agency_name', 'Laravel'),
         $attributes
     );
@@ -225,7 +225,7 @@ function appLogoImage($attributes = [])
  *
  * @return string
  */
-function appLogoPath()
+function app_logo_path()
 {
     $defaultLogoImagePath = 'default-logo.png';
     $optionLogoImagePath = Option::get('agency_logo_path');
diff --git a/resources/views/auth/app-install.blade.php b/resources/views/auth/app-install.blade.php
index bce3cb6..7527df9 100644
--- a/resources/views/auth/app-install.blade.php
+++ b/resources/views/auth/app-install.blade.php
@@ -11,7 +11,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="text-center">
-                        {!! appLogoImage(['style' => 'width:150px']) !!}
+                        {!! app_logo_image(['style' => 'width:150px']) !!}
                         <h3>{{ config('app.name') }}</h3>
                     </div>
                 </div>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index daa20cf..05bf52e 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -5,7 +5,7 @@
 @section('content')
 
 <div class="login-panel col-md-4 col-md-offset-4 text-center">
-    {!! appLogoImage() !!}
+    {!! app_logo_image() !!}
     <h3>{{ config('app.name') }}</h3>
     <div class="panel panel-default">
         <div class="panel-body">
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index 004a517..a97f9dd 100755
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -39,7 +39,7 @@
         <tbody>
             <tr>
                 <td style="width:100px;">
-                    {!! appLogoImage(['style' => 'width:100%']) !!}
+                    {!! app_logo_image(['style' => 'width:100%']) !!}
                 </td>
                 <td style="width:380px">
                     <div style="width:300px">
diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php
index c41001c..bd27221 100755
--- a/resources/views/layouts/partials/sidebar.blade.php
+++ b/resources/views/layouts/partials/sidebar.blade.php
@@ -10,7 +10,7 @@
 <div class="navbar-default sidebar hidden-print" role="navigation">
     <div class="sidebar-nav navbar-collapse">
         <a class="navbar-brand text-center" title="Home | {{ Option::get('agency_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
-            {{ appLogoImage(['class' => 'sidebar-logo']) }}
+            {{ app_logo_image(['class' => 'sidebar-logo']) }}
             <div class="small" style="margin-top:10px">{{ config('app.name') }}</div>
         </a>
         @include('layouts.partials.lang-switcher')
diff --git a/resources/views/payments/pdf.blade.php b/resources/views/payments/pdf.blade.php
index 9131635..1a77f71 100755
--- a/resources/views/payments/pdf.blade.php
+++ b/resources/views/payments/pdf.blade.php
@@ -22,7 +22,7 @@
     <table class="receipt-table">
         <tbody>
             <tr>
-                <td style="width:140px;">{{ appLogoImage(['style' => 'width: 100px;']) }}</td>
+                <td style="width:140px;">{{ app_logo_image(['style' => 'width: 100px;']) }}</td>
                 <td style="width:330px">
                     <div style="width:280px">
                         <h4 style="margin:0px; border-bottom: 3px; font-size: 21.5px">{{ Option::get('agency_name') }}</h4>
diff --git a/resources/views/users/agency/edit.blade.php b/resources/views/users/agency/edit.blade.php
index 5b430b2..77bbdd1 100644
--- a/resources/views/users/agency/edit.blade.php
+++ b/resources/views/users/agency/edit.blade.php
@@ -31,7 +31,7 @@
     <div class="col-md-3 text-center">
         {{ Form::open(['route' => 'users.agency.logo-upload', 'method' => 'patch', 'files' => true]) }}
         <legend>{{ __('agency.logo') }}</legend>
-        <p>{!! appLogoImage(['style' => 'margin:20px auto']) !!}</p>
+        <p>{!! app_logo_image(['style' => 'margin:20px auto']) !!}</p>
         {!! FormField::file('logo', [
             'label' => __('agency.logo_change'),
             'info' => ['text' => __('agency.logo_upload_info'), 'class' => 'warning'],
diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php
index 9507913..b74473a 100644
--- a/resources/views/users/agency/show.blade.php
+++ b/resources/views/users/agency/show.blade.php
@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col-md-4 text-center">
 
-        <p>{!! appLogoImage() !!}</p>
+        <p>{!! app_logo_image() !!}</p>
 
         <h3 class="text-primary">{{ Option::get('agency_name') }}</h3>
         <p>{{ Option::get('agency_tagline') }}</p>
diff --git a/tests/Unit/Helpers/AppLogoImageTest.php b/tests/Unit/Helpers/AppLogoImageTest.php
index 14d508e..c78543f 100644
--- a/tests/Unit/Helpers/AppLogoImageTest.php
+++ b/tests/Unit/Helpers/AppLogoImageTest.php
@@ -17,13 +17,13 @@ class AppLogoImageTest extends TestCase
             'value' => 'icon_user_1.png',
         ]);
 
-        $this->assertEquals(asset('assets/imgs/icon_user_1.png'), appLogoPath());
+        $this->assertEquals(asset('assets/imgs/icon_user_1.png'), app_logo_path());
     }
 
     /** @test */
     public function app_logo_path_function_returns_default_logo_image_path_if_no_image_logo_path_setting()
     {
-        $this->assertEquals(asset('assets/imgs/default-logo.png'), appLogoPath());
+        $this->assertEquals(asset('assets/imgs/default-logo.png'), app_logo_path());
     }
 
     /** @test */
@@ -33,7 +33,7 @@ class AppLogoImageTest extends TestCase
         $logoString .= ' src="'.asset('assets/imgs/default-logo.png').'"';
         $logoString .= ' alt="Logo Laravel">';
 
-        $this->assertEquals($logoString, appLogoImage());
+        $this->assertEquals($logoString, app_logo_image());
     }
 
     /** @test */
@@ -48,7 +48,7 @@ class AppLogoImageTest extends TestCase
         $logoString .= ' src="'.asset('assets/imgs/icon_user_1.png').'"';
         $logoString .= ' alt="Logo Laravel">';
 
-        $this->assertEquals($logoString, appLogoImage());
+        $this->assertEquals($logoString, app_logo_image());
     }
 
     /** @test */
@@ -69,7 +69,7 @@ class AppLogoImageTest extends TestCase
             'class' => '123',
             'style' => 'display: inline',
         ];
-        $this->assertEquals($logoString, appLogoImage($overrides));
+        $this->assertEquals($logoString, app_logo_image($overrides));
     }
 
     /** @test */
@@ -84,6 +84,6 @@ class AppLogoImageTest extends TestCase
         $logoString .= ' src="'.asset('assets/imgs/default-logo.png').'"';
         $logoString .= ' alt="Logo Laravel">';
 
-        $this->assertEquals($logoString, appLogoImage());
+        $this->assertEquals($logoString, app_logo_image());
     }
 }

From 25fce3df73ee1f064f506547cd54938f4747617a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 25 Dec 2018 14:31:02 +0800
Subject: [PATCH 013/113] Change dateDifference() to date_difference()

---
 app/Entities/Projects/Project.php         |  6 +++---
 app/helpers.php                           |  2 +-
 tests/Unit/Helpers/DateDifferenceTest.php | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index 7dfc082..e64abce 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -234,12 +234,12 @@ class Project extends Model
             return '-';
         }
 
-        $workDuration = dateDifference($startDate, $endDate);
+        $workDuration = date_difference($startDate, $endDate);
 
         if ((int) $workDuration > 365) {
-            return dateDifference($startDate, $endDate, '%y Year(s) %m Month(s)');
+            return date_difference($startDate, $endDate, '%y Year(s) %m Month(s)');
         } elseif ((int) $workDuration > 30) {
-            return dateDifference($startDate, $endDate, '%m Month(s) %d Day(s)');
+            return date_difference($startDate, $endDate, '%m Month(s) %d Day(s)');
         }
 
         return $workDuration.' Day(s)';
diff --git a/app/helpers.php b/app/helpers.php
index 368fd3c..cfe933f 100755
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -195,7 +195,7 @@ function html_link_to_route($name, $title = null, $parameters = [], $attributes
  * @param  string  $differenceFormat
  * @return int|string
  */
-function dateDifference($date1, $date2, $differenceFormat = '%a')
+function date_difference($date1, $date2, $differenceFormat = '%a')
 {
     $datetime1 = date_create($date1);
     $datetime2 = date_create($date2);
diff --git a/tests/Unit/Helpers/DateDifferenceTest.php b/tests/Unit/Helpers/DateDifferenceTest.php
index 6984536..3a9625e 100644
--- a/tests/Unit/Helpers/DateDifferenceTest.php
+++ b/tests/Unit/Helpers/DateDifferenceTest.php
@@ -14,31 +14,31 @@ class DateDifferenceTest extends TestCase
     /** @test */
     public function date_difference_function_exists()
     {
-        $this->assertTrue(function_exists('dateDifference'));
+        $this->assertTrue(function_exists('date_difference'));
     }
 
     /** @test */
     public function date_difference_returns_days_count_by_default()
     {
-        $this->assertEquals(9, dateDifference('2018-04-01', '2018-04-10'));
+        $this->assertEquals(9, date_difference('2018-04-01', '2018-04-10'));
     }
 
     /** @test */
     public function date_difference_can_returns_formatted_string()
     {
-        $this->assertEquals('9 days', dateDifference('2018-04-01', '2018-04-10', '%a days'));
+        $this->assertEquals('9 days', date_difference('2018-04-01', '2018-04-10', '%a days'));
     }
 
     /** @test */
     public function date_difference_returns_proper_months_and_days_format()
     {
         // TODO: Need to fix, this should returns 1 months 9 days
-        $this->assertEquals('1 month 12 days', dateDifference('2018-03-01', '2018-04-10', '%m month %d days'));
+        $this->assertEquals('1 month 12 days', date_difference('2018-03-01', '2018-04-10', '%m month %d days'));
     }
 
     /** @test */
     public function date_difference_returns_proper_years_months_and_days_format()
     {
-        $this->assertEquals('1 year 1 month 12 days', dateDifference('2017-03-01', '2018-04-10', '%y year %m month %d days'));
+        $this->assertEquals('1 year 1 month 12 days', date_difference('2017-03-01', '2018-04-10', '%y year %m month %d days'));
     }
 }

From 9878bfca1320c2053f55b59ba2826f63812c0167 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 30 Dec 2018 19:52:48 +0800
Subject: [PATCH 014/113] Pull latest 2.0 browser kit testing package

---
 composer.json |  1 +
 composer.lock | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index a01ec40..26939f9 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "barryvdh/laravel-debugbar": "^3.1",
         "fzaninotto/faker": "~1.4",
         "johnkary/phpunit-speedtrap": "^2.0",
+        "laravel/browser-kit-testing": "2.0.x-dev",
         "luthfi/simple-crud-generator": "^1.2",
         "mockery/mockery": "~1.0",
         "phpunit/phpunit": "~6.0"
diff --git a/composer.lock b/composer.lock
index be9d10b..8c3e8ce 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fd28a38cbcaf3bccc1d6fb34444372ee",
+    "content-hash": "8e29e897ae75c796354468fc05a55167",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -2960,16 +2960,16 @@
         },
         {
             "name": "laravel/browser-kit-testing",
-            "version": "v2.0.1",
+            "version": "2.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/browser-kit-testing.git",
-                "reference": "f0bb9f200ec35f9d876ded6eacfbc60868d311b9"
+                "reference": "167d459a8b7a1b93b00df675746dccfa1655ef78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/f0bb9f200ec35f9d876ded6eacfbc60868d311b9",
-                "reference": "f0bb9f200ec35f9d876ded6eacfbc60868d311b9",
+                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/167d459a8b7a1b93b00df675746dccfa1655ef78",
+                "reference": "167d459a8b7a1b93b00df675746dccfa1655ef78",
                 "shasum": ""
             },
             "require": {
@@ -3004,20 +3004,20 @@
                 "laravel",
                 "testing"
             ],
-            "time": "2017-06-21T11:44:53+00:00"
+            "time": "2017-10-12T20:09:38+00:00"
         },
         {
             "name": "luthfi/simple-crud-generator",
-            "version": "1.2.7",
+            "version": "1.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nafiesl/SimpleCrudGenerator.git",
-                "reference": "0dc629fab1c1708eedf545aa81c428905e7e4864"
+                "reference": "7d6211f13f538e74d83c9b70363349f2131c3cee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nafiesl/SimpleCrudGenerator/zipball/0dc629fab1c1708eedf545aa81c428905e7e4864",
-                "reference": "0dc629fab1c1708eedf545aa81c428905e7e4864",
+                "url": "https://api.github.com/repos/nafiesl/SimpleCrudGenerator/zipball/7d6211f13f538e74d83c9b70363349f2131c3cee",
+                "reference": "7d6211f13f538e74d83c9b70363349f2131c3cee",
                 "shasum": ""
             },
             "require": {
@@ -3060,7 +3060,7 @@
                 "tdd-workflow",
                 "testing"
             ],
-            "time": "2018-10-23T09:49:27+00:00"
+            "time": "2018-11-24T01:11:20+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -4652,7 +4652,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "laravel/browser-kit-testing": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 85d3b6bad5368a4bc0ab51a61e81b458770c9c3c Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 30 Dec 2018 19:53:26 +0800
Subject: [PATCH 015/113] Change DatabaseMigrations to RefreshDatabase

---
 tests/Feature/AgencyProfileTest.php                 | 4 ++--
 tests/Feature/Api/ApiEventsTest.php                 | 4 ++--
 tests/Feature/Api/ApiManageProjectsTest.php         | 4 ++--
 tests/Feature/Api/Projects/ReorderJobListTest.php   | 4 ++--
 tests/Feature/Api/Projects/ReorderTaskListTest.php  | 4 ++--
 tests/Feature/Auth/ChangePasswordTest.php           | 4 ++--
 tests/Feature/Auth/LoginTest.php                    | 4 ++--
 tests/Feature/Auth/ResetPasswordTest.php            | 4 ++--
 tests/Feature/InstallationTest.php                  | 4 ++--
 tests/Feature/Invoices/InvoiceDuplicateTest.php     | 4 ++--
 tests/Feature/Invoices/InvoiceEntryTest.php         | 4 ++--
 tests/Feature/Invoices/ManageInvoicesTest.php       | 4 ++--
 tests/Feature/ManageJobsTest.php                    | 4 ++--
 tests/Feature/ManageProjectsTest.php                | 4 ++--
 tests/Feature/ManageSubscriptionsTest.php           | 4 ++--
 tests/Feature/ManageTasksTest.php                   | 4 ++--
 tests/Feature/Partners/ManageCustomersTest.php      | 4 ++--
 tests/Feature/Partners/ManageVendorsTest.php        | 4 ++--
 tests/Feature/Payments/ManagePaymentsTest.php       | 4 ++--
 tests/Feature/Payments/ManageProjectFeesTest.php    | 4 ++--
 tests/Feature/Payments/PaymentSearchTest.php        | 4 ++--
 tests/Feature/Projects/JobCommentsTest.php          | 4 ++--
 tests/Feature/Projects/ProjectCommentsTest.php      | 4 ++--
 tests/Feature/Projects/UploadFilesTest.php          | 4 ++--
 tests/Feature/References/ManageBankAccountsTest.php | 4 ++--
 tests/Feature/References/SiteOptionsTest.php        | 4 ++--
 tests/Feature/Users/ManageUsersTest.php             | 4 ++--
 tests/Feature/Users/UserProfileTest.php             | 4 ++--
 tests/Unit/Helpers/AppLogoImageTest.php             | 4 ++--
 tests/Unit/Helpers/MoneyFormatTest.php              | 4 ++--
 tests/Unit/Http/Middlewares/RoleTest.php            | 4 ++--
 tests/Unit/Models/BankAccountTest.php               | 4 ++--
 tests/Unit/Models/CommentTest.php                   | 4 ++--
 tests/Unit/Models/CustomerTest.php                  | 4 ++--
 tests/Unit/Models/InvoiceTest.php                   | 4 ++--
 tests/Unit/Models/JobTest.php                       | 4 ++--
 tests/Unit/Models/PaymentTest.php                   | 4 ++--
 tests/Unit/Models/ProjectTest.php                   | 4 ++--
 tests/Unit/Models/SubscriptionTest.php              | 4 ++--
 tests/Unit/Models/UserTest.php                      | 4 ++--
 tests/Unit/Models/VendorTest.php                    | 4 ++--
 tests/Unit/Policies/CommentPolicyTest.php           | 4 ++--
 tests/Unit/Policies/CustomerPolicyTest.php          | 4 ++--
 tests/Unit/Policies/JobPolicyTest.php               | 4 ++--
 tests/Unit/Policies/PaymentPolicyTest.php           | 4 ++--
 tests/Unit/Policies/ProjectPolicyTest.php           | 4 ++--
 tests/Unit/Policies/TaskPolicyTest.php              | 4 ++--
 tests/Unit/Policies/UserPolicyTest.php              | 4 ++--
 tests/Unit/Policies/VendorPolicyTest.php            | 4 ++--
 tests/Unit/Queries/AdminDashboardQueryTest.php      | 4 ++--
 tests/Unit/Services/SiteOptionTest.php              | 4 ++--
 51 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/tests/Feature/AgencyProfileTest.php b/tests/Feature/AgencyProfileTest.php
index df87083..ac7cd88 100644
--- a/tests/Feature/AgencyProfileTest.php
+++ b/tests/Feature/AgencyProfileTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Feature\Users;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Agency Profile Feature Test.
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class AgencyProfileTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_user_can_visit_agency_page()
diff --git a/tests/Feature/Api/ApiEventsTest.php b/tests/Feature/Api/ApiEventsTest.php
index 2c20f10..8dc0adf 100644
--- a/tests/Feature/Api/ApiEventsTest.php
+++ b/tests/Feature/Api/ApiEventsTest.php
@@ -6,7 +6,7 @@ use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Users\Event;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Events API Feature Test.
@@ -15,7 +15,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ApiEventsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function it_can_get_all_existing_events()
diff --git a/tests/Feature/Api/ApiManageProjectsTest.php b/tests/Feature/Api/ApiManageProjectsTest.php
index baac1a2..a19f013 100644
--- a/tests/Feature/Api/ApiManageProjectsTest.php
+++ b/tests/Feature/Api/ApiManageProjectsTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature\Api;
 
 use Tests\TestCase;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Projects API Feature Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ApiManageProjectsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_get_project_lists()
diff --git a/tests/Feature/Api/Projects/ReorderJobListTest.php b/tests/Feature/Api/Projects/ReorderJobListTest.php
index 0645922..aed6a35 100644
--- a/tests/Feature/Api/Projects/ReorderJobListTest.php
+++ b/tests/Feature/Api/Projects/ReorderJobListTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Api\Projects;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ReorderJobListTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_reorder_job_position()
diff --git a/tests/Feature/Api/Projects/ReorderTaskListTest.php b/tests/Feature/Api/Projects/ReorderTaskListTest.php
index 70a2cef..df1df39 100644
--- a/tests/Feature/Api/Projects/ReorderTaskListTest.php
+++ b/tests/Feature/Api/Projects/ReorderTaskListTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Api\Projects;
 use Tests\TestCase;
 use App\Entities\Projects\Task;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ReorderTaskListTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_reorder_task_position()
diff --git a/tests/Feature/Auth/ChangePasswordTest.php b/tests/Feature/Auth/ChangePasswordTest.php
index b57416f..8cee67f 100644
--- a/tests/Feature/Auth/ChangePasswordTest.php
+++ b/tests/Feature/Auth/ChangePasswordTest.php
@@ -3,11 +3,11 @@
 namespace Tests\Feature\Auth;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ChangePasswordTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function member_can_change_password()
diff --git a/tests/Feature/Auth/LoginTest.php b/tests/Feature/Auth/LoginTest.php
index 531ea53..a96c141 100644
--- a/tests/Feature/Auth/LoginTest.php
+++ b/tests/Feature/Auth/LoginTest.php
@@ -4,11 +4,11 @@ namespace Tests\Feature\Auth;
 
 use Tests\TestCase;
 use App\Entities\Users\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class LoginTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_login_and_logout()
diff --git a/tests/Feature/Auth/ResetPasswordTest.php b/tests/Feature/Auth/ResetPasswordTest.php
index 9d43bca..65f86b0 100644
--- a/tests/Feature/Auth/ResetPasswordTest.php
+++ b/tests/Feature/Auth/ResetPasswordTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Auth;
 use Notification;
 use Tests\TestCase;
 use App\Entities\Users\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ResetPasswordTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_reset_password_by_their_email()
diff --git a/tests/Feature/InstallationTest.php b/tests/Feature/InstallationTest.php
index 496ea21..4d1f711 100644
--- a/tests/Feature/InstallationTest.php
+++ b/tests/Feature/InstallationTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature;
 
 use Tests\TestCase;
 use App\Entities\Users\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Installation Feature Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class InstallationTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_cannot_visit_install_page_if_user_already_exists_in_database()
diff --git a/tests/Feature/Invoices/InvoiceDuplicateTest.php b/tests/Feature/Invoices/InvoiceDuplicateTest.php
index 509ac12..742e9f0 100644
--- a/tests/Feature/Invoices/InvoiceDuplicateTest.php
+++ b/tests/Feature/Invoices/InvoiceDuplicateTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature\Invoices;
 
 use Tests\TestCase;
 use App\Entities\Invoices\Invoice;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use App\Services\InvoiceDrafts\InvoiceDraftCollection;
 
 /**
@@ -14,7 +14,7 @@ use App\Services\InvoiceDrafts\InvoiceDraftCollection;
  */
 class InvoiceDuplicateTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_create_invoice_draft_by_duplicate_existing_invoice()
diff --git a/tests/Feature/Invoices/InvoiceEntryTest.php b/tests/Feature/Invoices/InvoiceEntryTest.php
index 0401c98..deff901 100644
--- a/tests/Feature/Invoices/InvoiceEntryTest.php
+++ b/tests/Feature/Invoices/InvoiceEntryTest.php
@@ -7,7 +7,7 @@ use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
 use App\Services\InvoiceDrafts\Item;
 use App\Services\InvoiceDrafts\InvoiceDraft;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use App\Services\InvoiceDrafts\InvoiceDraftCollection;
 
 /**
@@ -17,7 +17,7 @@ use App\Services\InvoiceDrafts\InvoiceDraftCollection;
  */
 class InvoiceEntryTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_visit_invoice_drafts_page()
diff --git a/tests/Feature/Invoices/ManageInvoicesTest.php b/tests/Feature/Invoices/ManageInvoicesTest.php
index ff74ab1..47e1756 100644
--- a/tests/Feature/Invoices/ManageInvoicesTest.php
+++ b/tests/Feature/Invoices/ManageInvoicesTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature\Invoices;
 
 use Tests\TestCase;
 use App\Entities\Invoices\Invoice;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Invoices Feature Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ManageInvoicesTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_browse_invoice_list_page()
diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php
index a5aa6e2..55569bd 100644
--- a/tests/Feature/ManageJobsTest.php
+++ b/tests/Feature/ManageJobsTest.php
@@ -8,7 +8,7 @@ use App\Entities\Projects\Job;
 use App\Entities\Projects\Task;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Project Feature Test.
@@ -17,7 +17,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ManageJobsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_entry_job()
diff --git a/tests/Feature/ManageProjectsTest.php b/tests/Feature/ManageProjectsTest.php
index 379d9f5..e4a1649 100644
--- a/tests/Feature/ManageProjectsTest.php
+++ b/tests/Feature/ManageProjectsTest.php
@@ -8,11 +8,11 @@ use App\Entities\Projects\Task;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageProjectsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_input_new_project_with_existing_customer()
diff --git a/tests/Feature/ManageSubscriptionsTest.php b/tests/Feature/ManageSubscriptionsTest.php
index 8046f58..8b624cd 100644
--- a/tests/Feature/ManageSubscriptionsTest.php
+++ b/tests/Feature/ManageSubscriptionsTest.php
@@ -6,11 +6,11 @@ use Tests\TestCase;
 use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
 use App\Entities\Subscriptions\Subscription;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageSubscriptionsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_entry_subscription()
diff --git a/tests/Feature/ManageTasksTest.php b/tests/Feature/ManageTasksTest.php
index 8831084..7b55f5a 100644
--- a/tests/Feature/ManageTasksTest.php
+++ b/tests/Feature/ManageTasksTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Task;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageTasksTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_entry_task()
diff --git a/tests/Feature/Partners/ManageCustomersTest.php b/tests/Feature/Partners/ManageCustomersTest.php
index 8013d34..b2c36f7 100644
--- a/tests/Feature/Partners/ManageCustomersTest.php
+++ b/tests/Feature/Partners/ManageCustomersTest.php
@@ -4,11 +4,11 @@ namespace Tests\Feature;
 
 use Tests\TestCase;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageCustomersTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_see_customer_list_in_customer_index_page()
diff --git a/tests/Feature/Partners/ManageVendorsTest.php b/tests/Feature/Partners/ManageVendorsTest.php
index c3dacce..b2258ea 100644
--- a/tests/Feature/Partners/ManageVendorsTest.php
+++ b/tests/Feature/Partners/ManageVendorsTest.php
@@ -4,11 +4,11 @@ namespace Tests\Feature\Partners;
 
 use Tests\TestCase;
 use App\Entities\Partners\Vendor;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageVendorsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_see_vendor_list_in_vendor_index_page()
diff --git a/tests/Feature/Payments/ManagePaymentsTest.php b/tests/Feature/Payments/ManagePaymentsTest.php
index 8f2cbdc..8397fd1 100644
--- a/tests/Feature/Payments/ManagePaymentsTest.php
+++ b/tests/Feature/Payments/ManagePaymentsTest.php
@@ -7,7 +7,7 @@ use App\Entities\Partners\Vendor;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Payments Feature Test.
@@ -16,7 +16,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ManagePaymentsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_entry_project_an_income_payment()
diff --git a/tests/Feature/Payments/ManageProjectFeesTest.php b/tests/Feature/Payments/ManageProjectFeesTest.php
index 0a859b3..dc935c4 100644
--- a/tests/Feature/Payments/ManageProjectFeesTest.php
+++ b/tests/Feature/Payments/ManageProjectFeesTest.php
@@ -6,11 +6,11 @@ use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ManageProjectFeesTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_entry_project_fee_payment()
diff --git a/tests/Feature/Payments/PaymentSearchTest.php b/tests/Feature/Payments/PaymentSearchTest.php
index d273226..cf7bec0 100644
--- a/tests/Feature/Payments/PaymentSearchTest.php
+++ b/tests/Feature/Payments/PaymentSearchTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Payments;
 use Tests\TestCase;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class PaymentSearchTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_find_payment_by_project_name()
diff --git a/tests/Feature/Projects/JobCommentsTest.php b/tests/Feature/Projects/JobCommentsTest.php
index 186ff85..6dcba5a 100644
--- a/tests/Feature/Projects/JobCommentsTest.php
+++ b/tests/Feature/Projects/JobCommentsTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Projects;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Comment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class JobCommentsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_view_job_comments()
diff --git a/tests/Feature/Projects/ProjectCommentsTest.php b/tests/Feature/Projects/ProjectCommentsTest.php
index 9826f4b..6e7e211 100644
--- a/tests/Feature/Projects/ProjectCommentsTest.php
+++ b/tests/Feature/Projects/ProjectCommentsTest.php
@@ -5,11 +5,11 @@ namespace Tests\Feature\Projects;
 use Tests\TestCase;
 use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ProjectCommentsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_view_project_comments()
diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index 60556cf..a1d8fd7 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -6,11 +6,11 @@ use Storage;
 use Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class UploadFilesTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_upload_document_to_a_project()
diff --git a/tests/Feature/References/ManageBankAccountsTest.php b/tests/Feature/References/ManageBankAccountsTest.php
index 8ac5d46..aa569b9 100644
--- a/tests/Feature/References/ManageBankAccountsTest.php
+++ b/tests/Feature/References/ManageBankAccountsTest.php
@@ -5,7 +5,7 @@ namespace Tests\Feature\References;
 use Tests\TestCase;
 use App\Entities\Options\Option;
 use App\Entities\Invoices\BankAccount;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Bank Account Feature Test.
@@ -14,7 +14,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ManageBankAccountsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_see_bank_account_list_in_bank_account_index_page()
diff --git a/tests/Feature/References/SiteOptionsTest.php b/tests/Feature/References/SiteOptionsTest.php
index 8c34e14..2589fe7 100644
--- a/tests/Feature/References/SiteOptionsTest.php
+++ b/tests/Feature/References/SiteOptionsTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Feature\Users;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Site Options Feature Test.
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class SiteOptionsTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_user_can_visit_site_options_page()
diff --git a/tests/Feature/Users/ManageUsersTest.php b/tests/Feature/Users/ManageUsersTest.php
index 57d3d39..e54dd13 100644
--- a/tests/Feature/Users/ManageUsersTest.php
+++ b/tests/Feature/Users/ManageUsersTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature\Users;
 
 use Tests\TestCase;
 use App\Entities\Users\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Manage Users Feature Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class ManageUsersTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_can_see_user_list_from_dashboard_tab()
diff --git a/tests/Feature/Users/UserProfileTest.php b/tests/Feature/Users/UserProfileTest.php
index fef6f3c..79cd63c 100644
--- a/tests/Feature/Users/UserProfileTest.php
+++ b/tests/Feature/Users/UserProfileTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Feature\Users;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * User Profile Feature Test.
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class UserProfileTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_user_can_visit_their_profile_page()
diff --git a/tests/Unit/Helpers/AppLogoImageTest.php b/tests/Unit/Helpers/AppLogoImageTest.php
index c78543f..23b02fa 100644
--- a/tests/Unit/Helpers/AppLogoImageTest.php
+++ b/tests/Unit/Helpers/AppLogoImageTest.php
@@ -3,11 +3,11 @@
 namespace Tests\Unit\Helpers;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class AppLogoImageTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function app_logo_path_function_returns_correct_logo_image_path_based_on_agency_logo_path_setting()
diff --git a/tests/Unit/Helpers/MoneyFormatTest.php b/tests/Unit/Helpers/MoneyFormatTest.php
index 483d96c..5a976f4 100644
--- a/tests/Unit/Helpers/MoneyFormatTest.php
+++ b/tests/Unit/Helpers/MoneyFormatTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Helpers;
 
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Money Format Helper Unit Test.
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class MoneyFormatTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function format_money_returns_string_with_default_money_sign()
diff --git a/tests/Unit/Http/Middlewares/RoleTest.php b/tests/Unit/Http/Middlewares/RoleTest.php
index 78078b5..6e57174 100644
--- a/tests/Unit/Http/Middlewares/RoleTest.php
+++ b/tests/Unit/Http/Middlewares/RoleTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Http\Middlewares;
 
 use Tests\TestCase;
 use App\Http\Middleware\Role;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Role middleware test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class RoleTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /**
      * Call the given middleware.
diff --git a/tests/Unit/Models/BankAccountTest.php b/tests/Unit/Models/BankAccountTest.php
index 47b0c96..69a6f22 100644
--- a/tests/Unit/Models/BankAccountTest.php
+++ b/tests/Unit/Models/BankAccountTest.php
@@ -4,11 +4,11 @@ namespace Tests\Unit\Models;
 
 use Tests\TestCase;
 use App\Entities\Invoices\BankAccount;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class BankAccountTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_bank_account_has_status_attribute()
diff --git a/tests/Unit/Models/CommentTest.php b/tests/Unit/Models/CommentTest.php
index 5673997..6b86e57 100644
--- a/tests/Unit/Models/CommentTest.php
+++ b/tests/Unit/Models/CommentTest.php
@@ -5,11 +5,11 @@ namespace Tests\Unit\Models;
 use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Projects\Comment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class CommentTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_comment_has_belongs_to_creator_relation()
diff --git a/tests/Unit/Models/CustomerTest.php b/tests/Unit/Models/CustomerTest.php
index 3784653..0ec62fb 100644
--- a/tests/Unit/Models/CustomerTest.php
+++ b/tests/Unit/Models/CustomerTest.php
@@ -9,11 +9,11 @@ use App\Entities\Projects\Project;
 use Illuminate\Support\Collection;
 use App\Entities\Partners\Customer;
 use App\Entities\Subscriptions\Subscription;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class CustomerTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_customer_has_many_projects()
diff --git a/tests/Unit/Models/InvoiceTest.php b/tests/Unit/Models/InvoiceTest.php
index 8a456f3..434a028 100644
--- a/tests/Unit/Models/InvoiceTest.php
+++ b/tests/Unit/Models/InvoiceTest.php
@@ -6,7 +6,7 @@ use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Invoice Model Test.
@@ -15,7 +15,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class InvoiceTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function it_has_project_relation()
diff --git a/tests/Unit/Models/JobTest.php b/tests/Unit/Models/JobTest.php
index c92fc37..c2e96c0 100644
--- a/tests/Unit/Models/JobTest.php
+++ b/tests/Unit/Models/JobTest.php
@@ -8,7 +8,7 @@ use App\Entities\Projects\Task;
 use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
 use Illuminate\Support\Collection;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Job Model Unit Test.
@@ -17,7 +17,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class JobTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_job_has_name_link_method()
diff --git a/tests/Unit/Models/PaymentTest.php b/tests/Unit/Models/PaymentTest.php
index f1df1ee..e334850 100644
--- a/tests/Unit/Models/PaymentTest.php
+++ b/tests/Unit/Models/PaymentTest.php
@@ -7,11 +7,11 @@ use App\Entities\Users\User;
 use App\Entities\Partners\Vendor;
 use App\Entities\Payments\Payment;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class PaymentTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function it_can_have_partner_relation_on_customer_model_for_income_payment()
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index 24c5264..351c7d8 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -11,11 +11,11 @@ use App\Entities\Projects\Project;
 use Illuminate\Support\Collection;
 use App\Entities\Partners\Customer;
 use App\Entities\Subscriptions\Subscription;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ProjectTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_project_has_name_link_method()
diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php
index 3d2c17a..9c7791f 100644
--- a/tests/Unit/Models/SubscriptionTest.php
+++ b/tests/Unit/Models/SubscriptionTest.php
@@ -9,11 +9,11 @@ use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
 use App\Entities\Subscriptions\Type;
 use App\Entities\Subscriptions\Subscription;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SubscriptionTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function it_has_name_link_method()
diff --git a/tests/Unit/Models/UserTest.php b/tests/Unit/Models/UserTest.php
index caaafad..b3060f9 100644
--- a/tests/Unit/Models/UserTest.php
+++ b/tests/Unit/Models/UserTest.php
@@ -8,7 +8,7 @@ use App\Entities\Projects\Job;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
 use Illuminate\Support\Collection;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * User Model Unit Test.
@@ -17,7 +17,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class UserTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function user_has_name_link_method()
diff --git a/tests/Unit/Models/VendorTest.php b/tests/Unit/Models/VendorTest.php
index 59ed5a9..5208d80 100644
--- a/tests/Unit/Models/VendorTest.php
+++ b/tests/Unit/Models/VendorTest.php
@@ -6,11 +6,11 @@ use Tests\TestCase;
 use App\Entities\Partners\Vendor;
 use App\Entities\Payments\Payment;
 use Illuminate\Support\Collection;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class VendorTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function a_vendor_has_name()
diff --git a/tests/Unit/Policies/CommentPolicyTest.php b/tests/Unit/Policies/CommentPolicyTest.php
index 51cf568..f20ea56 100644
--- a/tests/Unit/Policies/CommentPolicyTest.php
+++ b/tests/Unit/Policies/CommentPolicyTest.php
@@ -4,11 +4,11 @@ namespace Tests\Unit\Policies;
 
 use Tests\TestCase;
 use App\Entities\Projects\Comment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class CommentPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_edit_any_comments()
diff --git a/tests/Unit/Policies/CustomerPolicyTest.php b/tests/Unit/Policies/CustomerPolicyTest.php
index af9093f..e757e44 100644
--- a/tests/Unit/Policies/CustomerPolicyTest.php
+++ b/tests/Unit/Policies/CustomerPolicyTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Policies;
 
 use Tests\TestCase;
 use App\Entities\Partners\Customer;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Customer Policy Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class CustomerPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function only_admin_can_create_customer()
diff --git a/tests/Unit/Policies/JobPolicyTest.php b/tests/Unit/Policies/JobPolicyTest.php
index ac17b13..5f7b776 100644
--- a/tests/Unit/Policies/JobPolicyTest.php
+++ b/tests/Unit/Policies/JobPolicyTest.php
@@ -4,11 +4,11 @@ namespace Tests\Unit\Policies;
 
 use Tests\TestCase;
 use App\Entities\Projects\Job;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class JobPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function an_admin_can_create_job_on_a_project()
diff --git a/tests/Unit/Policies/PaymentPolicyTest.php b/tests/Unit/Policies/PaymentPolicyTest.php
index dea049e..e683ec5 100644
--- a/tests/Unit/Policies/PaymentPolicyTest.php
+++ b/tests/Unit/Policies/PaymentPolicyTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Policies;
 
 use Tests\TestCase;
 use App\Entities\Payments\Payment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Payment Policy Test.
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class PaymentPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function only_admin_can_create_payment()
diff --git a/tests/Unit/Policies/ProjectPolicyTest.php b/tests/Unit/Policies/ProjectPolicyTest.php
index ac24478..36f32ad 100644
--- a/tests/Unit/Policies/ProjectPolicyTest.php
+++ b/tests/Unit/Policies/ProjectPolicyTest.php
@@ -5,11 +5,11 @@ namespace Tests\Unit\Policies;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Project;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ProjectPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function only_admin_can_create_project()
diff --git a/tests/Unit/Policies/TaskPolicyTest.php b/tests/Unit/Policies/TaskPolicyTest.php
index f4ff8b3..d46f9e0 100644
--- a/tests/Unit/Policies/TaskPolicyTest.php
+++ b/tests/Unit/Policies/TaskPolicyTest.php
@@ -5,11 +5,11 @@ namespace Tests\Unit\Policies;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Task;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class TaskPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function only_admin_can_create_task_on_a_job()
diff --git a/tests/Unit/Policies/UserPolicyTest.php b/tests/Unit/Policies/UserPolicyTest.php
index d9aa5aa..b72963e 100644
--- a/tests/Unit/Policies/UserPolicyTest.php
+++ b/tests/Unit/Policies/UserPolicyTest.php
@@ -6,11 +6,11 @@ use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Projects\Job;
 use App\Entities\Payments\Payment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class UserPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function admin_can_create_user()
diff --git a/tests/Unit/Policies/VendorPolicyTest.php b/tests/Unit/Policies/VendorPolicyTest.php
index 35274f8..cbc2ae9 100644
--- a/tests/Unit/Policies/VendorPolicyTest.php
+++ b/tests/Unit/Policies/VendorPolicyTest.php
@@ -5,7 +5,7 @@ namespace Tests\Unit\Policies;
 use Tests\TestCase;
 use App\Entities\Partners\Vendor;
 use App\Entities\Payments\Payment;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 /**
  * Vendor Policy Test.
@@ -14,7 +14,7 @@ use Illuminate\Foundation\Testing\DatabaseMigrations;
  */
 class VendorPolicyTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function only_admin_can_create_vendor()
diff --git a/tests/Unit/Queries/AdminDashboardQueryTest.php b/tests/Unit/Queries/AdminDashboardQueryTest.php
index 4b79024..5ffac58 100644
--- a/tests/Unit/Queries/AdminDashboardQueryTest.php
+++ b/tests/Unit/Queries/AdminDashboardQueryTest.php
@@ -10,11 +10,11 @@ use App\Entities\Payments\Payment;
 use App\Entities\Projects\Project;
 use App\Queries\AdminDashboardQuery;
 use App\Entities\Subscriptions\Subscription;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class AdminDashboardQueryTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function retrieve_total_earnings_on_the_year()
diff --git a/tests/Unit/Services/SiteOptionTest.php b/tests/Unit/Services/SiteOptionTest.php
index 122d439..566e8ff 100644
--- a/tests/Unit/Services/SiteOptionTest.php
+++ b/tests/Unit/Services/SiteOptionTest.php
@@ -4,11 +4,11 @@ namespace Tests\Unit\Services;
 
 use Option;
 use Tests\TestCase;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class SiteOptionTest extends TestCase
 {
-    use DatabaseMigrations;
+    use RefreshDatabase;
 
     /** @test */
     public function option_can_be_set()

From 61619e7008b9d9957fad4fd450d6e5aea6221dba Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 6 Jan 2019 23:43:10 +0800
Subject: [PATCH 016/113] Update dependecies to laravel 5.6.39

---
 composer.json |   18 +-
 composer.lock | 1202 ++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 677 insertions(+), 543 deletions(-)

diff --git a/composer.json b/composer.json
index 26939f9..099df33 100644
--- a/composer.json
+++ b/composer.json
@@ -5,11 +5,12 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.0.0",
+        "php": "^7.1.3",
         "backup-manager/laravel": "^1.2",
         "guzzlehttp/guzzle": "^6.3",
         "laracasts/presenter": "^0.2.1",
-        "laravel/framework": "5.5.*",
+        "fideloper/proxy": "^4.0",
+        "laravel/framework": "5.6.*",
         "luthfi/formfield": "^1.0",
         "riskihajar/terbilang": "^1.2",
         "spatie/laravel-fractal": "^5.0"
@@ -17,12 +18,11 @@
 
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.1",
-        "fzaninotto/faker": "~1.4",
-        "johnkary/phpunit-speedtrap": "^2.0",
-        "laravel/browser-kit-testing": "2.0.x-dev",
+        "fzaninotto/faker": "^1.4",
+        "johnkary/phpunit-speedtrap": "^3.0",
         "luthfi/simple-crud-generator": "^1.2",
-        "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~6.0"
+        "mockery/mockery": "^1.0",
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "classmap": [
@@ -60,5 +60,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/composer.lock b/composer.lock
index 8c3e8ce..248098c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8e29e897ae75c796354468fc05a55167",
+    "content-hash": "05b18dbb1dd1c347bb90c8f5299db327",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
-            "version": "1.2",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/backup-manager/backup-manager.git",
-                "reference": "4d925b5de2cc8a98d6776f5bf88ec41edd584533"
+                "reference": "4b3d74bb929aebc2df0f39f1032e0ca5e0948247"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/backup-manager/backup-manager/zipball/4d925b5de2cc8a98d6776f5bf88ec41edd584533",
-                "reference": "4d925b5de2cc8a98d6776f5bf88ec41edd584533",
+                "url": "https://api.github.com/repos/backup-manager/backup-manager/zipball/4b3d74bb929aebc2df0f39f1032e0ca5e0948247",
+                "reference": "4b3d74bb929aebc2df0f39f1032e0ca5e0948247",
                 "shasum": ""
             },
             "require": {
@@ -72,7 +72,7 @@
                 }
             ],
             "description": "A framework agnostic database backup manager with user-definable procedures and support for S3, Dropbox, FTP, SFTP, and more with drivers for popular frameworks.",
-            "time": "2018-01-28T20:31:36+00:00"
+            "time": "2018-09-23T09:14:37+00:00"
         },
         {
             "name": "backup-manager/laravel",
@@ -137,20 +137,20 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462"
+                "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462",
-                "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
+                "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.2"
@@ -158,7 +158,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -200,7 +200,7 @@
                 "singularize",
                 "string"
             ],
-            "time": "2017-07-22T12:18:28+00:00"
+            "time": "2018-01-09T20:05:19+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -257,17 +257,66 @@
             "time": "2014-09-09T13:34:57+00:00"
         },
         {
+            "name": "dragonmantank/cron-expression",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dragonmantank/cron-expression.git",
+                "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/92a2c3768d50e21a1f26a53cb795ce72806266c5",
+                "reference": "92a2c3768d50e21a1f26a53cb795ce72806266c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~6.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cron\\": "src/Cron/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Chris Tankersley",
+                    "email": "chris@ctankersley.com",
+                    "homepage": "https://github.com/dragonmantank"
+                }
+            ],
+            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
+            "keywords": [
+                "cron",
+                "schedule"
+            ],
+            "time": "2018-06-06T03:12:17+00:00"
+        },
+        {
             "name": "egulias/email-validator",
-            "version": "2.1.5",
+            "version": "2.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3"
+                "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/54859fabea8b3beecbb1a282888d5c990036b9e3",
-                "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e",
+                "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e",
                 "shasum": ""
             },
             "require": {
@@ -311,7 +360,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2018-08-16T20:49:45+00:00"
+            "time": "2018-12-04T22:38:24+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -360,6 +409,60 @@
             "time": "2018-03-08T01:11:30+00:00"
         },
         {
+            "name": "fideloper/proxy",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fideloper/TrustedProxy.git",
+                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "~5.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "illuminate/http": "~5.6",
+                "mockery/mockery": "~1.0",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Fideloper\\Proxy\\TrustedProxyServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fideloper\\Proxy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Fidao",
+                    "email": "fideloper@gmail.com"
+                }
+            ],
+            "description": "Set trusted proxies for Laravel",
+            "keywords": [
+                "load balancing",
+                "proxy",
+                "trusted proxy"
+            ],
+            "time": "2018-02-07T20:20:57+00:00"
+        },
+        {
             "name": "guzzlehttp/guzzle",
             "version": "6.3.3",
             "source": {
@@ -477,32 +580,33 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -532,13 +636,14 @@
             "keywords": [
                 "http",
                 "message",
+                "psr-7",
                 "request",
                 "response",
                 "stream",
                 "uri",
                 "url"
             ],
-            "time": "2017-03-20T17:10:46+00:00"
+            "time": "2018-12-04T20:46:45+00:00"
         },
         {
             "name": "laracasts/presenter",
@@ -588,43 +693,46 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.5.43",
+            "version": "v5.6.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "84f4ed02ec6eb4a56629fb6acbee1df56891e3c7"
+                "reference": "37bb306f516669ab4f888c16003f694313ab299e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/84f4ed02ec6eb4a56629fb6acbee1df56891e3c7",
-                "reference": "84f4ed02ec6eb4a56629fb6acbee1df56891e3c7",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e",
+                "reference": "37bb306f516669ab4f888c16003f694313ab299e",
                 "shasum": ""
             },
             "require": {
                 "doctrine/inflector": "~1.1",
+                "dragonmantank/cron-expression": "~2.0",
                 "erusev/parsedown": "~1.7",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
                 "league/flysystem": "^1.0.8",
                 "monolog/monolog": "~1.12",
-                "mtdowling/cron-expression": "~1.0",
-                "nesbot/carbon": "^1.24.1",
-                "php": ">=7.0",
+                "nesbot/carbon": "1.25.*",
+                "php": "^7.1.3",
                 "psr/container": "~1.0",
                 "psr/simple-cache": "^1.0",
-                "ramsey/uuid": "~3.0",
+                "ramsey/uuid": "^3.7",
                 "swiftmailer/swiftmailer": "~6.0",
-                "symfony/console": "~3.3",
-                "symfony/debug": "~3.3",
-                "symfony/finder": "~3.3",
-                "symfony/http-foundation": "~3.3",
-                "symfony/http-kernel": "~3.3",
-                "symfony/process": "~3.3",
-                "symfony/routing": "~3.3",
-                "symfony/var-dumper": "~3.3",
-                "tijsverkoyen/css-to-inline-styles": "~2.2",
+                "symfony/console": "~4.0",
+                "symfony/debug": "~4.0",
+                "symfony/finder": "~4.0",
+                "symfony/http-foundation": "~4.0",
+                "symfony/http-kernel": "~4.0",
+                "symfony/process": "~4.0",
+                "symfony/routing": "~4.0",
+                "symfony/var-dumper": "~4.0",
+                "tijsverkoyen/css-to-inline-styles": "^2.2.1",
                 "vlucas/phpdotenv": "~2.2"
             },
+            "conflict": {
+                "tightenco/collect": "<5.5.33"
+            },
             "replace": {
                 "illuminate/auth": "self.version",
                 "illuminate/broadcasting": "self.version",
@@ -653,44 +761,46 @@
                 "illuminate/support": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version",
-                "tightenco/collect": "<5.5.33"
+                "illuminate/view": "self.version"
             },
             "require-dev": {
                 "aws/aws-sdk-php": "~3.0",
-                "doctrine/dbal": "~2.5",
+                "doctrine/dbal": "~2.6",
                 "filp/whoops": "^2.1.4",
+                "league/flysystem-cached-adapter": "~1.0",
                 "mockery/mockery": "~1.0",
-                "orchestra/testbench-core": "3.5.*",
+                "moontoast/math": "^1.1",
+                "orchestra/testbench-core": "3.6.*",
                 "pda/pheanstalk": "~3.0",
-                "phpunit/phpunit": "~6.0",
+                "phpunit/phpunit": "~7.0",
                 "predis/predis": "^1.1.1",
-                "symfony/css-selector": "~3.3",
-                "symfony/dom-crawler": "~3.3"
+                "symfony/css-selector": "~4.0",
+                "symfony/dom-crawler": "~4.0"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
+                "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).",
                 "ext-pcntl": "Required to use all features of the queue worker.",
                 "ext-posix": "Required to use all features of the queue worker.",
                 "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
                 "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
                 "laravel/tinker": "Required to use the tinker console command (~1.0).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-                "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
+                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
                 "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).",
                 "nexmo/client": "Required to use the Nexmo transport (~1.0).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
                 "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
-                "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).",
-                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).",
+                "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).",
+                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).",
                 "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.5-dev"
+                    "dev-master": "5.6-dev"
                 }
             },
             "autoload": {
@@ -718,39 +828,39 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-09-02T11:45:05+00:00"
+            "time": "2018-10-04T14:50:41+00:00"
         },
         {
             "name": "laravelcollective/html",
-            "version": "v5.5.4",
+            "version": "v5.6.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "04c596a69975b901f2223eb6eb4adf55354121c2"
+                "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/04c596a69975b901f2223eb6eb4adf55354121c2",
-                "reference": "04c596a69975b901f2223eb6eb4adf55354121c2",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
+                "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
                 "shasum": ""
             },
             "require": {
-                "illuminate/http": "5.5.*",
-                "illuminate/routing": "5.5.*",
-                "illuminate/session": "5.5.*",
-                "illuminate/support": "5.5.*",
-                "illuminate/view": "5.5.*",
-                "php": ">=7.0.0"
+                "illuminate/http": "5.6.*",
+                "illuminate/routing": "5.6.*",
+                "illuminate/session": "5.6.*",
+                "illuminate/support": "5.6.*",
+                "illuminate/view": "5.6.*",
+                "php": ">=7.1.3"
             },
             "require-dev": {
-                "illuminate/database": "5.5.*",
-                "mockery/mockery": "~0.9.4",
-                "phpunit/phpunit": "~5.4"
+                "illuminate/database": "5.6.*",
+                "mockery/mockery": "~1.0",
+                "phpunit/phpunit": "~7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.5-dev"
+                    "dev-master": "5.6-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -770,7 +880,7 @@
                     "src/helpers.php"
                 ]
             },
-            "notification-url": "http://87.98.253.214/downloads/",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -786,20 +896,20 @@
             ],
             "description": "HTML and Form Builders for the Laravel Framework",
             "homepage": "https://laravelcollective.com",
-            "time": "2018-03-24T00:39:21+00:00"
+            "time": "2018-06-18T15:04:16+00:00"
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.47",
+            "version": "1.0.49",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c"
+                "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a11e4a75f256bdacf99d20780ce42d3b8272975c",
-                "reference": "a11e4a75f256bdacf99d20780ce42d3b8272975c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd",
+                "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd",
                 "shasum": ""
             },
             "require": {
@@ -870,7 +980,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2018-09-14T15:30:29+00:00"
+            "time": "2018-11-23T23:41:29+00:00"
         },
         {
             "name": "league/fractal",
@@ -990,16 +1100,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
                 "shasum": ""
             },
             "require": {
@@ -1064,64 +1174,20 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
-        },
-        {
-            "name": "mtdowling/cron-expression",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mtdowling/cron-expression.git",
-                "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad",
-                "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Cron\\": "src/Cron/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due",
-            "keywords": [
-                "cron",
-                "schedule"
-            ],
-            "time": "2017-01-23T04:29:33+00:00"
+            "time": "2018-11-05T09:00:11+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.33.0",
+            "version": "1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "55667c1007a99e82030874b1bb14d24d07108413"
+                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/55667c1007a99e82030874b1bb14d24d07108413",
-                "reference": "55667c1007a99e82030874b1bb14d24d07108413",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4",
+                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4",
                 "shasum": ""
             },
             "require": {
@@ -1134,15 +1200,13 @@
             },
             "type": "library",
             "extra": {
-                "laravel": {
-                    "providers": [
-                        "Carbon\\Laravel\\ServiceProvider"
-                    ]
+                "branch-alias": {
+                    "dev-master": "1.23-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "": "src/"
+                    "Carbon\\": "src/Carbon/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1163,7 +1227,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-08-07T08:39:47+00:00"
+            "time": "2018-03-19T15:50:49+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1311,16 +1375,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -1354,7 +1418,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -1405,6 +1469,46 @@
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
+            "name": "ralouphie/getallheaders",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.0",
+                "satooshi/php-coveralls": ">=1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2016-02-11T07:05:27+00:00"
+        },
+        {
             "name": "ramsey/uuid",
             "version": "3.8.0",
             "source": {
@@ -1544,16 +1648,16 @@
         },
         {
             "name": "spatie/fractalistic",
-            "version": "2.7.1",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/fractalistic.git",
-                "reference": "83e208ce1e6061aa75d22c4efdab05ccfb99a849"
+                "reference": "5b5710b748beb2c1d5c272f4d3598d44b5b59fc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/fractalistic/zipball/83e208ce1e6061aa75d22c4efdab05ccfb99a849",
-                "reference": "83e208ce1e6061aa75d22c4efdab05ccfb99a849",
+                "url": "https://api.github.com/repos/spatie/fractalistic/zipball/5b5710b748beb2c1d5c272f4d3598d44b5b59fc9",
+                "reference": "5b5710b748beb2c1d5c272f4d3598d44b5b59fc9",
                 "shasum": ""
             },
             "require": {
@@ -1591,24 +1695,25 @@
                 "spatie",
                 "transform"
             ],
-            "time": "2018-01-15T09:17:52+00:00"
+            "time": "2018-10-08T09:18:33+00:00"
         },
         {
             "name": "spatie/laravel-fractal",
-            "version": "5.4.1",
+            "version": "5.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-fractal.git",
-                "reference": "0f18df001833fc82e6502229565347290cecda85"
+                "reference": "2931881cac3155ceb798f2fd1e55bd152576682b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/0f18df001833fc82e6502229565347290cecda85",
-                "reference": "0f18df001833fc82e6502229565347290cecda85",
+                "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/2931881cac3155ceb798f2fd1e55bd152576682b",
+                "reference": "2931881cac3155ceb798f2fd1e55bd152576682b",
                 "shasum": ""
             },
             "require": {
-                "laravel/framework": "~5.5.0|~5.6.0|~5.7.0",
+                "illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0",
+                "illuminate/support": "~5.5.0|~5.6.0|~5.7.0",
                 "php": "^7.0",
                 "spatie/fractalistic": "^2.5"
             },
@@ -1658,7 +1763,7 @@
                 "spatie",
                 "transform"
             ],
-            "time": "2018-08-24T09:21:38+00:00"
+            "time": "2018-09-28T16:17:34+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -1721,21 +1826,21 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
+                "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
+                "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0",
+                "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
@@ -1744,11 +1849,11 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
+                "symfony/config": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/event-dispatcher": "~3.4|~4.0",
                 "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
+                "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log-implementation": "For using the console logger",
@@ -1759,7 +1864,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1786,29 +1891,97 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-11-27T07:40:44+00:00"
+        },
+        {
+            "name": "symfony/contracts",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/contracts.git",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "psr/cache": "^1.0",
+                "psr/container": "^1.0"
+            },
+            "suggest": {
+                "psr/cache": "When using the Cache contracts",
+                "psr/container": "When using the Service contracts",
+                "symfony/cache-contracts-implementation": "",
+                "symfony/service-contracts-implementation": "",
+                "symfony/translation-contracts-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\": ""
+                },
+                "exclude-from-classmap": [
+                    "**/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A set of abstractions extracted out of the Symfony components",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2018-12-05T08:06:11+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416"
+                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
+                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1839,36 +2012,36 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd"
+                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/c4625e75341e4fb309ce0c049cbf7fb84b8897cd",
-                "reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276",
+                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "psr/log": "~1.0"
             },
             "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+                "symfony/http-kernel": "<3.4"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
+                "symfony/http-kernel": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1895,34 +2068,35 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-03T10:42:44+00:00"
+            "time": "2018-11-28T18:24:18+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
+                "reference": "921f49c3158a276d27c0d770a5a347a3b718b328"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328",
+                "reference": "921f49c3158a276d27c0d770a5a347a3b718b328",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0"
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/stopwatch": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -1931,7 +2105,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1958,29 +2132,29 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2018-12-01T08:52:38+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a"
+                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a",
-                "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
+                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2007,34 +2181,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-11-11T19:52:12+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "2fb33cb6eefe6e790e4023f7c534a9e4214252fc"
+                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2fb33cb6eefe6e790e4023f7c534a9e4214252fc",
-                "reference": "2fb33cb6eefe6e790e4023f7c534a9e4214252fc",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
+                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php70": "~1.6"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0|~4.0"
+                "predis/predis": "~1.0",
+                "symfony/expression-language": "~3.4|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2061,34 +2235,36 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-27T17:45:33+00:00"
+            "time": "2018-11-26T10:55:26+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "2819693b25f480966cbfa13b651abccfed4871ca"
+                "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2819693b25f480966cbfa13b651abccfed4871ca",
-                "reference": "2819693b25f480966cbfa13b651abccfed4871ca",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624",
+                "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "psr/log": "~1.0",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1",
+                "symfony/contracts": "^1.0.2",
+                "symfony/debug": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~4.1",
+                "symfony/http-foundation": "^4.1.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
-                "symfony/config": "<2.8",
-                "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4",
-                "symfony/var-dumper": "<3.3",
+                "symfony/config": "<3.4",
+                "symfony/dependency-injection": "<4.2",
+                "symfony/translation": "<4.2",
+                "symfony/var-dumper": "<4.1.1",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
             "provide": {
@@ -2096,34 +2272,32 @@
             },
             "require-dev": {
                 "psr/cache": "~1.0",
-                "symfony/browser-kit": "~2.8|~3.0|~4.0",
-                "symfony/class-loader": "~2.8|~3.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/console": "~2.8|~3.0|~4.0",
-                "symfony/css-selector": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "^3.4.10|^4.0.10",
-                "symfony/dom-crawler": "~2.8|~3.0|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/finder": "~2.8|~3.0|~4.0",
-                "symfony/process": "~2.8|~3.0|~4.0",
+                "symfony/browser-kit": "~3.4|~4.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/console": "~3.4|~4.0",
+                "symfony/css-selector": "~3.4|~4.0",
+                "symfony/dependency-injection": "^4.2",
+                "symfony/dom-crawler": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/finder": "~3.4|~4.0",
+                "symfony/process": "~3.4|~4.0",
                 "symfony/routing": "~3.4|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0",
-                "symfony/templating": "~2.8|~3.0|~4.0",
-                "symfony/translation": "~2.8|~3.0|~4.0",
-                "symfony/var-dumper": "~3.3|~4.0"
+                "symfony/stopwatch": "~3.4|~4.0",
+                "symfony/templating": "~3.4|~4.0",
+                "symfony/translation": "~4.2",
+                "symfony/var-dumper": "^4.1.1"
             },
             "suggest": {
                 "symfony/browser-kit": "",
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
-                "symfony/finder": "",
                 "symfony/var-dumper": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2150,11 +2324,11 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-28T06:06:12+00:00"
+            "time": "2018-12-06T17:39:52+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -2212,16 +2386,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
                 "shasum": ""
             },
             "require": {
@@ -2267,24 +2441,23 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.9.0",
+            "name": "symfony/polyfill-php72",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
-                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
                 "php": ">=5.3.3"
             },
             "type": "library",
@@ -2295,13 +2468,10 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
+                    "Symfony\\Polyfill\\Php72\\": ""
                 },
                 "files": [
                     "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2318,7 +2488,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -2326,29 +2496,29 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7"
+                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4d6b125d5293cbceedc2aa10f2c71617e76262e7",
-                "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0",
+                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2375,37 +2545,37 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-08-03T10:42:44+00:00"
+            "time": "2018-11-20T16:22:05+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911"
+                "reference": "649460207e77da6c545326c7f53618d23ad2c866"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e20f4bb79502c3c0db86d572f7683a30d4143911",
-                "reference": "e20f4bb79502c3c0db86d572f7683a30d4143911",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866",
+                "reference": "649460207e77da6c545326c7f53618d23ad2c866",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3"
             },
             "conflict": {
-                "symfony/config": "<3.3.1",
-                "symfony/dependency-injection": "<3.3",
+                "symfony/config": "<4.2",
+                "symfony/dependency-injection": "<3.4",
                 "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "psr/log": "~1.0",
-                "symfony/config": "^3.3.1|~4.0",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/config": "~4.2",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/http-foundation": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
@@ -2419,7 +2589,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2452,37 +2622,42 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-12-03T22:08:12+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "9749930bfc825139aadd2d28461ddbaed6577862"
+                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/9749930bfc825139aadd2d28461ddbaed6577862",
-                "reference": "9749930bfc825139aadd2d28461ddbaed6577862",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6",
+                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
+                "symfony/contracts": "^1.0.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/config": "<2.8",
+                "symfony/config": "<3.4",
                 "symfony/dependency-injection": "<3.4",
                 "symfony/yaml": "<3.4"
             },
+            "provide": {
+                "symfony/translation-contracts-implementation": "1.0"
+            },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/console": "~3.4|~4.0",
                 "symfony/dependency-injection": "~3.4|~4.0",
                 "symfony/finder": "~2.8|~3.0|~4.0",
-                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/intl": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
@@ -2493,7 +2668,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2520,42 +2695,48 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-12-06T10:45:32+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3"
+                "reference": "db61258540350725f4beb6b84006e32398acd120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f62a394bd3de96f2f5e8f4c7d685035897fb3cb3",
-                "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120",
+                "reference": "db61258540350725f4beb6b84006e32398acd120",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php72": "~1.5"
             },
             "conflict": {
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
+                "symfony/console": "<3.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
+                "symfony/process": "~3.4|~4.0",
                 "twig/twig": "~1.34|~2.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
                 "ext-intl": "To show region name in time zone dump",
-                "ext-symfony_debug": ""
+                "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
             },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -2589,7 +2770,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-07-26T11:19:56+00:00"
+            "time": "2018-11-25T12:50:42+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -2640,16 +2821,16 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.5.1",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
+                "reference": "cfd5dc225767ca154853752abc93aeec040fcf36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36",
+                "reference": "cfd5dc225767ca154853752abc93aeec040fcf36",
                 "shasum": ""
             },
             "require": {
@@ -2686,22 +2867,22 @@
                 "env",
                 "environment"
             ],
-            "time": "2018-07-29T20:33:41+00:00"
+            "time": "2018-10-30T17:29:25+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0"
+                "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/5b68f3972083a7eeec0d6f161962fcda71a127c0",
-                "reference": "5b68f3972083a7eeec0d6f161962fcda71a127c0",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9d5caf43c5f3a3aea2178942f281054805872e7c",
+                "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c",
                 "shasum": ""
             },
             "require": {
@@ -2756,36 +2937,36 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2018-08-22T11:06:19+00:00"
+            "time": "2018-11-09T08:37:55+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1"
             },
             "require-dev": {
                 "athletic/athletic": "~0.1.8",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -2810,7 +2991,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2017-07-22T11:58:36+00:00"
         },
         {
             "name": "fzaninotto/faker",
@@ -2912,26 +3093,26 @@
         },
         {
             "name": "johnkary/phpunit-speedtrap",
-            "version": "v2.0.0",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnkary/phpunit-speedtrap.git",
-                "reference": "a1e39e0e3d07e0faee4ef3f342229d68fab07b5f"
+                "reference": "5f1ede99bd53fd0e5ff72669877420e801256d90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/a1e39e0e3d07e0faee4ef3f342229d68fab07b5f",
-                "reference": "a1e39e0e3d07e0faee4ef3f342229d68fab07b5f",
+                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/5f1ede99bd53fd0e5ff72669877420e801256d90",
+                "reference": "5f1ede99bd53fd0e5ff72669877420e801256d90",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0",
-                "phpunit/phpunit": "^6.0"
+                "php": ">=7.1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2939,7 +3120,7 @@
                     "JohnKary\\PHPUnit\\Listener\\": "src/"
                 }
             },
-            "notification-url": "http://87.98.253.214/downloads/",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -2956,32 +3137,34 @@
                 "profile",
                 "slow"
             ],
-            "time": "2017-12-06T15:14:00+00:00"
+            "time": "2018-02-24T18:55:28+00:00"
         },
         {
             "name": "laravel/browser-kit-testing",
-            "version": "2.0.x-dev",
+            "version": "v4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/browser-kit-testing.git",
-                "reference": "167d459a8b7a1b93b00df675746dccfa1655ef78"
+                "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/167d459a8b7a1b93b00df675746dccfa1655ef78",
-                "reference": "167d459a8b7a1b93b00df675746dccfa1655ef78",
+                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/550319e457aadc11c183bd6a1c46d225cf94fbaf",
+                "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "phpunit/phpunit": "~6.0",
-                "symfony/css-selector": "~3.1",
-                "symfony/dom-crawler": "~3.1"
+                "illuminate/support": "^5.6",
+                "mockery/mockery": "^1.0",
+                "php": ">=7.1.3",
+                "phpunit/phpunit": "^7.0",
+                "symfony/css-selector": "~4.0",
+                "symfony/dom-crawler": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -3004,25 +3187,25 @@
                 "laravel",
                 "testing"
             ],
-            "time": "2017-10-12T20:09:38+00:00"
+            "time": "2018-10-31T17:30:20+00:00"
         },
         {
             "name": "luthfi/simple-crud-generator",
-            "version": "1.2.9",
+            "version": "1.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nafiesl/SimpleCrudGenerator.git",
-                "reference": "7d6211f13f538e74d83c9b70363349f2131c3cee"
+                "reference": "d9a97c68546c4ef07d342fb8d6e357bdbf0945b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nafiesl/SimpleCrudGenerator/zipball/7d6211f13f538e74d83c9b70363349f2131c3cee",
-                "reference": "7d6211f13f538e74d83c9b70363349f2131c3cee",
+                "url": "https://api.github.com/repos/nafiesl/SimpleCrudGenerator/zipball/d9a97c68546c4ef07d342fb8d6e357bdbf0945b3",
+                "reference": "d9a97c68546c4ef07d342fb8d6e357bdbf0945b3",
                 "shasum": ""
             },
             "require": {
                 "illuminate/support": "5.5.* || 5.6.* || 5.7.*",
-                "laravel/browser-kit-testing": "^2.0 || ^4.0",
+                "laravel/browser-kit-testing": "2.0.x-dev || ^4.0",
                 "php": ">=7.0.0"
             },
             "require-dev": {
@@ -3060,7 +3243,7 @@
                 "tdd-workflow",
                 "testing"
             ],
-            "time": "2018-11-24T01:11:20+00:00"
+            "time": "2018-12-27T07:11:17+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -3125,16 +3308,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99"
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
                 "shasum": ""
             },
             "require": {
@@ -3143,8 +3326,7 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpdocumentor/phpdocumentor": "^2.9",
-                "phpunit/phpunit": "~5.7.10|~6.5"
+                "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
             },
             "type": "library",
             "extra": {
@@ -3187,29 +3369,32 @@
                 "test double",
                 "testing"
             ],
-            "time": "2018-05-08T08:54:48+00:00"
+            "time": "2018-10-02T21:52:37+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.7.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
             },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "autoload": {
@@ -3232,26 +3417,26 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-10-19T19:58:43+00:00"
+            "time": "2018-06-11T23:09:50+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
+                "phar-io/version": "^2.0",
                 "php": "^5.6 || ^7.0"
             },
             "type": "library",
@@ -3287,20 +3472,20 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
+            "time": "2018-07-08T19:23:20+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
                 "shasum": ""
             },
             "require": {
@@ -3334,7 +3519,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
+            "time": "2018-07-08T19:19:57+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -3553,40 +3738,40 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "5.3.2",
+            "version": "6.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0",
-                "phpunit/php-file-iterator": "^1.4.2",
+                "php": "^7.1",
+                "phpunit/php-file-iterator": "^2.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0.1",
+                "phpunit/php-token-stream": "^3.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.0",
+                "sebastian/environment": "^3.1 || ^4.0",
                 "sebastian/version": "^2.0.1",
                 "theseer/tokenizer": "^1.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^7.0"
             },
             "suggest": {
-                "ext-xdebug": "^2.5.5"
+                "ext-xdebug": "^2.6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.3.x-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -3594,7 +3779,7 @@
                     "src/"
                 ]
             },
-            "notification-url": "http://87.98.253.214/downloads/",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
@@ -3612,29 +3797,32 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-06T15:36:58+00:00"
+            "time": "2018-10-31T16:06:48+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+                "reference": "050bedf145a257b1ff02746c31894800e5122946"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
+                "reference": "050bedf145a257b1ff02746c31894800e5122946",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3649,7 +3837,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -3659,7 +3847,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2017-11-27T13:52:08+00:00"
+            "time": "2018-09-13T20:33:42+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -3704,28 +3892,28 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.9",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
+                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3740,7 +3928,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -3749,33 +3937,33 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "time": "2018-02-01T13:07:23+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "2.0.2",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
+                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -3798,57 +3986,57 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-11-27T05:48:46+00:00"
+            "time": "2018-10-30T05:52:18+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.5.13",
+            "version": "7.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693"
+                "reference": "c23d78776ad415d5506e0679723cb461d71f488f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693",
-                "reference": "0973426fb012359b2f18d3bd1e90ef1172839693",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c23d78776ad415d5506e0679723cb461d71f488f",
+                "reference": "c23d78776ad415d5506e0679723cb461d71f488f",
                 "shasum": ""
             },
             "require": {
+                "doctrine/instantiator": "^1.1",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.0",
+                "myclabs/deep-copy": "^1.7",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
+                "php": "^7.1",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-code-coverage": "^6.0.7",
+                "phpunit/php-file-iterator": "^2.0.1",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.9",
-                "sebastian/comparator": "^2.1",
-                "sebastian/diff": "^2.0",
-                "sebastian/environment": "^3.1",
+                "phpunit/php-timer": "^2.0",
+                "sebastian/comparator": "^3.0",
+                "sebastian/diff": "^3.0",
+                "sebastian/environment": "^4.0",
                 "sebastian/exporter": "^3.1",
                 "sebastian/global-state": "^2.0",
                 "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
+                "sebastian/resource-operations": "^2.0",
                 "sebastian/version": "^2.0.1"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2",
-                "phpunit/dbunit": "<3.0"
+                "phpunit/phpunit-mock-objects": "*"
             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
+                "ext-soap": "*",
                 "ext-xdebug": "*",
-                "phpunit/php-invoker": "^1.1"
+                "phpunit/php-invoker": "^2.0"
             },
             "bin": [
                 "phpunit"
@@ -3856,7 +4044,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.5.x-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -3882,66 +4070,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-09-08T15:10:43+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "reference": "cd1cf05c553ecfec36b170070573e540b67d3f1f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.5.11"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2018-08-09T05:50:03+00:00"
+            "time": "2018-12-12T07:20:32+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -3990,30 +4119,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.1.3",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
+                "php": "^7.1",
+                "sebastian/diff": "^3.0",
                 "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4050,32 +4179,33 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-02-01T13:46:46+00:00"
+            "time": "2018-07-12T15:12:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "2.0.1",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
+                "reference": "366541b989927187c4ca70490a35615d3fef2dce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
+                "reference": "366541b989927187c4ca70490a35615d3fef2dce",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2"
+                "phpunit/phpunit": "^7.0",
+                "symfony/process": "^2 || ^3.3 || ^4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4100,34 +4230,37 @@
             "description": "Diff implementation",
             "homepage": "https://github.com/sebastianbergmann/diff",
             "keywords": [
-                "diff"
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
             ],
-            "time": "2017-08-03T08:09:46+00:00"
+            "time": "2018-06-10T07:54:39+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "3.1.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
+                "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f",
+                "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.1"
+                "phpunit/phpunit": "^7.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4152,7 +4285,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2017-07-01T08:51:00+00:00"
+            "time": "2018-11-25T09:31:21+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -4419,25 +4552,25 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4457,7 +4590,7 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "time": "2018-10-04T04:07:39+00:00"
         },
         {
             "name": "sebastian/version",
@@ -4504,25 +4637,25 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.15",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "452bfc854b60134438e3824b159b0d24a5892331"
+                "reference": "7438a32108fdd555295f443605d6de2cce473159"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/452bfc854b60134438e3824b159b0d24a5892331",
-                "reference": "452bfc854b60134438e3824b159b0d24a5892331",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159",
+                "reference": "7438a32108fdd555295f443605d6de2cce473159",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8",
+                "php": "^7.1.3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0|~4.0"
+                "symfony/css-selector": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
@@ -4530,7 +4663,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -4557,7 +4690,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T10:03:52+00:00"
+            "time": "2018-11-26T10:55:26+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -4601,20 +4734,21 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.6",
@@ -4647,18 +4781,16 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "time": "2018-12-25T11:19:39+00:00"
         }
     ],
     "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "laravel/browser-kit-testing": 20
-    },
-    "prefer-stable": false,
+    "minimum-stability": "dev",
+    "stability-flags": [],
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.0.0"
+        "php": "^7.1.3"
     },
     "platform-dev": []
 }

From d8d6f5353729136f333803db99aab6d96e13bea7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 6 Jan 2019 23:44:08 +0800
Subject: [PATCH 017/113] Add required files for laravel 5.6

Update .env.example file
---
 .env.example                         | 12 ++++-
 app/Http/Middleware/TrustProxies.php | 23 +++++++++
 config/hashing.php                   | 52 ++++++++++++++++++++
 config/logging.php                   | 92 ++++++++++++++++++++++++++++++++++++
 4 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Middleware/TrustProxies.php
 create mode 100644 config/hashing.php
 create mode 100644 config/logging.php

diff --git a/.env.example b/.env.example
index 79cbab6..7d57191 100644
--- a/.env.example
+++ b/.env.example
@@ -1,9 +1,11 @@
+APP_NAME="Free-PMO"
 APP_ENV=local
 APP_KEY=SomeRandomString
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
+LOG_CHANNEL=stack
 APP_TIMEZONE=Asia/Makassar
 
 DB_CONNECTION=mysql
@@ -28,4 +30,12 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM=null
-MAIL_NAME=null
\ No newline at end of file
+MAIL_NAME=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
\ No newline at end of file
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
new file mode 100644
index 0000000..7daf51f
--- /dev/null
+++ b/app/Http/Middleware/TrustProxies.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Fideloper\Proxy\TrustProxies as Middleware;
+
+class TrustProxies extends Middleware
+{
+    /**
+     * The trusted proxies for this application.
+     *
+     * @var array
+     */
+    protected $proxies;
+
+    /**
+     * The headers that should be used to detect proxies.
+     *
+     * @var int
+     */
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+}
diff --git a/config/hashing.php b/config/hashing.php
new file mode 100644
index 0000000..8425770
--- /dev/null
+++ b/config/hashing.php
@@ -0,0 +1,52 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Hash Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default hash driver that will be used to hash
+    | passwords for your application. By default, the bcrypt algorithm is
+    | used; however, you remain free to modify this option if you wish.
+    |
+    | Supported: "bcrypt", "argon", "argon2id"
+    |
+    */
+
+    'driver' => 'bcrypt',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Bcrypt Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Bcrypt algorithm. This will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'bcrypt' => [
+        'rounds' => env('BCRYPT_ROUNDS', 10),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Argon Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Argon algorithm. These will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'argon' => [
+        'memory' => 1024,
+        'threads' => 2,
+        'time' => 2,
+    ],
+
+];
diff --git a/config/logging.php b/config/logging.php
new file mode 100644
index 0000000..296e0ee
--- /dev/null
+++ b/config/logging.php
@@ -0,0 +1,92 @@
+<?php
+
+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option defines the default log channel that gets used when writing
+    | messages to the logs. The name specified in this option should match
+    | one of the channels defined in the "channels" configuration array.
+    |
+    */
+
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Channels
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log channels for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Drivers: "single", "daily", "slack", "syslog",
+    |                    "errorlog", "monolog",
+    |                    "custom", "stack"
+    |
+    */
+
+    'channels' => [
+        'stack' => [
+            'driver' => 'stack',
+            'channels' => ['daily'],
+        ],
+
+        'single' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+        ],
+
+        'daily' => [
+            'driver' => 'daily',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' => 30,
+        ],
+
+        'slack' => [
+            'driver' => 'slack',
+            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'username' => 'Laravel Log',
+            'emoji' => ':boom:',
+            'level' => 'critical',
+        ],
+
+        'papertrail' => [
+            'driver'  => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
+        'stderr' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'with' => [
+                'stream' => 'php://stderr',
+            ],
+        ],
+
+        'syslog' => [
+            'driver' => 'syslog',
+            'level' => 'debug',
+        ],
+
+        'errorlog' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
+        ],
+    ],
+
+];

From 2f90b5a33f223e14a1a1cbf25d4def381b9b9547 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 6 Jan 2019 23:44:23 +0800
Subject: [PATCH 018/113] Make all tests passed

---
 tests/TestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 8ad9de8..e6f1e4b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -33,7 +33,7 @@ abstract class TestCase extends BaseTestCase
         return $user;
     }
 
-    protected function assertFileExistsThenDelete($filePath, $message = null)
+    protected function assertFileExistsThenDelete($filePath, $message = '')
     {
         $this->assertTrue(file_exists($filePath), $message);
 

From fa48494e58eeb2ff57c048ba127b3be5369ace0b Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 6 Jan 2019 23:47:06 +0800
Subject: [PATCH 019/113] Update to laravel 5.7.19

---
 composer.json |   2 +-
 composer.lock | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 593 insertions(+), 70 deletions(-)

diff --git a/composer.json b/composer.json
index 099df33..0c09c6f 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "guzzlehttp/guzzle": "^6.3",
         "laracasts/presenter": "^0.2.1",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "luthfi/formfield": "^1.0",
         "riskihajar/terbilang": "^1.2",
         "spatie/laravel-fractal": "^5.0"
diff --git a/composer.lock b/composer.lock
index 248098c..96df60d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "05b18dbb1dd1c347bb90c8f5299db327",
+    "content-hash": "4f57d0f6138f93e0af94540526a4b219",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -693,42 +693,45 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.6.39",
+            "version": "v5.7.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "37bb306f516669ab4f888c16003f694313ab299e"
+                "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/37bb306f516669ab4f888c16003f694313ab299e",
-                "reference": "37bb306f516669ab4f888c16003f694313ab299e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/5c1d1ec7e8563ea31826fd5eb3f6791acf01160c",
+                "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "~1.1",
-                "dragonmantank/cron-expression": "~2.0",
-                "erusev/parsedown": "~1.7",
+                "doctrine/inflector": "^1.1",
+                "dragonmantank/cron-expression": "^2.0",
+                "erusev/parsedown": "^1.7",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
+                "laravel/nexmo-notification-channel": "^1.0",
+                "laravel/slack-notification-channel": "^1.0",
                 "league/flysystem": "^1.0.8",
-                "monolog/monolog": "~1.12",
-                "nesbot/carbon": "1.25.*",
+                "monolog/monolog": "^1.12",
+                "nesbot/carbon": "^1.26.3",
+                "opis/closure": "^3.1",
                 "php": "^7.1.3",
-                "psr/container": "~1.0",
+                "psr/container": "^1.0",
                 "psr/simple-cache": "^1.0",
                 "ramsey/uuid": "^3.7",
-                "swiftmailer/swiftmailer": "~6.0",
-                "symfony/console": "~4.0",
-                "symfony/debug": "~4.0",
-                "symfony/finder": "~4.0",
-                "symfony/http-foundation": "~4.0",
-                "symfony/http-kernel": "~4.0",
-                "symfony/process": "~4.0",
-                "symfony/routing": "~4.0",
-                "symfony/var-dumper": "~4.0",
+                "swiftmailer/swiftmailer": "^6.0",
+                "symfony/console": "^4.1",
+                "symfony/debug": "^4.1",
+                "symfony/finder": "^4.1",
+                "symfony/http-foundation": "^4.1",
+                "symfony/http-kernel": "^4.1",
+                "symfony/process": "^4.1",
+                "symfony/routing": "^4.1",
+                "symfony/var-dumper": "^4.1",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.1",
-                "vlucas/phpdotenv": "~2.2"
+                "vlucas/phpdotenv": "^2.2"
             },
             "conflict": {
                 "tightenco/collect": "<5.5.33"
@@ -764,43 +767,47 @@
                 "illuminate/view": "self.version"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~3.0",
-                "doctrine/dbal": "~2.6",
+                "aws/aws-sdk-php": "^3.0",
+                "doctrine/dbal": "^2.6",
                 "filp/whoops": "^2.1.4",
-                "league/flysystem-cached-adapter": "~1.0",
-                "mockery/mockery": "~1.0",
+                "guzzlehttp/guzzle": "^6.3",
+                "league/flysystem-cached-adapter": "^1.0",
+                "mockery/mockery": "^1.0",
                 "moontoast/math": "^1.1",
-                "orchestra/testbench-core": "3.6.*",
-                "pda/pheanstalk": "~3.0",
-                "phpunit/phpunit": "~7.0",
+                "orchestra/testbench-core": "3.7.*",
+                "pda/pheanstalk": "^3.0",
+                "phpunit/phpunit": "^7.0",
                 "predis/predis": "^1.1.1",
-                "symfony/css-selector": "~4.0",
-                "symfony/dom-crawler": "~4.0"
+                "symfony/css-selector": "^4.1",
+                "symfony/dom-crawler": "^4.1",
+                "true/punycode": "^2.1"
             },
             "suggest": {
-                "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).",
+                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
                 "ext-pcntl": "Required to use all features of the queue worker.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
-                "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
-                "laravel/tinker": "Required to use the tinker console command (~1.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
-                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
-                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).",
-                "nexmo/client": "Required to use the Nexmo transport (~1.0).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
-                "predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
-                "symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).",
-                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).",
-                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
+                "filp/whoops": "Required for friendly error pages in development (^2.1.4).",
+                "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).",
+                "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
+                "laravel/tinker": "Required to use the tinker console command (^1.0).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
+                "nexmo/client": "Required to use the Nexmo transport (^1.0).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^3.0).",
+                "predis/predis": "Required to use the redis cache and queue drivers (^1.0).",
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).",
+                "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.1).",
+                "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).",
+                "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -828,39 +835,153 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-10-04T14:50:41+00:00"
+            "time": "2018-12-18T14:00:38+00:00"
+        },
+        {
+            "name": "laravel/nexmo-notification-channel",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/nexmo-notification-channel.git",
+                "reference": "03edd42a55b306ff980c9950899d5a2b03260d48"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/nexmo-notification-channel/zipball/03edd42a55b306ff980c9950899d5a2b03260d48",
+                "reference": "03edd42a55b306ff980c9950899d5a2b03260d48",
+                "shasum": ""
+            },
+            "require": {
+                "nexmo/client": "^1.0",
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "illuminate/notifications": "~5.7",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Illuminate\\Notifications\\NexmoChannelServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Illuminate\\Notifications\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Nexmo Notification Channel for laravel.",
+            "keywords": [
+                "laravel",
+                "nexmo",
+                "notifications"
+            ],
+            "time": "2018-12-04T12:57:08+00:00"
+        },
+        {
+            "name": "laravel/slack-notification-channel",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/slack-notification-channel.git",
+                "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/6e164293b754a95f246faf50ab2bbea3e4923cc9",
+                "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": "^7.1.3"
+            },
+            "require-dev": {
+                "illuminate/notifications": "~5.7",
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Illuminate\\Notifications\\SlackChannelServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Illuminate\\Notifications\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Slack Notification Channel for laravel.",
+            "keywords": [
+                "laravel",
+                "notifications",
+                "slack"
+            ],
+            "time": "2018-12-12T13:12:06+00:00"
         },
         {
             "name": "laravelcollective/html",
-            "version": "v5.6.10",
+            "version": "v5.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
+                "reference": "777b6d390811ba249255ed5750bf17a019cd88a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
-                "reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/777b6d390811ba249255ed5750bf17a019cd88a5",
+                "reference": "777b6d390811ba249255ed5750bf17a019cd88a5",
                 "shasum": ""
             },
             "require": {
-                "illuminate/http": "5.6.*",
-                "illuminate/routing": "5.6.*",
-                "illuminate/session": "5.6.*",
-                "illuminate/support": "5.6.*",
-                "illuminate/view": "5.6.*",
+                "illuminate/http": "5.7.*",
+                "illuminate/routing": "5.7.*",
+                "illuminate/session": "5.7.*",
+                "illuminate/support": "5.7.*",
+                "illuminate/view": "5.7.*",
                 "php": ">=7.1.3"
             },
             "require-dev": {
-                "illuminate/database": "5.6.*",
+                "illuminate/database": "5.7.*",
                 "mockery/mockery": "~1.0",
                 "phpunit/phpunit": "~7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -896,7 +1017,65 @@
             ],
             "description": "HTML and Form Builders for the Laravel Framework",
             "homepage": "https://laravelcollective.com",
-            "time": "2018-06-18T15:04:16+00:00"
+            "time": "2018-09-05T18:32:53+00:00"
+        },
+        {
+            "name": "lcobucci/jwt",
+            "version": "3.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lcobucci/jwt.git",
+                "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/82be04b4753f8b7693b62852b7eab30f97524f9b",
+                "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "mdanter/ecc": "~0.3.1",
+                "mikey179/vfsstream": "~1.5",
+                "phpmd/phpmd": "~2.2",
+                "phpunit/php-invoker": "~1.1",
+                "phpunit/phpunit": "~4.5",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "suggest": {
+                "mdanter/ecc": "Required to use Elliptic Curves based algorithms."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Lcobucci\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Luís Otávio Cobucci Oblonczyk",
+                    "email": "lcobucci@gmail.com",
+                    "role": "developer"
+                }
+            ],
+            "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+            "keywords": [
+                "JWS",
+                "jwt"
+            ],
+            "time": "2018-11-11T12:22:26+00:00"
         },
         {
             "name": "league/flysystem",
@@ -1178,16 +1357,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.25.0",
+            "version": "1.36.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4"
+                "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cbcf13da0b531767e39eb86e9687f5deba9857b4",
-                "reference": "cbcf13da0b531767e39eb86e9687f5deba9857b4",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9",
+                "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9",
                 "shasum": ""
             },
             "require": {
@@ -1195,18 +1374,23 @@
                 "symfony/translation": "~2.6 || ~3.0 || ~4.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2",
                 "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
+            "suggest": {
+                "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.",
+                "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors."
+            },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.23-dev"
+                "laravel": {
+                    "providers": [
+                        "Carbon\\Laravel\\ServiceProvider"
+                    ]
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Carbon\\": "src/Carbon/"
+                    "": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1227,7 +1411,116 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-03-19T15:50:49+00:00"
+            "time": "2018-12-28T10:07:33+00:00"
+        },
+        {
+            "name": "nexmo/client",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Nexmo/nexmo-php.git",
+                "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/01809cc1e17a5af275913c49bb5d444eb6cc06d4",
+                "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4",
+                "shasum": ""
+            },
+            "require": {
+                "lcobucci/jwt": "^3.2",
+                "php": ">=5.6",
+                "php-http/client-implementation": "^1.0",
+                "php-http/guzzle6-adapter": "^1.0",
+                "zendframework/zend-diactoros": "^1.3"
+            },
+            "require-dev": {
+                "estahn/phpunit-json-assertions": "^1.0.0",
+                "php-http/mock-client": "^0.3.0",
+                "phpunit/phpunit": "^5.7",
+                "squizlabs/php_codesniffer": "^3.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Nexmo\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tim Lytle",
+                    "email": "tim@nexmo.com",
+                    "homepage": "http://twitter.com/tjlytle",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP Client for using Nexmo's API.",
+            "time": "2018-12-17T10:47:50+00:00"
+        },
+        {
+            "name": "opis/closure",
+            "version": "3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/opis/closure.git",
+                "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/opis/closure/zipball/de00c69a2328d3ee5baa71fc584dc643222a574c",
+                "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.4 || ^7.0"
+            },
+            "require-dev": {
+                "jeremeamia/superclosure": "^2.0",
+                "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Opis\\Closure\\": "src/"
+                },
+                "files": [
+                    "functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marius Sarca",
+                    "email": "marius.sarca@gmail.com"
+                },
+                {
+                    "name": "Sorin Sarca",
+                    "email": "sarca_sorin@hotmail.com"
+                }
+            ],
+            "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
+            "homepage": "https://opis.io/closure",
+            "keywords": [
+                "anonymous functions",
+                "closure",
+                "function",
+                "serializable",
+                "serialization",
+                "serialize"
+            ],
+            "time": "2018-12-16T21:48:23+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1275,6 +1568,172 @@
             "time": "2018-07-02T15:55:56+00:00"
         },
         {
+            "name": "php-http/guzzle6-adapter",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/guzzle6-adapter.git",
+                "reference": "a56941f9dc6110409cfcddc91546ee97039277ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab",
+                "reference": "a56941f9dc6110409cfcddc91546ee97039277ab",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=5.5.0",
+                "php-http/httplug": "^1.0"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "1.0",
+                "php-http/client-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "php-http/adapter-integration-tests": "^0.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Adapter\\Guzzle6\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "David de Boer",
+                    "email": "david@ddeboer.nl"
+                }
+            ],
+            "description": "Guzzle 6 HTTP Adapter",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "Guzzle",
+                "http"
+            ],
+            "time": "2016-05-10T06:13:32+00:00"
+        },
+        {
+            "name": "php-http/httplug",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/httplug.git",
+                "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
+                "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "php-http/promise": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTPlug, the HTTP client abstraction for PHP",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "client",
+                "http"
+            ],
+            "time": "2016-08-31T08:30:17+00:00"
+        },
+        {
+            "name": "php-http/promise",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/promise.git",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980",
+                "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980",
+                "shasum": ""
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Joel Wurtz",
+                    "email": "joel.wurtz@gmail.com"
+                }
+            ],
+            "description": "Promise used for asynchronous HTTP requests",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-01-26T13:27:02+00:00"
+        },
+        {
             "name": "psr/container",
             "version": "1.0.0",
             "source": {
@@ -2868,6 +3327,70 @@
                 "environment"
             ],
             "time": "2018-10-30T17:29:25+00:00"
+        },
+        {
+            "name": "zendframework/zend-diactoros",
+            "version": "1.8.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-diactoros.git",
+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
+                "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php-http/psr7-integration-tests": "dev-master",
+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
+                "zendframework/zend-coding-standard": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev",
+                    "dev-develop": "1.9.x-dev",
+                    "dev-release-2.0": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php"
+                ],
+                "psr-4": {
+                    "Zend\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://github.com/zendframework/zend-diactoros",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2018-09-05T19:29:37+00:00"
         }
     ],
     "packages-dev": [

From b49935a412fc9c322cf94c2674624450e7abe722 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 6 Jan 2019 23:56:21 +0800
Subject: [PATCH 020/113] Remove php 7.0 version from .travis.yml

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8ae92ee..092f4ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
 
 before_script:

From 846f8572805b458267a8470d0587b3abffdf8159 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 7 Jan 2019 22:34:56 +0800
Subject: [PATCH 021/113] Remove guzzle and composer update

---
 composer.json |   1 -
 composer.lock | 135 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/composer.json b/composer.json
index 0c09c6f..3589659 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,6 @@
     "require": {
         "php": "^7.1.3",
         "backup-manager/laravel": "^1.2",
-        "guzzlehttp/guzzle": "^6.3",
         "laracasts/presenter": "^0.2.1",
         "fideloper/proxy": "^4.0",
         "laravel/framework": "5.7.*",
diff --git a/composer.lock b/composer.lock
index 96df60d..0a78401 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4f57d0f6138f93e0af94540526a4b219",
+    "content-hash": "a298d20cfcff4c54b1cce7bb8db3515e",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -1463,16 +1463,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.1.2",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c"
+                "reference": "5e9095ce871a425ab87a854b285b7766de38a7d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/de00c69a2328d3ee5baa71fc584dc643222a574c",
-                "reference": "de00c69a2328d3ee5baa71fc584dc643222a574c",
+                "url": "https://api.github.com/repos/opis/closure/zipball/5e9095ce871a425ab87a854b285b7766de38a7d9",
+                "reference": "5e9095ce871a425ab87a854b285b7766de38a7d9",
                 "shasum": ""
             },
             "require": {
@@ -1485,7 +1485,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "3.1.x-dev"
                 }
             },
             "autoload": {
@@ -1520,7 +1520,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2018-12-16T21:48:23+00:00"
+            "time": "2019-01-06T22:07:38+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -2285,16 +2285,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0"
+                "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/4dff24e5d01e713818805c1862d2e3f901ee7dd0",
-                "reference": "4dff24e5d01e713818805c1862d2e3f901ee7dd0",
+                "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
+                "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
                 "shasum": ""
             },
             "require": {
@@ -2350,7 +2350,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-27T07:40:44+00:00"
+            "time": "2019-01-04T15:13:53+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -2422,16 +2422,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd"
+                "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
-                "reference": "aa9fa526ba1b2ec087ffdfb32753803d999fcfcd",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4",
+                "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4",
                 "shasum": ""
             },
             "require": {
@@ -2471,20 +2471,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276"
+                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/e0a2b92ee0b5b934f973d90c2f58e18af109d276",
-                "reference": "e0a2b92ee0b5b934f973d90c2f58e18af109d276",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
                 "shasum": ""
             },
             "require": {
@@ -2527,20 +2527,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-28T18:24:18+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "921f49c3158a276d27c0d770a5a347a3b718b328"
+                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/921f49c3158a276d27c0d770a5a347a3b718b328",
-                "reference": "921f49c3158a276d27c0d770a5a347a3b718b328",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
                 "shasum": ""
             },
             "require": {
@@ -2591,20 +2591,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-12-01T08:52:38+00:00"
+            "time": "2019-01-05T16:37:49+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d"
+                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
-                "reference": "e53d477d7b5c4982d0e1bfd2298dbee63d01441d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
+                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
                 "shasum": ""
             },
             "require": {
@@ -2640,20 +2640,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-11T19:52:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851"
+                "reference": "a633d422a09242064ba24e44a6e1494c5126de86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
-                "reference": "1b31f3017fadd8cb05cf2c8aebdbf3b12a943851",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
+                "reference": "a633d422a09242064ba24e44a6e1494c5126de86",
                 "shasum": ""
             },
             "require": {
@@ -2694,20 +2694,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T10:55:26+00:00"
+            "time": "2019-01-05T16:37:49+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624"
+                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b39ceffc0388232c309cbde3a7c3685f2ec0a624",
-                "reference": "b39ceffc0388232c309cbde3a7c3685f2ec0a624",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
+                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
                 "shasum": ""
             },
             "require": {
@@ -2783,7 +2783,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2018-12-06T17:39:52+00:00"
+            "time": "2019-01-06T16:19:23+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2959,16 +2959,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0"
+                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/2b341009ccec76837a7f46f59641b431e4d4c2b0",
-                "reference": "2b341009ccec76837a7f46f59641b431e4d4c2b0",
+                "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
+                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
                 "shasum": ""
             },
             "require": {
@@ -3004,20 +3004,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-20T16:22:05+00:00"
+            "time": "2019-01-03T14:48:52+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "649460207e77da6c545326c7f53618d23ad2c866"
+                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/649460207e77da6c545326c7f53618d23ad2c866",
-                "reference": "649460207e77da6c545326c7f53618d23ad2c866",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
+                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
                 "shasum": ""
             },
             "require": {
@@ -3081,20 +3081,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2018-12-03T22:08:12+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6"
+                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/c0e2191e9bed845946ab3d99767513b56ca7dcd6",
-                "reference": "c0e2191e9bed845946ab3d99767513b56ca7dcd6",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
+                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
                 "shasum": ""
             },
             "require": {
@@ -3154,20 +3154,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-12-06T10:45:32+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "db61258540350725f4beb6b84006e32398acd120"
+                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/db61258540350725f4beb6b84006e32398acd120",
-                "reference": "db61258540350725f4beb6b84006e32398acd120",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
+                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
                 "shasum": ""
             },
             "require": {
@@ -3181,6 +3181,7 @@
             },
             "require-dev": {
                 "ext-iconv": "*",
+                "symfony/console": "~3.4|~4.0",
                 "symfony/process": "~3.4|~4.0",
                 "twig/twig": "~1.34|~2.4"
             },
@@ -3229,7 +3230,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-11-25T12:50:42+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -5160,16 +5161,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.2.1",
+            "version": "v4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "7438a32108fdd555295f443605d6de2cce473159"
+                "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7438a32108fdd555295f443605d6de2cce473159",
-                "reference": "7438a32108fdd555295f443605d6de2cce473159",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
+                "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
                 "shasum": ""
             },
             "require": {
@@ -5213,7 +5214,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-11-26T10:55:26+00:00"
+            "time": "2019-01-03T09:07:35+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 2205b77502dd428d30626971dc8f3853874bbf59 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 7 Jan 2019 22:37:58 +0800
Subject: [PATCH 022/113] Update README on requirement section

---
 README.id.md | 4 ++--
 README.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.id.md b/README.id.md
index fa5b2a5..db32af7 100644
--- a/README.id.md
+++ b/README.id.md
@@ -41,7 +41,7 @@ Tujuan utama Free PMO adalah membantu pengelolaan data project dengan mudah dan
 Aplikasi ini dapat dipasang dalam server lokal (PC/Laptop) dan server online, dengan spesifikasi berikut :
 
 #### Spesifikasi minimum server
-1. PHP 7.0 (dan memenuhi [server requirement Laravel 5.5](https://laravel.com/docs/5.5#server-requirements)),
+1. PHP 7.1.3 (dan memenuhi [server requirement Laravel 5.7](https://laravel.com/docs/5.7#server-requirements)),
 2. MySQL atau MariaDB,
 3. SQlite (untuk automated testing).
 
@@ -72,7 +72,7 @@ Project ini dikembangkan oleh [Nafies Luthfi](https://github.com/nafiesl) dan pa
 Free PMO dibangun menggunakan [metode TDD](https://blog.nafies.id/laravel/testing-laravel-tentang-automated-testing) dengan bahan dan dukungan dari paket-paket berikut ini :
 
 ##### Dependencies
-* [Framework Laravel](https://laravel.com/docs/5.5) (versi 5.2 s/d 5.5).
+* [Framework Laravel](https://laravel.com/docs/5.7) (versi 5.2 s/d 5.7).
 * [luthfi/formfield](https://github.com/nafiesl/FormField), Wrapper Form dari [laravelcollective/html](https://github.com/laravelcollective/html) dengan Bootstrap 3.
 * [riskihajar/terbilang](https://github.com/riskihajar/terbilang), membuat angka terbilang (pada fitur cetak kuitansi) dan romawi.
 
diff --git a/README.md b/README.md
index 92e7b3c..c4a8795 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Free PMO was built for easy and professional project management.
 This application can be installed on local server and online server with these specifications :
 
 #### Server Requirements
-1. PHP 7.0 (and meet [Laravel 5.5 server requirements](https://laravel.com/docs/5.5#server-requirements)),
+1. PHP 7.1.3 (and meet [Laravel 5.7 server requirements](https://laravel.com/docs/5.7#server-requirements)),
 2. MySQL or MariaDB database,
 3. SQlite (for automated testing).
 
@@ -74,7 +74,7 @@ This project maintained by [Nafies Luthfi](https://github.com/nafiesl) and devel
 Free PMO built with [TDD metode](https://blog.nafies.id/laravel/testing-laravel-tentang-automated-testing) with these ingredients support :
 
 ##### Dependencies
-* [Framework Laravel](https://laravel.com/docs/5.5) (version 5.2 to 5.5).
+* [Framework Laravel](https://laravel.com/docs/5.7) (version 5.2 to 5.7).
 * [luthfi/formfield](https://github.com/nafiesl/FormField), Bootstrap 3 Form Wrapper for [laravelcollective/html](https://github.com/laravelcollective/html).
 * [riskihajar/terbilang](https://github.com/riskihajar/terbilang), create indonesian in-word number (for payment receipt) and roman numeral.
 

From 96cd04fac2d4c04bc2ef7c73bb12f99cae7d4aae Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 9 Jan 2019 20:38:37 +0800
Subject: [PATCH 023/113] [wip] Refactor log file viewer routes to controller

Add Reports\LogFileController@index
---
 app/Http/Controllers/Reports/LogFileController.php | 24 ++++++++++++++++++++++
 routes/web/reports.php                             | 15 +-------------
 2 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 app/Http/Controllers/Reports/LogFileController.php

diff --git a/app/Http/Controllers/Reports/LogFileController.php b/app/Http/Controllers/Reports/LogFileController.php
new file mode 100644
index 0000000..f42ddb7
--- /dev/null
+++ b/app/Http/Controllers/Reports/LogFileController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Reports;
+
+use App\Http\Controllers\Controller;
+
+class LogFileController extends Controller
+{
+    public function index()
+    {
+        if (!file_exists(storage_path('logs'))) {
+            return [];
+        }
+
+        $logFiles = \File::allFiles(storage_path('logs'));
+
+        // Sort files by modified time DESC
+        usort($logFiles, function ($a, $b) {
+            return -1 * strcmp($a->getMTime(), $b->getMTime());
+        });
+
+        return view('reports.log-files', compact('logFiles'));
+    }
+}
diff --git a/routes/web/reports.php b/routes/web/reports.php
index 2d4d867..33d4aea 100644
--- a/routes/web/reports.php
+++ b/routes/web/reports.php
@@ -10,20 +10,7 @@ Route::group(['middleware' => ['web', 'role:admin'], 'prefix' => 'reports'], fun
     Route::get('payments/yearly', ['as' => 'reports.payments.yearly', 'uses' => 'ReportsController@yearly']);
     Route::get('current-credits', ['as' => 'reports.current-credits', 'uses' => 'ReportsController@currentCredits']);
 
-    Route::get('log-files', ['as' => 'log-files.index', 'uses' => function () {
-        if (!file_exists(storage_path('logs'))) {
-            return [];
-        }
-
-        $logFiles = \File::allFiles(storage_path('logs'));
-
-        // Sort files by modified time DESC
-        usort($logFiles, function ($a, $b) {
-            return -1 * strcmp($a->getMTime(), $b->getMTime());
-        });
-
-        return view('reports.log-files', compact('logFiles'));
-    }]);
+    Route::get('log-files', ['as' => 'log-files.index', 'uses' => 'Reports\LogFileController@index']);
 
     Route::get('log-files/{filename}', ['as' => 'log-files.show', 'uses' => function ($fileName) {
         if (file_exists(storage_path('logs/'.$fileName))) {

From 307ff909381e94761baff7f5dd26e0fefe1ecaba Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 9 Jan 2019 20:56:27 +0800
Subject: [PATCH 024/113] Move log file show and download to controller

---
 app/Http/Controllers/Reports/LogFileController.php | 18 ++++++++++++++++++
 routes/web/reports.php                             | 18 ++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Reports/LogFileController.php b/app/Http/Controllers/Reports/LogFileController.php
index f42ddb7..000e053 100644
--- a/app/Http/Controllers/Reports/LogFileController.php
+++ b/app/Http/Controllers/Reports/LogFileController.php
@@ -21,4 +21,22 @@ class LogFileController extends Controller
 
         return view('reports.log-files', compact('logFiles'));
     }
+
+    public function show($fileName)
+    {
+        if (file_exists(storage_path('logs/'.$fileName))) {
+            return response()->file(storage_path('logs/'.$fileName), ['content-type' => 'text/plain']);
+        }
+
+        return 'Invalid file name.';
+    }
+
+    public function download($fileName)
+    {
+        if (file_exists(storage_path('logs/'.$fileName))) {
+            return response()->download(storage_path('logs/'.$fileName), env('APP_ENV').'.'.$fileName);
+        }
+
+        return 'Invalid file name.';
+    }
 }
diff --git a/routes/web/reports.php b/routes/web/reports.php
index 33d4aea..e9d9526 100644
--- a/routes/web/reports.php
+++ b/routes/web/reports.php
@@ -11,20 +11,6 @@ Route::group(['middleware' => ['web', 'role:admin'], 'prefix' => 'reports'], fun
     Route::get('current-credits', ['as' => 'reports.current-credits', 'uses' => 'ReportsController@currentCredits']);
 
     Route::get('log-files', ['as' => 'log-files.index', 'uses' => 'Reports\LogFileController@index']);
-
-    Route::get('log-files/{filename}', ['as' => 'log-files.show', 'uses' => function ($fileName) {
-        if (file_exists(storage_path('logs/'.$fileName))) {
-            return response()->file(storage_path('logs/'.$fileName), ['content-type' => 'text/plain']);
-        }
-
-        return 'Invalid file name.';
-    }]);
-
-    Route::get('log-files/{filename}/download', ['as' => 'log-files.download', 'uses' => function ($fileName) {
-        if (file_exists(storage_path('logs/'.$fileName))) {
-            return response()->download(storage_path('logs/'.$fileName), env('APP_ENV').'.'.$fileName);
-        }
-
-        return 'Invalid file name.';
-    }]);
+    Route::get('log-files/{filename}', ['as' => 'log-files.show', 'uses' => 'Reports\LogFileController@show']);
+    Route::get('log-files/{filename}/download', ['as' => 'log-files.download', 'uses' => 'Reports\LogFileController@download']);
 });

From d677e463ce161bfcce63f35402039017ba2bc333 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 9 Jan 2019 20:58:49 +0800
Subject: [PATCH 025/113] Change log file routes definition using newer style

---
 routes/web/reports.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/routes/web/reports.php b/routes/web/reports.php
index e9d9526..a3cc696 100644
--- a/routes/web/reports.php
+++ b/routes/web/reports.php
@@ -10,7 +10,7 @@ Route::group(['middleware' => ['web', 'role:admin'], 'prefix' => 'reports'], fun
     Route::get('payments/yearly', ['as' => 'reports.payments.yearly', 'uses' => 'ReportsController@yearly']);
     Route::get('current-credits', ['as' => 'reports.current-credits', 'uses' => 'ReportsController@currentCredits']);
 
-    Route::get('log-files', ['as' => 'log-files.index', 'uses' => 'Reports\LogFileController@index']);
-    Route::get('log-files/{filename}', ['as' => 'log-files.show', 'uses' => 'Reports\LogFileController@show']);
-    Route::get('log-files/{filename}/download', ['as' => 'log-files.download', 'uses' => 'Reports\LogFileController@download']);
+    Route::get('log-files', 'Reports\LogFileController@index')->name('log-files.index');
+    Route::get('log-files/{fileName}', 'Reports\LogFileController@show')->name('log-files.show');
+    Route::get('log-files/{fileName}/download', 'Reports\LogFileController@download')->name('log-files.download');
 });

From 513b84835b1962a052b3c021526f84bd378d5372 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 9 Jan 2019 21:00:06 +0800
Subject: [PATCH 026/113] Change report routes to newer route style

---
 routes/web/reports.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/routes/web/reports.php b/routes/web/reports.php
index a3cc696..5748042 100644
--- a/routes/web/reports.php
+++ b/routes/web/reports.php
@@ -4,12 +4,15 @@ Route::group(['middleware' => ['web', 'role:admin'], 'prefix' => 'reports'], fun
     /*
      * Reports Routes
      */
-    Route::get('payments', ['as' => 'reports.payments.index', 'uses' => 'ReportsController@monthly']);
-    Route::get('payments/daily', ['as' => 'reports.payments.daily', 'uses' => 'ReportsController@daily']);
-    Route::get('payments/monthly', ['as' => 'reports.payments.monthly', 'uses' => 'ReportsController@monthly']);
-    Route::get('payments/yearly', ['as' => 'reports.payments.yearly', 'uses' => 'ReportsController@yearly']);
-    Route::get('current-credits', ['as' => 'reports.current-credits', 'uses' => 'ReportsController@currentCredits']);
+    Route::get('payments', 'ReportsController@monthly')->name('reports.payments.index');
+    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('current-credits', 'ReportsController@currentCredits')->name('reports.current-credits');
 
+    /*
+     * Log Files Routes
+     */
     Route::get('log-files', 'Reports\LogFileController@index')->name('log-files.index');
     Route::get('log-files/{fileName}', 'Reports\LogFileController@show')->name('log-files.show');
     Route::get('log-files/{fileName}/download', 'Reports\LogFileController@download')->name('log-files.download');

From ef97fc059f930383c4e8d6a84f9938c6ac6143a1 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 9 Jan 2019 21:09:12 +0800
Subject: [PATCH 027/113] Refactor user calendar route to controller

---
 app/Http/Controllers/Users/CalendarController.php | 22 ++++++++++++++++++++++
 routes/web/calendar.php                           | 16 +++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 app/Http/Controllers/Users/CalendarController.php

diff --git a/app/Http/Controllers/Users/CalendarController.php b/app/Http/Controllers/Users/CalendarController.php
new file mode 100644
index 0000000..fc30500
--- /dev/null
+++ b/app/Http/Controllers/Users/CalendarController.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Users;
+
+use App\Entities\Projects\Project;
+use App\Http\Controllers\Controller;
+
+class CalendarController extends Controller
+{
+    public function index()
+    {
+        $user = auth()->user();
+
+        if ($user->hasRole('admin') == false) {
+            $projects = $user->projects()->orderBy('projects.name')->pluck('projects.name', 'projects.id');
+        } else {
+            $projects = Project::orderBy('name')->pluck('name', 'id');
+        }
+
+        return view('users.calendar', compact('projects'));
+    }
+}
diff --git a/routes/web/calendar.php b/routes/web/calendar.php
index de6229b..b3b60d1 100644
--- a/routes/web/calendar.php
+++ b/routes/web/calendar.php
@@ -1,18 +1,8 @@
 <?php
 
-Route::group(['middleware' => ['web', 'auth'], 'namespace' => 'Api'], function () {
+Route::group(['middleware' => ['web', 'auth'], 'namespace' => 'Users'], function () {
     /*
-     * Savety Calendar
+     * User Calendar Route
      */
-    Route::get('my-calendar', ['as' => 'users.calendar', 'uses' => function () {
-        $user = auth()->user();
-
-        if ($user->hasRole('admin') == false) {
-            $projects = $user->projects()->orderBy('projects.name')->pluck('projects.name', 'projects.id');
-        } else {
-            $projects = App\Entities\Projects\Project::orderBy('name')->pluck('name', 'id');
-        }
-
-        return view('users.calendar', compact('projects'));
-    }]);
+    Route::get('my-calendar', 'CalendarController@index')->name('users.calendar');
 });

From a57a54595398d39d0d4ee764b5fce7291e147659 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 12 Jan 2019 22:45:13 +0800
Subject: [PATCH 028/113] Add year to year payment report

---
 app/Entities/Reports/ReportsRepository.php         |  22 +++++
 app/Http/Controllers/ReportsController.php         |   7 ++
 .../views/reports/payments/year_to_year.blade.php  | 101 +++++++++++++++++++++
 routes/web/reports.php                             |   1 +
 4 files changed, 131 insertions(+)
 create mode 100755 resources/views/reports/payments/year_to_year.blade.php

diff --git a/app/Entities/Reports/ReportsRepository.php b/app/Entities/Reports/ReportsRepository.php
index dbf74c7..f58e0a9 100755
--- a/app/Entities/Reports/ReportsRepository.php
+++ b/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.
      *
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 52eed1b..e385c20 100755
--- a/app/Http/Controllers/ReportsController.php
+++ b/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();
diff --git a/resources/views/reports/payments/year_to_year.blade.php b/resources/views/reports/payments/year_to_year.blade.php
new file mode 100755
index 0000000..8133b28
--- /dev/null
+++ b/resources/views/reports/payments/year_to_year.blade.php
@@ -0,0 +1,101 @@
+@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: 250px;"></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.Line({
+        element: 'year_to_year-chart',
+        data: {!! collect($chartData)->toJson() !!},
+        xkey: 'year',
+        ykeys: ['value'],
+        labels: ["{{ __('report.profit') }} {{ Option::get('money_sign', 'Rp') }}"],
+        parseTime:false,
+        goals: [0],
+        goalLineColors : ['red'],
+        smooth: true,
+        lineWidth: 2,
+    });
+})();
+</script>
+@endsection
diff --git a/routes/web/reports.php b/routes/web/reports.php
index 5748042..8c37e6b 100644
--- a/routes/web/reports.php
+++ b/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');
 
     /*

From bc0e19cad6fcd8c8aeb47f456e6b51212e5a9590 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 12 Jan 2019 22:46:09 +0800
Subject: [PATCH 029/113] Add lang value for report.year_to_year key

---
 resources/lang/de/report.php | 3 +++
 resources/lang/en/report.php | 3 +++
 resources/lang/id/report.php | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/resources/lang/de/report.php b/resources/lang/de/report.php
index 89ffaca..f2eff6a 100644
--- a/resources/lang/de/report.php
+++ b/resources/lang/de/report.php
@@ -26,4 +26,7 @@ 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',
 ];
diff --git a/resources/lang/en/report.php b/resources/lang/en/report.php
index 89ffaca..f2eff6a 100644
--- a/resources/lang/en/report.php
+++ b/resources/lang/en/report.php
@@ -26,4 +26,7 @@ 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',
 ];
diff --git a/resources/lang/id/report.php b/resources/lang/id/report.php
index 9f4bd4d..23ca60d 100644
--- a/resources/lang/id/report.php
+++ b/resources/lang/id/report.php
@@ -26,4 +26,7 @@ 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',
 ];

From 0a89159cde3cfa2b4606116361802e35b95410cb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 12 Jan 2019 22:49:33 +0800
Subject: [PATCH 030/113] Add year to year report link to yearly report page

---
 resources/lang/de/report.php                      | 3 ++-
 resources/lang/en/report.php                      | 3 ++-
 resources/lang/id/report.php                      | 3 ++-
 resources/views/reports/payments/yearly.blade.php | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/lang/de/report.php b/resources/lang/de/report.php
index f2eff6a..f8f8962 100644
--- a/resources/lang/de/report.php
+++ b/resources/lang/de/report.php
@@ -28,5 +28,6 @@ return [
     'view_yearly_label' => 'View Report per',
 
     // Year to year
-    'year_to_year' => 'Year to Year Report',
+    'year_to_year'      => 'Year to Year Report',
+    'view_year_to_year' => 'View Year to Year Report',
 ];
diff --git a/resources/lang/en/report.php b/resources/lang/en/report.php
index f2eff6a..f8f8962 100644
--- a/resources/lang/en/report.php
+++ b/resources/lang/en/report.php
@@ -28,5 +28,6 @@ return [
     'view_yearly_label' => 'View Report per',
 
     // Year to year
-    'year_to_year' => 'Year to Year Report',
+    'year_to_year'      => 'Year to Year Report',
+    'view_year_to_year' => 'View Year to Year Report',
 ];
diff --git a/resources/lang/id/report.php b/resources/lang/id/report.php
index 23ca60d..c5f8ac0 100644
--- a/resources/lang/id/report.php
+++ b/resources/lang/id/report.php
@@ -28,5 +28,6 @@ return [
     'view_yearly_label' => 'Lihat Tahunan per',
 
     // Year to year
-    'year_to_year' => 'Laponan Tahun ke Tahun',
+    'year_to_year'      => 'Laponan Tahun ke Tahun',
+    'view_year_to_year' => 'Lihat Laporan Tahun ke Tahun',
 ];
diff --git a/resources/views/reports/payments/yearly.blade.php b/resources/views/reports/payments/yearly.blade.php
index ca28dd9..b0c8de3 100755
--- a/resources/views/reports/payments/yearly.blade.php
+++ b/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">

From e056d56580faf7cec3f8275af542c450c36d5fd7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 12 Jan 2019 22:57:41 +0800
Subject: [PATCH 031/113] Change line chart to bar chart for year to year
 report

---
 resources/views/reports/payments/year_to_year.blade.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/resources/views/reports/payments/year_to_year.blade.php b/resources/views/reports/payments/year_to_year.blade.php
index 8133b28..2c075af 100755
--- a/resources/views/reports/payments/year_to_year.blade.php
+++ b/resources/views/reports/payments/year_to_year.blade.php
@@ -11,7 +11,7 @@
     <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: 250px;"></div>
+        <div id="year_to_year-chart" style="height: 350px;"></div>
         <div class="text-center"><strong>{{ __('time.month') }}</strong></div>
     </div>
 </div>
@@ -84,17 +84,14 @@
 @section('script')
 <script>
 (function() {
-    new Morris.Line({
+    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,
-        goals: [0],
-        goalLineColors : ['red'],
-        smooth: true,
-        lineWidth: 2,
+        parseTime: false,
+        barColors: ['#5CB85C']
     });
 })();
 </script>

From a23bff9e5d35bffb9c7e8ff7aeb9f15acc4e947d Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 13 Jan 2019 20:45:09 +0800
Subject: [PATCH 032/113] Add customer listing api endpoint

---
 app/Http/Controllers/Api/CustomerController.php | 18 +++++++++++++++++
 routes/api.php                                  |  5 +++++
 tests/Feature/Api/FetchPartnerListTest.php      | 27 +++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 app/Http/Controllers/Api/CustomerController.php
 create mode 100644 tests/Feature/Api/FetchPartnerListTest.php

diff --git a/app/Http/Controllers/Api/CustomerController.php b/app/Http/Controllers/Api/CustomerController.php
new file mode 100644
index 0000000..48effd7
--- /dev/null
+++ b/app/Http/Controllers/Api/CustomerController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Entities\Partners\Customer;
+use App\Http\Controllers\Controller;
+
+class CustomerController extends Controller
+{
+    public function index()
+    {
+        $customers = Customer::where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
+
+        return response()->json($customers);
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index df7f5ca..eebaafe 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -10,4 +10,9 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'as' => 'api.', 'middlewar
     Route::patch('events/update', ['as' => 'events.update', 'uses' => 'EventsController@update']);
     Route::patch('events/reschedule', ['as' => 'events.reschedule', 'uses' => 'EventsController@reschedule']);
     Route::delete('events/delete', ['as' => 'events.destroy', 'uses' => 'EventsController@destroy']);
+
+    /*
+     * Customer Route
+     */
+    Route::post('customers', 'CustomerController@index')->name('customers.index');
 });
diff --git a/tests/Feature/Api/FetchPartnerListTest.php b/tests/Feature/Api/FetchPartnerListTest.php
new file mode 100644
index 0000000..7fe0225
--- /dev/null
+++ b/tests/Feature/Api/FetchPartnerListTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Feature\Api;
+
+use Tests\TestCase;
+use App\Entities\Partners\Customer;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class FetchPartnerListTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function user_can_fetch_customer_listing()
+    {
+        $user = $this->createUser('admin');
+        $customer = factory(Customer::class)->create();
+
+        $this->postJson(route('api.customers.index'), [], [
+            'Authorization' => 'Bearer '.$user->api_token,
+        ]);
+
+        $this->seeJson([
+            $customer->id => $customer->name,
+        ]);
+    }
+}

From 0e469abcf80235a14704e4c32dc16e11daf2a73a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 13 Jan 2019 20:47:00 +0800
Subject: [PATCH 033/113] Add vendor listing api endpoint

---
 app/Http/Controllers/Api/VendorController.php | 18 ++++++++++++++++++
 routes/api.php                                |  5 +++++
 tests/Feature/Api/FetchPartnerListTest.php    | 16 ++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 app/Http/Controllers/Api/VendorController.php

diff --git a/app/Http/Controllers/Api/VendorController.php b/app/Http/Controllers/Api/VendorController.php
new file mode 100644
index 0000000..dbf7ad2
--- /dev/null
+++ b/app/Http/Controllers/Api/VendorController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Entities\Partners\Vendor;
+use App\Http\Controllers\Controller;
+
+class VendorController extends Controller
+{
+    public function index()
+    {
+        $vendors = Vendor::where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
+
+        return response()->json($vendors);
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index eebaafe..0b188cf 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -15,4 +15,9 @@ Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'as' => 'api.', 'middlewar
      * Customer Route
      */
     Route::post('customers', 'CustomerController@index')->name('customers.index');
+
+    /*
+     * Vendor Route
+     */
+    Route::post('vendors', 'VendorController@index')->name('vendors.index');
 });
diff --git a/tests/Feature/Api/FetchPartnerListTest.php b/tests/Feature/Api/FetchPartnerListTest.php
index 7fe0225..44a08cd 100644
--- a/tests/Feature/Api/FetchPartnerListTest.php
+++ b/tests/Feature/Api/FetchPartnerListTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Feature\Api;
 
 use Tests\TestCase;
+use App\Entities\Partners\Vendor;
 use App\Entities\Partners\Customer;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
@@ -24,4 +25,19 @@ class FetchPartnerListTest extends TestCase
             $customer->id => $customer->name,
         ]);
     }
+
+    /** @test */
+    public function user_can_fetch_vendor_listing()
+    {
+        $user = $this->createUser('admin');
+        $vendor = factory(Vendor::class)->create();
+
+        $this->postJson(route('api.vendors.index'), [], [
+            'Authorization' => 'Bearer '.$user->api_token,
+        ]);
+
+        $this->seeJson([
+            $vendor->id => $vendor->name,
+        ]);
+    }
 }

From b2cdda251d9227e1e4716702c67502c2735d2169 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 13 Jan 2019 21:16:38 +0800
Subject: [PATCH 034/113] Change partner_id options based on in_out selection

---
 resources/lang/de/customer.php          |  3 ++-
 resources/lang/de/vendor.php            |  1 +
 resources/lang/en/customer.php          |  3 ++-
 resources/lang/en/vendor.php            |  1 +
 resources/lang/id/customer.php          |  3 ++-
 resources/lang/id/vendor.php            |  1 +
 resources/views/payments/edit.blade.php | 30 +++++++++++++++++++++++++++---
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/resources/lang/de/customer.php b/resources/lang/de/customer.php
index 17bc36d..2ea6fee 100644
--- a/resources/lang/de/customer.php
+++ b/resources/lang/de/customer.php
@@ -4,12 +4,13 @@ return [
     // Labels
     'customer'      => 'Kunde',
     'list'          => 'Kundenliste',
+    'detail'        => 'Kundendetails',
     'search'        => 'Kundensuche',
+    'select'        => 'Select Customer',
     'not_found'     => 'Kunde nicht gefunden.',
     'empty'         => 'Kunde ist leer.',
     'back_to_show'  => 'Zurück zu Kundendetails',
     'back_to_index' => 'Zurück zur Kundennliste',
-    'detail'        => 'Kundendetails',
     'contact'       => 'Kundenkontakt',
 
     // Actions
diff --git a/resources/lang/de/vendor.php b/resources/lang/de/vendor.php
index 9ad37ee..0a8b981 100644
--- a/resources/lang/de/vendor.php
+++ b/resources/lang/de/vendor.php
@@ -6,6 +6,7 @@ return [
     'list'          => 'Hersteller Liste',
     'detail'        => 'Vendor Detail',
     'search'        => 'Hersteller suchen',
+    'select'        => 'Select Vendor',
     'not_found'     => 'Hersteller nicht gefunden.',
     'empty'         => 'Hersteller Liste ist leer.',
     'back_to_show'  => 'Zurück zu Herstellerdetails',
diff --git a/resources/lang/en/customer.php b/resources/lang/en/customer.php
index 8d4234f..e61254d 100644
--- a/resources/lang/en/customer.php
+++ b/resources/lang/en/customer.php
@@ -4,12 +4,13 @@ return [
     // Labels
     'customer'      => 'Customer',
     'list'          => 'Customer List',
+    'detail'        => 'Customer Detail',
     'search'        => 'Search Customer',
+    'select'        => 'Select Customer',
     'not_found'     => 'Customer not found.',
     'empty'         => 'Customer is empty.',
     'back_to_show'  => 'Back to Customer Detail',
     'back_to_index' => 'Back to Customer List',
-    'detail'        => 'Customer Detail',
     'contact'       => 'Customer Contact',
 
     // Actions
diff --git a/resources/lang/en/vendor.php b/resources/lang/en/vendor.php
index 1fe3766..85cee3d 100644
--- a/resources/lang/en/vendor.php
+++ b/resources/lang/en/vendor.php
@@ -6,6 +6,7 @@ return [
     'list'          => 'Vendor List',
     'detail'        => 'Vendor Detail',
     'search'        => 'Search Vendor',
+    'select'        => 'Select Vendor',
     'not_found'     => 'Vendor not found.',
     'empty'         => 'Vendor list is empty.',
     'back_to_show'  => 'Back to Vendor Detail',
diff --git a/resources/lang/id/customer.php b/resources/lang/id/customer.php
index 6a7b881..1b7533f 100644
--- a/resources/lang/id/customer.php
+++ b/resources/lang/id/customer.php
@@ -4,12 +4,13 @@ return [
     // Labels
     'customer'      => 'Customer',
     'list'          => 'Daftar Customer',
+    'detail'        => 'Detail Customer',
     'search'        => 'Cari Customer',
+    'select'        => 'Pilih Customer',
     'not_found'     => 'Customer tidak ditemukan',
     'empty'         => 'Belum ada Customer',
     'back_to_show'  => 'Kembali ke detail Customer',
     'back_to_index' => 'Kembali ke daftar Customer',
-    'detail'        => 'Detail Customer',
     'contact'       => 'Kontak Customer',
 
     // Actions
diff --git a/resources/lang/id/vendor.php b/resources/lang/id/vendor.php
index e283275..7fcc94f 100644
--- a/resources/lang/id/vendor.php
+++ b/resources/lang/id/vendor.php
@@ -6,6 +6,7 @@ return [
     'list'          => 'Daftar Vendor',
     'detail'        => 'Detail Vendor',
     'search'        => 'Cari Vendor',
+    'select'        => 'Pilih Vendor',
     'not_found'     => 'Vendor tidak ditemukan',
     'empty'         => 'Belum ada Vendor',
     'back_to_show'  => 'Kembali ke detail Vendor',
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php
index a8d923d..687f40a 100755
--- a/resources/views/payments/edit.blade.php
+++ b/resources/views/payments/edit.blade.php
@@ -34,11 +34,9 @@
                     </div>
                     <div class="col-sm-6">
                         @if ($payment->partner_type == 'App\Entities\Users\User')
-                            {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!}
                             {{ Form::hidden('partner_type', 'users') }}
-                        @else
-                            {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!}
                         @endif
+                        {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!}
                     </div>
                 </div>
                 {!! FormField::textarea('description', ['label'=> __('payment.description')]) !!}
@@ -72,6 +70,32 @@
         closeOnDateSelect: true,
         scrollInput: false
     });
+    $('#in_out_0').click(function() {
+        $.post("{{ route('api.vendors.index') }}", {},
+            function(data) {
+                var string = '<option value="">-- {{ __('vendor.select') }} --</option>';
+                string = string + `<optgroup label="Vendor">`;
+                $.each(data, function(index, value) {
+                    string = string + `<option value="` + index + `">` + value + `</option>`;
+                });
+                string = string + `</optgroup>`;
+                $("#partner_id").html(string);
+            }
+        );
+    });
+    $('#in_out_1').click(function() {
+        $.post("{{ route('api.customers.index') }}", {},
+            function(data) {
+                var string = '<option value="">-- {{ __('customer.select') }} --</option>';
+                string = string + `<optgroup label="Customer">`;
+                $.each(data, function(index, value) {
+                    string = string + `<option value="` + index + `">` + value + `</option>`;
+                });
+                string = string + `</optgroup>`;
+                $("#partner_id").html(string);
+            }
+        );
+    });
 })();
 </script>
 @endsection

From ad88a64c5c6594b8b5e1d5c4ca95bf8d30d1ac83 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 13 Jan 2019 21:26:42 +0800
Subject: [PATCH 035/113] Show partner_id list based on payment partner type

---
 app/Entities/BaseRepository.php             | 8 ++++++--
 app/Http/Controllers/PaymentsController.php | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index 2b861fe..2c0a317 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -22,7 +22,9 @@ abstract class BaseRepository extends EloquentRepository
      */
     public function getCustomersList()
     {
-        return Customer::orderBy('name')->pluck('name', 'id');
+        return Customer::where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
     }
 
     /**
@@ -57,7 +59,9 @@ abstract class BaseRepository extends EloquentRepository
      */
     public function getVendorsList()
     {
-        return Vendor::orderBy('name')->pluck('name', 'id');
+        return Vendor::where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
     }
 
     /**
diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php
index 4d92ad5..873680e 100755
--- a/app/Http/Controllers/PaymentsController.php
+++ b/app/Http/Controllers/PaymentsController.php
@@ -98,8 +98,10 @@ class PaymentsController extends Controller
 
         if ($payment->partner_type == 'App\Entities\Users\User') {
             $partners = $this->repo->getWorkersList();
+        } elseif ($payment->partner_type == 'App\Entities\Partners\Customer') {
+            $partners = ['Customer' => $this->repo->getCustomersList()];
         } else {
-            $partners = $this->repo->getCustomersAndVendorsList();
+            $partners = ['Vendor' => $this->repo->getVendorsList()];
         }
 
         return view('payments.edit', compact('payment', 'projects', 'partners'));

From 8beb307bc0085d6e103abc3bdbde501b797407cb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 13 Jan 2019 21:34:22 +0800
Subject: [PATCH 036/113] Update payment edit placeholder

Fix #27
---
 app/Entities/BaseRepository.php             |  4 ++--
 app/Http/Controllers/PaymentsController.php |  4 ++--
 resources/views/payments/edit.blade.php     | 25 ++++++++++++++-----------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index 2c0a317..67895bd 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -35,8 +35,8 @@ abstract class BaseRepository extends EloquentRepository
     public function getCustomersAndVendorsList()
     {
         $partners = [
-            'Customer' => Customer::orderBy('name')->pluck('name', 'id')->all(),
-            'Vendor'   => Vendor::orderBy('name')->pluck('name', 'id')->all(),
+            __('customer.customer') => Customer::orderBy('name')->pluck('name', 'id')->all(),
+            __('vendor.vendor')     => Vendor::orderBy('name')->pluck('name', 'id')->all(),
         ];
 
         return $partners;
diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php
index 873680e..7f26ab5 100755
--- a/app/Http/Controllers/PaymentsController.php
+++ b/app/Http/Controllers/PaymentsController.php
@@ -99,9 +99,9 @@ class PaymentsController extends Controller
         if ($payment->partner_type == 'App\Entities\Users\User') {
             $partners = $this->repo->getWorkersList();
         } elseif ($payment->partner_type == 'App\Entities\Partners\Customer') {
-            $partners = ['Customer' => $this->repo->getCustomersList()];
+            $partners = [__('customer.customer') => $this->repo->getCustomersList()];
         } else {
-            $partners = ['Vendor' => $this->repo->getVendorsList()];
+            $partners = [__('vendor.vendor') => $this->repo->getVendorsList()];
         }
 
         return view('payments.edit', compact('payment', 'projects', 'partners'));
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php
index 687f40a..7458da3 100755
--- a/resources/views/payments/edit.blade.php
+++ b/resources/views/payments/edit.blade.php
@@ -8,13 +8,13 @@
 
 <div class="row">
     <div class="col-md-6">
-        {!! Form::model($payment, ['route'=>['payments.update', $payment->id], 'method' => 'patch']) !!}
+        {!! Form::model($payment, ['route' => ['payments.update', $payment], 'method' => 'patch']) !!}
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('payment.edit') }}</h3></div>
             <div class="panel-body">
                 <div class="row">
                     <div class="col-md-6">
-                        {!! FormField::radios('in_out', [__('payment.out'), __('payment.in')], ['label'=> __('payment.in_out')]) !!}
+                        {!! FormField::radios('in_out', [__('payment.out'), __('payment.in')], ['label' => __('payment.in_out')]) !!}
                     </div>
                     <div class="col-md-6">
                         {!! FormField::radios('type_id', PaymentType::toArray(), ['label' => __('payment.type'), 'list_style' => 'unstyled']) !!}
@@ -22,30 +22,33 @@
                 </div>
                 <div class="row">
                     <div class="col-md-6">
-                        {!! FormField::text('date', ['label'=> __('app.date')]) !!}
+                        {!! FormField::text('date', ['label' => __('app.date')]) !!}
                     </div>
                     <div class="col-md-6">
-                        {!! FormField::price('amount', ['label'=> __('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
+                        {!! FormField::price('amount', ['label' => __('payment.amount'), 'currency' => Option::get('money_sign', 'Rp')]) !!}
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6">
-                        {!! FormField::select('project_id', $projects, ['label'=> __('payment.project')]) !!}
+                        {!! FormField::select('project_id', $projects, ['label' => __('payment.project')]) !!}
                     </div>
                     <div class="col-sm-6">
                         @if ($payment->partner_type == 'App\Entities\Users\User')
                             {{ Form::hidden('partner_type', 'users') }}
                         @endif
-                        {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!}
+                        {!! FormField::select('partner_id', $partners, [
+                            'label' => __('payment.customer'),
+                            'placeholder' => $payment->in_out ? __('customer.select') : __('vendor.select')
+                        ]) !!}
                     </div>
                 </div>
-                {!! FormField::textarea('description', ['label'=> __('payment.description')]) !!}
+                {!! FormField::textarea('description', ['label' => __('payment.description')]) !!}
             </div>
 
             <div class="panel-footer">
-                {!! Form::submit(__('payment.update'), ['class'=>'btn btn-primary']) !!}
+                {!! Form::submit(__('payment.update'), ['class' => 'btn btn-primary']) !!}
                 {!! link_to_route('projects.payments', __('payment.back_to_index'), [$payment->project_id], ['class' => 'btn btn-default']) !!}
-                {!! link_to_route('payments.delete', __('payment.delete'), [$payment->id], ['class'=>'btn btn-danger pull-right']) !!}
+                {!! link_to_route('payments.delete', __('payment.delete'), [$payment->id], ['class' => 'btn btn-danger pull-right']) !!}
             </div>
         </div>
         {!! Form::close() !!}
@@ -73,7 +76,7 @@
     $('#in_out_0').click(function() {
         $.post("{{ route('api.vendors.index') }}", {},
             function(data) {
-                var string = '<option value="">-- {{ __('vendor.select') }} --</option>';
+                var string = '<option value="">-- {{ __('vendor.select') }} --</option> ';
                 string = string + `<optgroup label="Vendor">`;
                 $.each(data, function(index, value) {
                     string = string + `<option value="` + index + `">` + value + `</option>`;
@@ -86,7 +89,7 @@
     $('#in_out_1').click(function() {
         $.post("{{ route('api.customers.index') }}", {},
             function(data) {
-                var string = '<option value="">-- {{ __('customer.select') }} --</option>';
+                var string = '<option value="">-- {{ __('customer.select') }} --</option> ';
                 string = string + `<optgroup label="Customer">`;
                 $.each(data, function(index, value) {
                     string = string + `<option value="` + index + `">` + value + `</option>`;

From 6a97501a45e4d9fc1b442a1486ac5e526f793124 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 14 Jan 2019 09:06:07 +0800
Subject: [PATCH 037/113] Use payment project customer to fix failed test

---
 tests/Feature/Payments/ManagePaymentsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Payments/ManagePaymentsTest.php b/tests/Feature/Payments/ManagePaymentsTest.php
index 8397fd1..4ea77f5 100644
--- a/tests/Feature/Payments/ManagePaymentsTest.php
+++ b/tests/Feature/Payments/ManagePaymentsTest.php
@@ -166,7 +166,7 @@ class ManagePaymentsTest extends TestCase
             'partner_type' => Vendor::class,
             'partner_id'   => $vendor->id,
         ]);
-        $customer = factory(Customer::class)->create();
+        $customer = $payment->project->customer;
 
         $this->visit(route('payments.edit', $payment->id));
         $this->seePageIs(route('payments.edit', $payment->id));

From d037d4bb1d6f7578e616e9e9b1fcfcb57782ea2d Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 1 Feb 2019 11:34:20 +0800
Subject: [PATCH 038/113] Add job price in each job on html export page

---
 resources/views/projects/jobs/export-html.blade.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/projects/jobs/export-html.blade.php b/resources/views/projects/jobs/export-html.blade.php
index 80bc2e1..5d1be11 100755
--- a/resources/views/projects/jobs/export-html.blade.php
+++ b/resources/views/projects/jobs/export-html.blade.php
@@ -1,13 +1,7 @@
-<?php
-    // $filename = str_slug(__('project.jobs') . '-' . $project->name) . '.xls';
-    // header("Content-Disposition: attachment; filename=\"$filename\"");
-    // header("Content-Type: application/vnd.ms-excel");
-?>
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
-    {{-- <meta http-equiv="X-UA-Compatible" content="IE=edge"> --}}
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>{{ __('project.jobs') }} {{ $project->name }}</title>
     {!! Html::style('assets/css/app.css') !!}
@@ -22,9 +16,15 @@
             <tbody>
                 <tr style="background-color: #ffd298"><th colspan="2">{{ __('app.description') }}</th></tr>
                 <tr><td colspan="2">{!! nl2br($job->description) !!}</td></tr>
+                <tr>
+                    <td colspan="2" class="text-right">
+                        <em>
+                            {{ __('job.price') }}: {{ format_money($job->price) }}
+                        </em>
+                    </td>
+                </tr>
 
                 @if ($job->tasks->count())
-                <tr><td colspan="2">&nbsp;</td></tr>
                 <tr style="background-color: #ffd298">
                     <th class="col-md-3">{{ __('task.list') }}</th>
                     <th class="col-md-6">{{ __('app.description') }}</th>

From 61b7eaed05d684b043a2692bc6a61d7cb2d1ec53 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 14 Feb 2019 22:32:50 +0800
Subject: [PATCH 039/113] Update restore button title

---
 resources/views/backups/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/backups/index.blade.php b/resources/views/backups/index.blade.php
index d9efab9..32d931e 100644
--- a/resources/views/backups/index.blade.php
+++ b/resources/views/backups/index.blade.php
@@ -30,7 +30,7 @@
                             <a href="{{ route('backups.index', ['action' => 'restore', 'file_name' => $backup->getFilename()]) }}"
                                 id="restore_{{ str_replace('.gz', '', $backup->getFilename()) }}"
                                 class="btn btn-warning btn-xs"
-                                title="{{ __('backup.download') }}"><i class="fa fa-rotate-left"></i></a>
+                                title="{{ __('backup.restore') }}"><i class="fa fa-rotate-left"></i></a>
                             <a href="{{ route('backups.download', [$backup->getFilename()]) }}"
                                 id="download_{{ str_replace('.gz', '', $backup->getFilename()) }}"
                                 class="btn btn-info btn-xs"

From 2a139a08446896e0873d6d3302e3a001bb45e165 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 10 Feb 2019 10:50:43 +0800
Subject: [PATCH 040/113] Update add jobs from other project UX

Auto check task list on checked job
Auto remove task list check on unchecked job
---
 resources/views/projects/jobs/add-from-other-project.blade.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/views/projects/jobs/add-from-other-project.blade.php b/resources/views/projects/jobs/add-from-other-project.blade.php
index 63a85b8..55f63cb 100755
--- a/resources/views/projects/jobs/add-from-other-project.blade.php
+++ b/resources/views/projects/jobs/add-from-other-project.blade.php
@@ -32,7 +32,7 @@
                             @foreach($job->tasks as $task)
                             <li>
                                 <label for="{{ $job->id }}_task_id_{{ $task->id }}" style="font-weight:normal">
-                                {{ Form::checkbox($job->id.'_task_ids['.$task->id.']', $task->id, null, ['id' => $job->id.'_task_id_'.$task->id]) }}
+                                {{ Form::checkbox($job->id.'_task_ids['.$task->id.']', $task->id, null, ['id' => $job->id.'_task_id_'.$task->id, 'class' => 'job_id_'.$job->id.'_tasks']) }}
                                 {{ $task->name }}</label>
                             </li>
                             @endforeach
@@ -72,6 +72,14 @@
 <script>
 (function() {
     $('select[name=project_id]').select2();
+
+    @if ($selectedProject)
+        @foreach ($selectedProject->jobs as $job)
+            $('#job_id_{{ $job->id }}').change(function () {
+                $('.job_id_{{ $job->id }}_tasks').prop('checked', this.checked);
+            });
+        @endforeach
+    @endif
 })();
 </script>
 @endsection

From 28c91e8476e66cf49dcff8a49ffba936d4ff9a4f Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 07:03:29 +0800
Subject: [PATCH 041/113] Project deletion will also deletes related invoices

---
 app/Entities/Projects/Project.php |  7 +++++++
 tests/Unit/Models/ProjectTest.php | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index e64abce..aa0c956 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -244,4 +244,11 @@ class Project extends Model
 
         return $workDuration.' Day(s)';
     }
+
+    public function delete()
+    {
+        $this->invoices()->delete();
+
+        return parent::delete();
+    }
 }
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index 351c7d8..58438ab 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Models;
 use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\Task;
+use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
@@ -234,4 +235,27 @@ class ProjectTest extends TestCase
 
         $this->assertEquals('2 Year(s) 3 Month(s)', $project->work_duration);
     }
+
+    /** @test */
+    public function a_project_has_many_invoices_relation()
+    {
+        $project = factory(Project::class)->create();
+        $invoice = factory(Invoice::class)->create(['project_id' => $project->id]);
+
+        $this->assertInstanceOf(Collection::class, $project->invoices);
+        $this->assertInstanceOf(Invoice::class, $project->invoices->first());
+    }
+
+    /** @test */
+    public function project_deletion_also_deletes_related_invoices()
+    {
+        $project = factory(Project::class)->create();
+        $invoice = factory(Invoice::class)->create(['project_id' => $project->id]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('invoices', [
+            'project_id' => $project->id,
+        ]);
+    }
 }

From 269aec4c6fd63c522c372fdfd58ec8f80fd516ad Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 07:12:42 +0800
Subject: [PATCH 042/113] Job deletion will deletes related tasks

Project deletion will also deletes related job tasks
---
 app/Entities/Projects/Job.php     |  7 +++++++
 app/Entities/Projects/Project.php |  2 ++
 tests/Unit/Models/JobTest.php     | 13 ++++++++++++
 tests/Unit/Models/ProjectTest.php | 43 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Projects/Job.php b/app/Entities/Projects/Job.php
index 9987fc4..de2287e 100755
--- a/app/Entities/Projects/Job.php
+++ b/app/Entities/Projects/Job.php
@@ -109,4 +109,11 @@ class Job extends Model
     {
         return $this->price * ($this->progress / 100);
     }
+
+    public function delete()
+    {
+        $this->tasks()->delete();
+
+        return parent::delete();
+    }
 }
diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index aa0c956..a07b229 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -247,7 +247,9 @@ class Project extends Model
 
     public function delete()
     {
+        $this->jobs->each->delete();
         $this->invoices()->delete();
+        $this->payments()->delete();
 
         return parent::delete();
     }
diff --git a/tests/Unit/Models/JobTest.php b/tests/Unit/Models/JobTest.php
index c2e96c0..b2b342e 100644
--- a/tests/Unit/Models/JobTest.php
+++ b/tests/Unit/Models/JobTest.php
@@ -55,6 +55,19 @@ class JobTest extends TestCase
     }
 
     /** @test */
+    public function job_deletion_also_deletes_related_tasks()
+    {
+        $job = factory(Job::class)->create();
+        $tasks = factory(Task::class)->create(['job_id' => $job->id]);
+
+        $job->delete();
+
+        $this->dontSeeInDatabase('tasks', [
+            'job_id' => $job->id,
+        ]);
+    }
+
+    /** @test */
     public function a_job_has_progress_attribute()
     {
         $job = factory(Job::class)->create();
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index 58438ab..733dbdd 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -42,6 +42,19 @@ class ProjectTest extends TestCase
     }
 
     /** @test */
+    public function project_deletion_also_deletes_related_jobs()
+    {
+        $project = factory(Project::class)->create();
+        $job = factory(Job::class)->create(['project_id' => $project->id]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('jobs', [
+            'project_id' => $project->id,
+        ]);
+    }
+
+    /** @test */
     public function a_project_has_many_main_jobs()
     {
         $project = factory(Project::class)->create();
@@ -70,15 +83,43 @@ class ProjectTest extends TestCase
     }
 
     /** @test */
-    public function a_project_has_many_payments()
+    public function project_deletion_also_deletes_related_job_tasks()
+    {
+        $project = factory(Project::class)->create();
+        $job = factory(Job::class)->create(['project_id' => $project->id, 'type_id' => 2]);
+        $tasks = factory(Task::class, 2)->create(['job_id' => $job->id]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('tasks', [
+            'job_id' => $job->id,
+        ]);
+    }
+
+    /** @test */
+    public function a_project_has_many_payments_relation()
     {
         $project = factory(Project::class)->create();
         $payment = factory(Payment::class)->create(['project_id' => $project->id]);
+
         $this->assertInstanceOf(Collection::class, $project->payments);
         $this->assertInstanceOf(Payment::class, $project->payments->first());
     }
 
     /** @test */
+    public function project_deletion_also_deletes_related_payments()
+    {
+        $project = factory(Project::class)->create();
+        $payment = factory(Payment::class)->create(['project_id' => $project->id]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('payments', [
+            'project_id' => $project->id,
+        ]);
+    }
+
+    /** @test */
     public function a_project_has_many_subscriptions()
     {
         $project = factory(Project::class)->create();

From fde8ed21cabeea185c4844fc3ce308abc4c3f2d8 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 07:13:41 +0800
Subject: [PATCH 043/113] Add database transaction on project deletion action

---
 app/Entities/Projects/Project.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index a07b229..8618c23 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -2,6 +2,7 @@
 
 namespace App\Entities\Projects;
 
+use DB;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
 use App\Entities\Partners\Customer;
@@ -247,9 +248,11 @@ class Project extends Model
 
     public function delete()
     {
+        DB::beginTransaction();
         $this->jobs->each->delete();
         $this->invoices()->delete();
         $this->payments()->delete();
+        DB::commit();
 
         return parent::delete();
     }

From 28173114aaa2b27ca476a88f08e45af7056368a3 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 07:18:07 +0800
Subject: [PATCH 044/113] Job deletion will deletes related subscriptions

---
 app/Entities/Projects/Project.php |  1 +
 tests/Unit/Models/ProjectTest.php | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index 8618c23..edf7640 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -252,6 +252,7 @@ class Project extends Model
         $this->jobs->each->delete();
         $this->invoices()->delete();
         $this->payments()->delete();
+        $this->subscriptions()->delete();
         DB::commit();
 
         return parent::delete();
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index 733dbdd..20f2db7 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -129,6 +129,19 @@ class ProjectTest extends TestCase
     }
 
     /** @test */
+    public function project_deletion_also_deletes_related_subscriptions()
+    {
+        $project = factory(Project::class)->create();
+        $subscription = factory(Subscription::class)->create(['project_id' => $project->id]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('subscriptions', [
+            'project_id' => $project->id,
+        ]);
+    }
+
+    /** @test */
     public function a_project_belongs_to_a_customer()
     {
         $customer = factory(Customer::class)->create();

From 45510fc1a3ea322d6a41c73024ddf41085054c9f Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 07:19:56 +0800
Subject: [PATCH 045/113] Job deletion will also deletes related comments

---
 app/Entities/Projects/Project.php |  1 +
 tests/Unit/Models/ProjectTest.php | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index edf7640..91742c2 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -253,6 +253,7 @@ class Project extends Model
         $this->invoices()->delete();
         $this->payments()->delete();
         $this->subscriptions()->delete();
+        $this->comments()->delete();
         DB::commit();
 
         return parent::delete();
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index 20f2db7..c8233e2 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -269,6 +269,23 @@ class ProjectTest extends TestCase
     }
 
     /** @test */
+    public function project_deletion_also_deletes_related_comments()
+    {
+        $project = factory(Project::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'projects',
+            'commentable_id'   => $project->id,
+        ]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('comments', [
+            'commentable_type' => 'projects',
+            'commentable_id'   => $project->id,
+        ]);
+    }
+
+    /** @test */
     public function project_has_work_duration_attribute()
     {
         $project = factory(Project::class)->create([

From 2d95550024d0dd26a7603badef89f55fccf493c0 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 14:39:33 +0800
Subject: [PATCH 046/113] Job deletion also deletes job comments

---
 app/Entities/Projects/Job.php |  4 ++++
 tests/Unit/Models/JobTest.php | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Projects/Job.php b/app/Entities/Projects/Job.php
index de2287e..4418233 100755
--- a/app/Entities/Projects/Job.php
+++ b/app/Entities/Projects/Job.php
@@ -2,6 +2,7 @@
 
 namespace App\Entities\Projects;
 
+use DB;
 use App\Entities\Users\User;
 use Illuminate\Database\Eloquent\Model;
 use Laracasts\Presenter\PresentableTrait;
@@ -112,7 +113,10 @@ class Job extends Model
 
     public function delete()
     {
+        DB::beginTransaction();
         $this->tasks()->delete();
+        $this->comments()->delete();
+        DB::commit();
 
         return parent::delete();
     }
diff --git a/tests/Unit/Models/JobTest.php b/tests/Unit/Models/JobTest.php
index b2b342e..e049d77 100644
--- a/tests/Unit/Models/JobTest.php
+++ b/tests/Unit/Models/JobTest.php
@@ -58,7 +58,7 @@ class JobTest extends TestCase
     public function job_deletion_also_deletes_related_tasks()
     {
         $job = factory(Job::class)->create();
-        $tasks = factory(Task::class)->create(['job_id' => $job->id]);
+        $task = factory(Task::class)->create(['job_id' => $job->id]);
 
         $job->delete();
 
@@ -110,4 +110,21 @@ class JobTest extends TestCase
         $this->assertInstanceOf(Collection::class, $job->comments);
         $this->assertInstanceOf(Comment::class, $job->comments->first());
     }
+
+    /** @test */
+    public function job_deletion_also_deletes_related_comments()
+    {
+        $job = factory(Job::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'jobs',
+            'commentable_id'   => $job->id,
+        ]);
+
+        $job->delete();
+
+        $this->dontSeeInDatabase('comments', [
+            'commentable_type' => 'jobs',
+            'commentable_id'   => $job->id,
+        ]);
+    }
 }

From 2a96913005f0ae4146504e71f2781386f2d10cae Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 15 Feb 2019 14:40:58 +0800
Subject: [PATCH 047/113] Add docblocks on Job and Project model

---
 app/Entities/Projects/Job.php     | 5 +++++
 app/Entities/Projects/Project.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/Entities/Projects/Job.php b/app/Entities/Projects/Job.php
index 4418233..14f1c27 100755
--- a/app/Entities/Projects/Job.php
+++ b/app/Entities/Projects/Job.php
@@ -111,6 +111,11 @@ class Job extends Model
         return $this->price * ($this->progress / 100);
     }
 
+    /**
+     * Delete the model from the database.
+     *
+     * @return bool|null
+     */
     public function delete()
     {
         DB::beginTransaction();
diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index 91742c2..d2ed10c 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -246,6 +246,11 @@ class Project extends Model
         return $workDuration.' Day(s)';
     }
 
+    /**
+     * Delete the model from the database.
+     *
+     * @return bool|null
+     */
     public function delete()
     {
         DB::beginTransaction();

From 01ece0f55079ed4093e8511b78cba7881d48fb1e Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:37:37 +0800
Subject: [PATCH 048/113] Remove subscription repository class

---
 .../Subscriptions/SubscriptionsRepository.php      | 52 ----------------------
 app/Http/Controllers/SubscriptionsController.php   | 41 ++++++++++-------
 2 files changed, 24 insertions(+), 69 deletions(-)
 delete mode 100755 app/Entities/Subscriptions/SubscriptionsRepository.php

diff --git a/app/Entities/Subscriptions/SubscriptionsRepository.php b/app/Entities/Subscriptions/SubscriptionsRepository.php
deleted file mode 100755
index ec203d1..0000000
--- a/app/Entities/Subscriptions/SubscriptionsRepository.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Entities\Subscriptions;
-
-use App\Entities\BaseRepository;
-
-/**
- * Subscriptions Repository Class.
- */
-class SubscriptionsRepository extends BaseRepository
-{
-    /**
-     * Subscription model.
-     *
-     * @var \App\Entities\Subscriptions\Subscription
-     */
-    protected $model;
-
-    /**
-     * Create SubscriptionRepository class instance.
-     *
-     * @param  \App\Entities\Subscriptions\Subscription  $model
-     */
-    public function __construct(Subscription $model)
-    {
-        parent::__construct($model);
-    }
-
-    /**
-     * Get subscrioption list.
-     *
-     * @param  string  $q
-     * @param  int  $customerId
-     * @return \Illuminate\Pagination\LengthAwarePaginator
-     */
-    public function getSubscriptions($q, $customerId)
-    {
-        return $this->model->orderBy('status_id', 'desc')
-            ->orderBy('due_date')
-            ->where(function ($query) use ($q, $customerId) {
-                if ($customerId) {
-                    $query->where('customer_id', $customerId);
-                }
-
-                if ($q) {
-                    $query->where('name', 'like', '%'.$q.'%');
-                }
-            })
-            ->with('customer', 'vendor')
-            ->paginate($this->_paginate);
-    }
-}
diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php
index 0d767cb..86cab15 100755
--- a/app/Http/Controllers/SubscriptionsController.php
+++ b/app/Http/Controllers/SubscriptionsController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Entities\Subscriptions\Type;
 use App\Entities\Subscriptions\Subscription;
-use App\Entities\Subscriptions\SubscriptionsRepository;
 use App\Http\Requests\SubscriptionRequest as FormRequest;
 
 /**
@@ -16,21 +15,6 @@ use App\Http\Requests\SubscriptionRequest as FormRequest;
 class SubscriptionsController extends Controller
 {
     /**
-     * @var \App\Entities\Subscriptions\SubscriptionsRepository
-     */
-    private $repo;
-
-    /**
-     * Create new Subscription Controller.
-     *
-     * @param \App\Entities\Subscriptions\SubscriptionsRepository $repo
-     */
-    public function __construct(SubscriptionsRepository $repo)
-    {
-        $this->repo = $repo;
-    }
-
-    /**
      * Show subscription list.
      *
      * @param  \Illuminate\Http\Request  $request
@@ -38,7 +22,7 @@ class SubscriptionsController extends Controller
      */
     public function index(Request $request)
     {
-        $subscriptions = $this->repo->getSubscriptions(
+        $subscriptions = $this->getSubscriptionListing(
             $request->get('q'),
             $request->get('vendor_id')
         );
@@ -156,4 +140,27 @@ class SubscriptionsController extends Controller
     {
         return trans('subscription.'.$pageType).' - '.$subscription->name.' - '.$subscription->customer->name;
     }
+
+    /**
+     * Get subscrioption list.
+     *
+     * @param  string  $q
+     * @param  int  $customerId
+     * @return \Illuminate\Pagination\LengthAwarePaginator
+     */
+    private function getSubscriptionListing($searchQuery, $customerId)
+    {
+        $subscriptionQuery = Subscription::orderBy('status_id', 'desc')
+            ->orderBy('due_date')
+            ->with('customer', 'vendor');
+
+        if ($searchQuery) {
+            $subscriptionQuery->where('name', 'like', '%'.$searchQuery.'%');
+        }
+        if ($customerId) {
+            $subscriptionQuery->where('customer_id', $customerId);
+        }
+
+        return $subscriptionQuery->paginate(25);
+    }
 }

From 1fe700eb2e2bef7183523352597c7ea2c4779ba6 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:39:54 +0800
Subject: [PATCH 049/113] Adjust repo method call to parent controller

---
 app/Http/Controllers/Controller.php              | 24 ++++++++++++++++++++++++
 app/Http/Controllers/SubscriptionsController.php |  8 ++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 03e02a2..d693ffb 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Entities\Partners\Vendor;
+use App\Entities\Projects\Project;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -10,4 +12,26 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    /**
+     * Get collection of projects.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getProjectsList()
+    {
+        return Project::orderBy('name')->pluck('name', 'id');
+    }
+
+    /**
+     * Get collection of vendors.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    public function getVendorsList()
+    {
+        return Vendor::where('is_active', 1)
+            ->orderBy('name')
+            ->pluck('name', 'id');
+    }
 }
diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php
index 86cab15..3f83e9e 100755
--- a/app/Http/Controllers/SubscriptionsController.php
+++ b/app/Http/Controllers/SubscriptionsController.php
@@ -37,8 +37,8 @@ class SubscriptionsController extends Controller
      */
     public function create()
     {
-        $projects = $this->repo->getProjectsList();
-        $vendors = $this->repo->getVendorsList();
+        $projects = $this->getProjectsList();
+        $vendors = $this->getVendorsList();
 
         return view('subscriptions.create', compact('projects', 'vendors'));
     }
@@ -79,8 +79,8 @@ class SubscriptionsController extends Controller
      */
     public function edit(Subscription $subscription)
     {
-        $projects = $this->repo->getProjectsList();
-        $vendors = $this->repo->getVendorsList();
+        $projects = $this->getProjectsList();
+        $vendors = $this->getVendorsList();
 
         $pageTitle = $this->getPageTitle('edit', $subscription);
 

From 294caca5a7b29e5121448612fe22f4fcc01d8a7c Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:41:47 +0800
Subject: [PATCH 050/113] Move all getProjectsList method call to parent
 controller

---
 app/Entities/BaseRepository.php                  | 10 ----------
 app/Http/Controllers/PaymentsController.php      |  4 ++--
 app/Http/Controllers/Projects/JobsController.php |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index 67895bd..c513d86 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -65,16 +65,6 @@ abstract class BaseRepository extends EloquentRepository
     }
 
     /**
-     * Get collection of projects.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getProjectsList()
-    {
-        return Project::orderBy('name')->pluck('name', 'id');
-    }
-
-    /**
      * Get Job by it's id.
      *
      * @param  int  $jobId
diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php
index 7f26ab5..325932d 100755
--- a/app/Http/Controllers/PaymentsController.php
+++ b/app/Http/Controllers/PaymentsController.php
@@ -54,7 +54,7 @@ class PaymentsController extends Controller
      */
     public function create()
     {
-        $projects = $this->repo->getProjectsList();
+        $projects = $this->getProjectsList();
         $partners = $this->repo->getCustomersAndVendorsList();
         $project = Project::find(request('project_id'));
 
@@ -94,7 +94,7 @@ class PaymentsController extends Controller
      */
     public function edit(Payment $payment)
     {
-        $projects = $this->repo->getProjectsList();
+        $projects = $this->getProjectsList();
 
         if ($payment->partner_type == 'App\Entities\Users\User') {
             $partners = $this->repo->getWorkersList();
diff --git a/app/Http/Controllers/Projects/JobsController.php b/app/Http/Controllers/Projects/JobsController.php
index 01256d8..27a8eb9 100755
--- a/app/Http/Controllers/Projects/JobsController.php
+++ b/app/Http/Controllers/Projects/JobsController.php
@@ -40,7 +40,7 @@ class JobsController extends Controller
     {
         $selectedProject = null;
         $workers = $this->repo->getWorkersList();
-        $projects = $this->repo->getProjectsList();
+        $projects = $this->getProjectsList();
 
         if ($request->has('project_id')) {
             $selectedProject = Project::find($request->get('project_id'));

From 7380f3f5a909e0298d037a493460a24e58d8075a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:43:57 +0800
Subject: [PATCH 051/113] Move getVendorsList method call to parent controller

---
 app/Entities/BaseRepository.php             | 12 ------------
 app/Http/Controllers/PaymentsController.php |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index c513d86..bc37764 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -53,18 +53,6 @@ abstract class BaseRepository extends EloquentRepository
     }
 
     /**
-     * Get collection of vendors.
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function getVendorsList()
-    {
-        return Vendor::where('is_active', 1)
-            ->orderBy('name')
-            ->pluck('name', 'id');
-    }
-
-    /**
      * Get Job by it's id.
      *
      * @param  int  $jobId
diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php
index 325932d..1ad1c4e 100755
--- a/app/Http/Controllers/PaymentsController.php
+++ b/app/Http/Controllers/PaymentsController.php
@@ -101,7 +101,7 @@ class PaymentsController extends Controller
         } elseif ($payment->partner_type == 'App\Entities\Partners\Customer') {
             $partners = [__('customer.customer') => $this->repo->getCustomersList()];
         } else {
-            $partners = [__('vendor.vendor') => $this->repo->getVendorsList()];
+            $partners = [__('vendor.vendor') => $this->getVendorsList()];
         }
 
         return view('payments.edit', compact('payment', 'projects', 'partners'));

From 129adc6405fa0530308b859795c9f64aea091bac Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:45:47 +0800
Subject: [PATCH 052/113] Move getCustomersAndVendorsList method call to parent
 controller

---
 app/Entities/BaseRepository.php             | 16 ----------------
 app/Http/Controllers/Controller.php         | 14 ++++++++++++++
 app/Http/Controllers/PaymentsController.php |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index bc37764..860569c 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -4,7 +4,6 @@ namespace App\Entities;
 
 use App\Entities\Users\User;
 use App\Entities\Projects\Job;
-use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
 
@@ -28,21 +27,6 @@ abstract class BaseRepository extends EloquentRepository
     }
 
     /**
-     * Get list of customers and vendors.
-     *
-     * @return array
-     */
-    public function getCustomersAndVendorsList()
-    {
-        $partners = [
-            __('customer.customer') => Customer::orderBy('name')->pluck('name', 'id')->all(),
-            __('vendor.vendor')     => Vendor::orderBy('name')->pluck('name', 'id')->all(),
-        ];
-
-        return $partners;
-    }
-
-    /**
      * Get collection of workers.
      *
      * @return \Illuminate\Database\Eloquent\Collection
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index d693ffb..597e461 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
+use App\Entities\Partners\Customer;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -34,4 +35,17 @@ class Controller extends BaseController
             ->orderBy('name')
             ->pluck('name', 'id');
     }
+
+    /**
+     * Get list of customers and vendors.
+     *
+     * @return array
+     */
+    public function getCustomersAndVendorsList()
+    {
+        return [
+            __('customer.customer') => Customer::orderBy('name')->pluck('name', 'id')->all(),
+            __('vendor.vendor')     => Vendor::orderBy('name')->pluck('name', 'id')->all(),
+        ];
+    }
 }
diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php
index 1ad1c4e..6c1bc4a 100755
--- a/app/Http/Controllers/PaymentsController.php
+++ b/app/Http/Controllers/PaymentsController.php
@@ -55,7 +55,7 @@ class PaymentsController extends Controller
     public function create()
     {
         $projects = $this->getProjectsList();
-        $partners = $this->repo->getCustomersAndVendorsList();
+        $partners = $this->getCustomersAndVendorsList();
         $project = Project::find(request('project_id'));
 
         return view('payments.create', compact('projects', 'partners', 'project'));

From 04f3e2c10b3939b69a58d8989b284d9fc82f5d25 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:52:58 +0800
Subject: [PATCH 053/113] Change FormRequest approval method call

---
 app/Http/Controllers/SubscriptionsController.php |  7 ++--
 app/Http/Requests/SubscriptionRequest.php        | 43 +++++++++++++-----------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php
index 3f83e9e..7acd077 100755
--- a/app/Http/Controllers/SubscriptionsController.php
+++ b/app/Http/Controllers/SubscriptionsController.php
@@ -51,8 +51,7 @@ class SubscriptionsController extends Controller
      */
     public function store(FormRequest $subscriptionCreateRequest)
     {
-        $subscriptionCreateRequest->approveFor(new Subscription());
-
+        $subscriptionCreateRequest->approveToCreate(new Subscription());
         flash(trans('subscription.created'), 'success');
 
         return redirect()->route('subscriptions.index');
@@ -96,8 +95,7 @@ class SubscriptionsController extends Controller
      */
     public function update(FormRequest $subscriptionUpdateRequest, Subscription $subscription)
     {
-        $subscriptionUpdateRequest->approveFor($subscription);
-
+        $subscriptionUpdateRequest->approveToUpdate($subscription);
         flash(trans('subscription.updated'), 'success');
 
         return redirect()->route('subscriptions.edit', $subscription->id);
@@ -113,7 +111,6 @@ class SubscriptionsController extends Controller
     public function destroy(FormRequest $subscriptionDeleteRequest, Subscription $subscription)
     {
         $subscriptionDeleteRequest->approveToDelete($subscription);
-
         flash(trans('subscription.deleted'), 'success');
 
         return redirect()->route('subscriptions.index');
diff --git a/app/Http/Requests/SubscriptionRequest.php b/app/Http/Requests/SubscriptionRequest.php
index 8d0695c..848607a 100644
--- a/app/Http/Requests/SubscriptionRequest.php
+++ b/app/Http/Requests/SubscriptionRequest.php
@@ -79,28 +79,33 @@ class SubscriptionRequest extends Request
         ];
     }
 
-    public function approveFor(Subscription $subscription)
+    public function approveToCreate(Subscription $subscription)
     {
         $project = Project::findOrFail($this->get('project_id'));
 
-        if ($subscription->exists) {
-            $subscriptionData = $this->except(['_method', '_token']);
-            $subscriptionData['customer_id'] = $project->customer_id;
-
-            $subscription->update($subscriptionData);
-        } else {
-            $subscription->project_id = $project->id;
-            $subscription->vendor_id = $this->get('vendor_id');
-            $subscription->customer_id = $project->customer_id;
-            $subscription->name = $this->get('name');
-            $subscription->price = $this->get('price');
-            $subscription->start_date = $this->get('start_date');
-            $subscription->due_date = $this->get('due_date');
-            $subscription->type_id = $this->get('type_id');
-            $subscription->notes = $this->get('notes');
-
-            $subscription->save();
-        }
+        $subscription->project_id = $project->id;
+        $subscription->vendor_id = $this->get('vendor_id');
+        $subscription->customer_id = $project->customer_id;
+        $subscription->name = $this->get('name');
+        $subscription->price = $this->get('price');
+        $subscription->start_date = $this->get('start_date');
+        $subscription->due_date = $this->get('due_date');
+        $subscription->type_id = $this->get('type_id');
+        $subscription->notes = $this->get('notes');
+
+        $subscription->save();
+
+        return $subscription;
+    }
+
+    public function approveToUpdate(Subscription $subscription)
+    {
+        $project = Project::findOrFail($this->get('project_id'));
+
+        $subscriptionData = $this->except(['_method', '_token']);
+        $subscriptionData['customer_id'] = $project->customer_id;
+
+        $subscription->update($subscriptionData);
 
         return $subscription;
     }

From 9ebe42590be837ab8df51f3c54c6eaeb9812b7e9 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:53:48 +0800
Subject: [PATCH 054/113] Update trans() to __() lang helper

---
 app/Http/Controllers/SubscriptionsController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php
index 7acd077..ae0b3eb 100755
--- a/app/Http/Controllers/SubscriptionsController.php
+++ b/app/Http/Controllers/SubscriptionsController.php
@@ -52,7 +52,7 @@ class SubscriptionsController extends Controller
     public function store(FormRequest $subscriptionCreateRequest)
     {
         $subscriptionCreateRequest->approveToCreate(new Subscription());
-        flash(trans('subscription.created'), 'success');
+        flash(__('subscription.created'), 'success');
 
         return redirect()->route('subscriptions.index');
     }
@@ -96,7 +96,7 @@ class SubscriptionsController extends Controller
     public function update(FormRequest $subscriptionUpdateRequest, Subscription $subscription)
     {
         $subscriptionUpdateRequest->approveToUpdate($subscription);
-        flash(trans('subscription.updated'), 'success');
+        flash(__('subscription.updated'), 'success');
 
         return redirect()->route('subscriptions.edit', $subscription->id);
     }
@@ -111,7 +111,7 @@ class SubscriptionsController extends Controller
     public function destroy(FormRequest $subscriptionDeleteRequest, Subscription $subscription)
     {
         $subscriptionDeleteRequest->approveToDelete($subscription);
-        flash(trans('subscription.deleted'), 'success');
+        flash(__('subscription.deleted'), 'success');
 
         return redirect()->route('subscriptions.index');
     }
@@ -135,13 +135,13 @@ class SubscriptionsController extends Controller
      */
     private function getPageTitle($pageType, $subscription)
     {
-        return trans('subscription.'.$pageType).' - '.$subscription->name.' - '.$subscription->customer->name;
+        return __('subscription.'.$pageType).' - '.$subscription->name.' - '.$subscription->customer->name;
     }
 
     /**
      * Get subscrioption list.
      *
-     * @param  string  $q
+     * @param  string  $searchQuery
      * @param  int  $customerId
      * @return \Illuminate\Pagination\LengthAwarePaginator
      */

From 24309126fd2b5583de245b58a8ce684c2efd70d4 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:55:00 +0800
Subject: [PATCH 055/113] Fixing invalid subscription validation rules

---
 app/Http/Requests/SubscriptionRequest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/SubscriptionRequest.php b/app/Http/Requests/SubscriptionRequest.php
index 848607a..1b2316c 100644
--- a/app/Http/Requests/SubscriptionRequest.php
+++ b/app/Http/Requests/SubscriptionRequest.php
@@ -52,7 +52,7 @@ class SubscriptionRequest extends Request
             'project_id' => 'required|numeric|exists:projects,id',
             'vendor_id'  => 'required|numeric|exists:vendors,id',
             'type_id'    => 'required|numeric',
-            'remark'     => 'max:255',
+            'notes'      => 'nullable|max:255',
         ];
     }
 
@@ -66,7 +66,7 @@ class SubscriptionRequest extends Request
             'project_id' => 'required|numeric|exists:projects,id',
             'vendor_id'  => 'required|numeric|exists:vendors,id',
             'type_id'    => 'required|numeric',
-            'remark'     => 'max:255',
+            'notes'      => 'nullable|max:255',
         ];
     }
 

From 723fbaf9a4dad6fb3d45a18a63f164049947bcf8 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 16 Feb 2019 21:55:53 +0800
Subject: [PATCH 056/113] Update form request rules switch statement

---
 app/Http/Requests/SubscriptionRequest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/Http/Requests/SubscriptionRequest.php b/app/Http/Requests/SubscriptionRequest.php
index 1b2316c..dc2c293 100644
--- a/app/Http/Requests/SubscriptionRequest.php
+++ b/app/Http/Requests/SubscriptionRequest.php
@@ -25,10 +25,6 @@ class SubscriptionRequest extends Request
     public function rules()
     {
         switch ($this->method()) {
-            case 'POST':
-                return $this->getCreateRules();
-                break;
-
             case 'PATCH':
                 return $this->getUpdateRules();
                 break;
@@ -38,6 +34,7 @@ class SubscriptionRequest extends Request
                 break;
 
             default:
+                return $this->getCreateRules();
                 break;
         }
     }

From 3a94fa9f8ddb081e31cc422bb5f1fe087597f7ec Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Feb 2019 21:33:57 +0800
Subject: [PATCH 057/113] Composer update to laravel v5.7.26

---
 composer.lock | 301 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 156 insertions(+), 145 deletions(-)

diff --git a/composer.lock b/composer.lock
index 0a78401..49256f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "backup-manager/backup-manager",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/backup-manager/backup-manager.git",
-                "reference": "4b3d74bb929aebc2df0f39f1032e0ca5e0948247"
+                "reference": "2176c335e0a3a3f65da4f3966a5336856206a86b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/backup-manager/backup-manager/zipball/4b3d74bb929aebc2df0f39f1032e0ca5e0948247",
-                "reference": "4b3d74bb929aebc2df0f39f1032e0ca5e0948247",
+                "url": "https://api.github.com/repos/backup-manager/backup-manager/zipball/2176c335e0a3a3f65da4f3966a5336856206a86b",
+                "reference": "2176c335e0a3a3f65da4f3966a5336856206a86b",
                 "shasum": ""
             },
             "require": {
@@ -32,17 +32,20 @@
                 "league/flysystem-dropbox": "~1.0",
                 "league/flysystem-rackspace": "~1.0",
                 "league/flysystem-sftp": "~1.0",
+                "mhetreramesh/flysystem-backblaze": "~1.0",
                 "mockery/mockery": "~0.9",
                 "phpspec/phpspec": "~2.1",
                 "satooshi/php-coveralls": "~0.6",
-                "srmklive/flysystem-dropbox-v2": "~1.0"
+                "srmklive/flysystem-dropbox-v2": "~1.0",
+                "superbalist/flysystem-google-storage": "^7.0"
             },
             "suggest": {
-                "league/flysystem-aws-s3-v2": "GoogleCS adapter support.",
-                "league/flysystem-aws-s3-v3": "AwsS3 adapter support.",
+                "league/flysystem-aws-s3-v3": "AWS S3 adapter support.",
                 "league/flysystem-rackspace": "Rackspace adapter support.",
-                "league/flysystem-sftp": "Sftp adapter support.",
-                "srmklive/flysystem-dropbox-v2": "Dropbox API v2 adapter support."
+                "league/flysystem-sftp": "SFTP adapter support.",
+                "mhetreramesh/flysystem-backblaze": "B2 adapter support.",
+                "srmklive/flysystem-dropbox-v2": "Dropbox API v2 adapter support.",
+                "superbalist/flysystem-google-storage": "Google Cloud Storage adapter support."
             },
             "type": "library",
             "extra": {
@@ -72,7 +75,7 @@
                 }
             ],
             "description": "A framework agnostic database backup manager with user-definable procedures and support for S3, Dropbox, FTP, SFTP, and more with drivers for popular frameworks.",
-            "time": "2018-09-23T09:14:37+00:00"
+            "time": "2018-10-16T19:36:05+00:00"
         },
         {
             "name": "backup-manager/laravel",
@@ -410,16 +413,16 @@
         },
         {
             "name": "fideloper/proxy",
-            "version": "4.0.0",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fideloper/TrustedProxy.git",
-                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a"
+                "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/cf8a0ca4b85659b9557e206c90110a6a4dba980a",
-                "reference": "cf8a0ca4b85659b9557e206c90110a6a4dba980a",
+                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
+                "reference": "177c79a2d1f9970f89ee2fb4c12b429af38b6dfb",
                 "shasum": ""
             },
             "require": {
@@ -460,7 +463,7 @@
                 "proxy",
                 "trusted proxy"
             ],
-            "time": "2018-02-07T20:20:57+00:00"
+            "time": "2019-01-10T14:06:47+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -693,16 +696,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.7.19",
+            "version": "v5.7.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c"
+                "reference": "ca3bc9769969e8af3bd9878a3e0242051c74dae4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/5c1d1ec7e8563ea31826fd5eb3f6791acf01160c",
-                "reference": "5c1d1ec7e8563ea31826fd5eb3f6791acf01160c",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ca3bc9769969e8af3bd9878a3e0242051c74dae4",
+                "reference": "ca3bc9769969e8af3bd9878a3e0242051c74dae4",
                 "shasum": ""
             },
             "require": {
@@ -776,7 +779,7 @@
                 "moontoast/math": "^1.1",
                 "orchestra/testbench-core": "3.7.*",
                 "pda/pheanstalk": "^3.0",
-                "phpunit/phpunit": "^7.0",
+                "phpunit/phpunit": "^7.5",
                 "predis/predis": "^1.1.1",
                 "symfony/css-selector": "^4.1",
                 "symfony/dom-crawler": "^4.1",
@@ -835,7 +838,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-12-18T14:00:38+00:00"
+            "time": "2019-02-12T14:52:21+00:00"
         },
         {
             "name": "laravel/nexmo-notification-channel",
@@ -1079,16 +1082,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.49",
+            "version": "1.0.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd"
+                "reference": "dab4e7624efa543a943be978008f439c333f2249"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a63cc83d8a931b271be45148fa39ba7156782ffd",
-                "reference": "a63cc83d8a931b271be45148fa39ba7156782ffd",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dab4e7624efa543a943be978008f439c333f2249",
+                "reference": "dab4e7624efa543a943be978008f439c333f2249",
                 "shasum": ""
             },
             "require": {
@@ -1159,7 +1162,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2018-11-23T23:41:29+00:00"
+            "time": "2019-02-01T08:50:36+00:00"
         },
         {
             "name": "league/fractal",
@@ -1415,16 +1418,16 @@
         },
         {
             "name": "nexmo/client",
-            "version": "1.6.0",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Nexmo/nexmo-php.git",
-                "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4"
+                "reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/01809cc1e17a5af275913c49bb5d444eb6cc06d4",
-                "reference": "01809cc1e17a5af275913c49bb5d444eb6cc06d4",
+                "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/2f79f67f24225ea627ee14578e98c96276cdd4c5",
+                "reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5",
                 "shasum": ""
             },
             "require": {
@@ -1459,20 +1462,20 @@
                 }
             ],
             "description": "PHP Client for using Nexmo's API.",
-            "time": "2018-12-17T10:47:50+00:00"
+            "time": "2019-02-07T11:14:34+00:00"
         },
         {
             "name": "opis/closure",
-            "version": "3.1.3",
+            "version": "3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "5e9095ce871a425ab87a854b285b7766de38a7d9"
+                "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/5e9095ce871a425ab87a854b285b7766de38a7d9",
-                "reference": "5e9095ce871a425ab87a854b285b7766de38a7d9",
+                "url": "https://api.github.com/repos/opis/closure/zipball/41f5da65d75cf473e5ee582df8fc7f2c733ce9d6",
+                "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6",
                 "shasum": ""
             },
             "require": {
@@ -1520,7 +1523,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-01-06T22:07:38+00:00"
+            "time": "2019-01-14T14:45:33+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -2158,16 +2161,16 @@
         },
         {
             "name": "spatie/laravel-fractal",
-            "version": "5.4.2",
+            "version": "5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-fractal.git",
-                "reference": "2931881cac3155ceb798f2fd1e55bd152576682b"
+                "reference": "514663b6b331a6c62ab6321cdf68d790a706e082"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/2931881cac3155ceb798f2fd1e55bd152576682b",
-                "reference": "2931881cac3155ceb798f2fd1e55bd152576682b",
+                "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/514663b6b331a6c62ab6321cdf68d790a706e082",
+                "reference": "514663b6b331a6c62ab6321cdf68d790a706e082",
                 "shasum": ""
             },
             "require": {
@@ -2178,7 +2181,8 @@
             },
             "require-dev": {
                 "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0",
-                "phpunit/phpunit": "^6.2|^7.0"
+                "phpunit/phpunit": "^6.2|^7.0",
+                "scrutinizer/ocular": "^1.5"
             },
             "type": "library",
             "extra": {
@@ -2222,7 +2226,7 @@
                 "spatie",
                 "transform"
             ],
-            "time": "2018-09-28T16:17:34+00:00"
+            "time": "2019-01-16T12:38:34+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -2285,16 +2289,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522"
+                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
-                "reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
+                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
                 "shasum": ""
             },
             "require": {
@@ -2306,6 +2310,9 @@
                 "symfony/dependency-injection": "<3.4",
                 "symfony/process": "<3.3"
             },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~3.4|~4.0",
@@ -2315,7 +2322,7 @@
                 "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log-implementation": "For using the console logger",
+                "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
                 "symfony/lock": "",
                 "symfony/process": ""
@@ -2350,7 +2357,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-04T15:13:53+00:00"
+            "time": "2019-01-25T14:35:16+00:00"
         },
         {
             "name": "symfony/contracts",
@@ -2422,16 +2429,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4"
+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4",
-                "reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
+                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
                 "shasum": ""
             },
             "require": {
@@ -2471,20 +2478,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-16T20:31:39+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
+                "reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
-                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/cf9b2e33f757deb884ce474e06d2647c1c769b65",
+                "reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65",
                 "shasum": ""
             },
             "require": {
@@ -2527,20 +2534,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-25T14:35:16+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
+                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
-                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
+                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
                 "shasum": ""
             },
             "require": {
@@ -2591,20 +2598,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-01-16T20:35:37+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
+                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
-                "reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
+                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
                 "shasum": ""
             },
             "require": {
@@ -2640,20 +2647,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-16T20:35:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "a633d422a09242064ba24e44a6e1494c5126de86"
+                "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
-                "reference": "a633d422a09242064ba24e44a6e1494c5126de86",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
+                "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
                 "shasum": ""
             },
             "require": {
@@ -2694,20 +2701,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-01-29T09:49:29+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
+                "reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
-                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d56b1706abaa771eb6acd894c6787cb88f1dc97d",
+                "reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d",
                 "shasum": ""
             },
             "require": {
@@ -2783,7 +2790,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-06T16:19:23+00:00"
+            "time": "2019-02-03T12:47:33+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2959,16 +2966,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
+                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
-                "reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
+                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
                 "shasum": ""
             },
             "require": {
@@ -3004,20 +3011,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T14:48:52+00:00"
+            "time": "2019-01-24T22:05:03+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
+                "reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
-                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/7f8e44fc498972466f0841c3e48dc555f23bdf53",
+                "reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53",
                 "shasum": ""
             },
             "require": {
@@ -3081,20 +3088,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-29T09:49:29+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
+                "reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
-                "reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/23fd7aac70d99a17a8e6473a41fec8fab3331050",
+                "reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050",
                 "shasum": ""
             },
             "require": {
@@ -3154,20 +3161,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-27T23:11:39+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
+                "reference": "223bda89f9be41cf7033eeaf11bc61a280489c17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
-                "reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/223bda89f9be41cf7033eeaf11bc61a280489c17",
+                "reference": "223bda89f9be41cf7033eeaf11bc61a280489c17",
                 "shasum": ""
             },
             "require": {
@@ -3230,7 +3237,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-30T11:44:30+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -3281,20 +3288,21 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.5.2",
+            "version": "v2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "cfd5dc225767ca154853752abc93aeec040fcf36"
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/cfd5dc225767ca154853752abc93aeec040fcf36",
-                "reference": "cfd5dc225767ca154853752abc93aeec040fcf36",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-ctype": "^1.9"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.0"
@@ -3302,7 +3310,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3327,7 +3335,7 @@
                 "env",
                 "environment"
             ],
-            "time": "2018-10-30T17:29:25+00:00"
+            "time": "2019-01-29T11:11:52+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -3397,16 +3405,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.2.1",
+            "version": "v3.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c"
+                "reference": "ba046deba51f3899963c7d09840bf623c4ebf5ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/9d5caf43c5f3a3aea2178942f281054805872e7c",
-                "reference": "9d5caf43c5f3a3aea2178942f281054805872e7c",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/ba046deba51f3899963c7d09840bf623c4ebf5ed",
+                "reference": "ba046deba51f3899963c7d09840bf623c4ebf5ed",
                 "shasum": ""
             },
             "require": {
@@ -3461,7 +3469,7 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2018-11-09T08:37:55+00:00"
+            "time": "2019-02-04T10:23:43+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -3665,16 +3673,16 @@
         },
         {
             "name": "laravel/browser-kit-testing",
-            "version": "v4.1.0",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/browser-kit-testing.git",
-                "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf"
+                "reference": "b042ed965910a4ba69c0ebe8863d4029af3e242e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/550319e457aadc11c183bd6a1c46d225cf94fbaf",
-                "reference": "550319e457aadc11c183bd6a1c46d225cf94fbaf",
+                "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/b042ed965910a4ba69c0ebe8863d4029af3e242e",
+                "reference": "b042ed965910a4ba69c0ebe8863d4029af3e242e",
                 "shasum": ""
             },
             "require": {
@@ -3706,12 +3714,12 @@
                     "email": "taylor@laravel.com"
                 }
             ],
-            "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.",
+            "description": "Provides backwards compatibility for BrowserKit testing in the latest Laravel release.",
             "keywords": [
                 "laravel",
                 "testing"
             ],
-            "time": "2018-10-31T17:30:20+00:00"
+            "time": "2019-02-05T13:27:14+00:00"
         },
         {
             "name": "luthfi/simple-crud-generator",
@@ -3832,16 +3840,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
+                "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
-                "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
+                "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
                 "shasum": ""
             },
             "require": {
@@ -3850,7 +3858,7 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
+                "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
             },
             "type": "library",
             "extra": {
@@ -3893,7 +3901,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2018-10-02T21:52:37+00:00"
+            "time": "2019-02-13T09:37:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -4514,16 +4522,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.1",
+            "version": "7.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c23d78776ad415d5506e0679723cb461d71f488f"
+                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c23d78776ad415d5506e0679723cb461d71f488f",
-                "reference": "c23d78776ad415d5506e0679723cb461d71f488f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
+                "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9",
                 "shasum": ""
             },
             "require": {
@@ -4594,7 +4602,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-12-12T07:20:32+00:00"
+            "time": "2019-02-18T09:24:50+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4707,23 +4715,23 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "366541b989927187c4ca70490a35615d3fef2dce"
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
-                "reference": "366541b989927187c4ca70490a35615d3fef2dce",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0",
+                "phpunit/phpunit": "^7.5 || ^8.0",
                 "symfony/process": "^2 || ^3.3 || ^4"
             },
             "type": "library",
@@ -4759,32 +4767,35 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2018-06-10T07:54:39+00:00"
+            "time": "2019-02-04T06:01:07+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.0.1",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f"
+                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/febd209a219cea7b56ad799b30ebbea34b71eb8f",
-                "reference": "febd209a219cea7b56ad799b30ebbea34b71eb8f",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
+                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.4"
+                "phpunit/phpunit": "^7.5"
+            },
+            "suggest": {
+                "ext-posix": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -4809,7 +4820,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2018-11-25T09:31:21+00:00"
+            "time": "2019-02-01T05:27:49+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -5161,16 +5172,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.2.2",
+            "version": "v4.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044"
+                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
-                "reference": "8dc06251d5ad98d8494e1f742bec9cfdb9e42044",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d8476760b04cdf7b499c8718aa437c20a9155103",
+                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103",
                 "shasum": ""
             },
             "require": {
@@ -5214,7 +5225,7 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-16T20:35:37+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 9a1049750f53229b1caa42f2089f5cfc6c5197fb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Feb 2019 21:39:24 +0800
Subject: [PATCH 058/113] Add failing test for project file deletion

---
 tests/Feature/Projects/UploadFilesTest.php | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index a1d8fd7..3affc74 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -77,4 +77,35 @@ class UploadFilesTest extends TestCase
 
         Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
     }
+
+    /** @test */
+    public function user_can_delete_document_file_on_a_project()
+    {
+        Storage::fake('avatar');
+        $user = $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+
+        $this->visit(route('projects.files', $project));
+
+        $this->attach(UploadedFile::fake()->image('avatar.jpg'), 'file');
+        $this->type('Judul file', 'title');
+        $this->type('Deskripsi file yang diuplod.', 'description');
+        $this->press(__('file.upload'));
+
+        $this->assertCount(1, $project->files);
+
+        $file = $project->files->first();
+        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+
+        $this->visit(route('projects.files', $project));
+        $this->click('delete-file-'.$file->id);
+        $this->seePageIs(route('projects.files', [$project, 'action' => 'delete', 'id' => $file->id]));
+
+        $this->press(__('file.delete'));
+
+        $this->seePageIs(route('projects.files', $project));
+        $this->seeText(__('file.deleted'));
+        $this->dontSeeInDatabase('files', ['id' => $file->id]);
+        Storage::disk('avatar')->assertMissing('public/files/'.$file->filename);
+    }
 }

From 6195f76e26eb65980989c76989af036dfb7f674f Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Feb 2019 21:53:11 +0800
Subject: [PATCH 059/113] User can delete project file

---
 app/Http/Controllers/Projects/FilesController.php | 11 +++++++++++
 phpunit.xml                                       |  1 +
 resources/views/projects/files.blade.php          | 19 +++++++++++++++++--
 routes/web/projects.php                           |  1 +
 tests/Feature/Projects/UploadFilesTest.php        |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php
index 9dcd3d1..e07595b 100644
--- a/app/Http/Controllers/Projects/FilesController.php
+++ b/app/Http/Controllers/Projects/FilesController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Projects;
 
+use Storage;
 use File as FileSystem;
 use Illuminate\Http\Request;
 use App\Entities\Projects\File;
@@ -90,6 +91,16 @@ class FilesController extends Controller
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
 
+    public function destroy(Request $request, File $file)
+    {
+        Storage::disk('avatar')->delete('public/files/'.$file->filename);
+        $file->delete();
+
+        flash(trans('file.deleted'), 'warning');
+
+        return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
+    }
+
     private function proccessPhotoUpload($data, $fileableType, $fileableId)
     {
         $file = $data['file'];
diff --git a/phpunit.xml b/phpunit.xml
index 1636410..c32237e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -26,6 +26,7 @@
         <env name="DB_CONNECTION" value="sqlite"/>
         <env name="DB_DATABASE" value=":memory:"/>
         <env name="MAIL_DRIVER" value="log"/>
+        <env name="FILESYSTEM_DRIVER" value="test_storage"/>
     </php>
     <listeners>
         <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener">
diff --git a/resources/views/projects/files.blade.php b/resources/views/projects/files.blade.php
index 890cf69..611a8a0 100755
--- a/resources/views/projects/files.blade.php
+++ b/resources/views/projects/files.blade.php
@@ -42,7 +42,8 @@
                             {!! html_link_to_route('files.download', '', [$file->id], ['icon' => 'file', 'title' => __('file.download')]) !!}
                         </td>
                         <td class="text-center">
-                            {!! html_link_to_route('projects.files', '', [$project->id, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => __('file.edit')]) !!}
+                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => __('file.edit')]) !!}
+                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'delete', 'id' => $file->id], ['icon' => 'delete', 'title' => __('file.delete'), 'id' => 'delete-file-'.$file->id]) !!}
                         </td>
                     </tr>
                     @empty
@@ -79,7 +80,21 @@
                 {!! Form::close() !!}
             </div>
         </div>
-    @endif
+        @endif
+        @if (Request::get('action') == 'delete' && $editableFile)
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('file.delete') }} : {{ $editableFile->title }}</h3></div>
+            <div class="panel-body">
+                {!! FormField::delete(
+                    ['route' => ['files.destroy', $editableFile->id]],
+                    __('app.delete_confirm_button'),
+                    ['class' => 'btn btn-danger'],
+                    ['file_id' => $editableFile->id, ]
+                ) !!}
+                {{ link_to_route('projects.files', __('app.cancel'), $project, ['class' => 'btn btn-default']) }}
+            </div>
+        </div>
+        @endif
     </div>
 </div>
 
diff --git a/routes/web/projects.php b/routes/web/projects.php
index c51d41e..c1b6deb 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -61,6 +61,7 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
     Route::post('files/{fileable}', ['as' => 'files.upload', 'uses' => 'FilesController@create']);
     Route::get('files/{file}', ['as' => 'files.download', 'uses' => 'FilesController@show']);
     Route::patch('files/{file}', ['as' => 'files.update', 'uses' => 'FilesController@update']);
+    Route::delete('files/{file}', ['as' => 'files.destroy', 'uses' => 'FilesController@destroy']);
 });
 
 Route::group(['middleware' => ['auth']], function () {
diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index 3affc74..59767d3 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -101,7 +101,7 @@ class UploadFilesTest extends TestCase
         $this->click('delete-file-'.$file->id);
         $this->seePageIs(route('projects.files', [$project, 'action' => 'delete', 'id' => $file->id]));
 
-        $this->press(__('file.delete'));
+        $this->press(__('app.delete_confirm_button'));
 
         $this->seePageIs(route('projects.files', $project));
         $this->seeText(__('file.deleted'));

From 6e85850807b41a933c725c5693141ee42b0a3797 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Feb 2019 21:59:16 +0800
Subject: [PATCH 060/113] Fixing file system driver for testing

---
 app/Http/Controllers/Projects/FilesController.php | 16 +++++-----------
 resources/views/projects/files.blade.php          |  5 +++--
 tests/Feature/Projects/UploadFilesTest.php        | 14 +++++++-------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php
index e07595b..12f3baa 100644
--- a/app/Http/Controllers/Projects/FilesController.php
+++ b/app/Http/Controllers/Projects/FilesController.php
@@ -71,7 +71,7 @@ class FilesController extends Controller
             return response()->download(storage_path('app/public/files/'.$file->filename), $file->title.'.'.$extension);
         }
 
-        flash(trans('file.not_found'), 'danger');
+        flash(__('file.not_found'), 'danger');
 
         if (\URL::previous() != \URL::current()) {
             return back();
@@ -86,17 +86,17 @@ class FilesController extends Controller
         $file->description = $request->get('description');
         $file->save();
 
-        flash(trans('file.updated'), 'success');
+        flash(__('file.updated'), 'success');
 
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
 
     public function destroy(Request $request, File $file)
     {
-        Storage::disk('avatar')->delete('public/files/'.$file->filename);
+        Storage::delete('public/files/'.$file->filename);
         $file->delete();
 
-        flash(trans('file.deleted'), 'warning');
+        flash(__('file.deleted'), 'warning');
 
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
@@ -112,13 +112,7 @@ class FilesController extends Controller
         $fileData['title'] = $data['title'];
         $fileData['description'] = $data['description'];
         \DB::beginTransaction();
-        // dd(is_dir(storage_path('app/public/files')));
-        if (env('APP_ENV') == 'testing') {
-            $file->store('public/files', 'avatar');
-        } else {
-            $file->store('public/files');
-        }
-        // $file->move(storage_path('app/public/files'));
+        $file->store('public/files');
         $file = File::create($fileData);
         \DB::commit();
 
diff --git a/resources/views/projects/files.blade.php b/resources/views/projects/files.blade.php
index 611a8a0..ea71f90 100755
--- a/resources/views/projects/files.blade.php
+++ b/resources/views/projects/files.blade.php
@@ -43,7 +43,7 @@
                         </td>
                         <td class="text-center">
                             {!! html_link_to_route('projects.files', '', [$project, 'action' => 'edit', 'id' => $file->id], ['icon' => 'edit', 'title' => __('file.edit')]) !!}
-                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'delete', 'id' => $file->id], ['icon' => 'delete', 'title' => __('file.delete'), 'id' => 'delete-file-'.$file->id]) !!}
+                            {!! html_link_to_route('projects.files', '', [$project, 'action' => 'delete', 'id' => $file->id], ['icon' => 'remove', 'title' => __('file.delete'), 'id' => 'delete-file-'.$file->id]) !!}
                         </td>
                     </tr>
                     @empty
@@ -84,7 +84,8 @@
         @if (Request::get('action') == 'delete' && $editableFile)
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('file.delete') }} : {{ $editableFile->title }}</h3></div>
-            <div class="panel-body">
+            <div class="panel-body">{{ __('file.delete_confirm') }}</div>
+            <div class="panel-footer">
                 {!! FormField::delete(
                     ['route' => ['files.destroy', $editableFile->id]],
                     __('app.delete_confirm_button'),
diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index 59767d3..03e114e 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -15,7 +15,7 @@ class UploadFilesTest extends TestCase
     /** @test */
     public function user_can_upload_document_to_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
         $this->visit(route('projects.files', $project->id));
@@ -38,13 +38,13 @@ class UploadFilesTest extends TestCase
         ]);
 
         $file = $project->files->first();
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
     }
 
     /** @test */
     public function user_can_edit_document_file_on_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
 
@@ -75,13 +75,13 @@ class UploadFilesTest extends TestCase
             'description'   => 'Edit Deskripsi file yang diuplod.',
         ]);
 
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
     }
 
     /** @test */
     public function user_can_delete_document_file_on_a_project()
     {
-        Storage::fake('avatar');
+        Storage::fake(config('filesystem.default'));
         $user = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
 
@@ -95,7 +95,7 @@ class UploadFilesTest extends TestCase
         $this->assertCount(1, $project->files);
 
         $file = $project->files->first();
-        Storage::disk('avatar')->assertExists('public/files/'.$file->filename);
+        Storage::assertExists('public/files/'.$file->filename);
 
         $this->visit(route('projects.files', $project));
         $this->click('delete-file-'.$file->id);
@@ -106,6 +106,6 @@ class UploadFilesTest extends TestCase
         $this->seePageIs(route('projects.files', $project));
         $this->seeText(__('file.deleted'));
         $this->dontSeeInDatabase('files', ['id' => $file->id]);
-        Storage::disk('avatar')->assertMissing('public/files/'.$file->filename);
+        Storage::assertMissing('public/files/'.$file->filename);
     }
 }

From 9f3166b704ffab3b2e676e1099b1443806914045 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 22 Feb 2019 21:31:02 +0800
Subject: [PATCH 061/113] Add name_link attribute on Subscription model

---
 app/Entities/Subscriptions/Subscription.php | 15 +++++++++++++++
 tests/Unit/Models/SubscriptionTest.php      | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/app/Entities/Subscriptions/Subscription.php b/app/Entities/Subscriptions/Subscription.php
index 1829921..e5d4c0e 100755
--- a/app/Entities/Subscriptions/Subscription.php
+++ b/app/Entities/Subscriptions/Subscription.php
@@ -35,6 +35,21 @@ class Subscription extends Model
     }
 
     /**
+     * Show subscription name with link to subscription detail attribute.
+     *
+     * @return Illuminate\Support\HtmlString
+     */
+    public function getNameLinkAttribute()
+    {
+        return link_to_route('subscriptions.show', $this->name, $this, [
+            'title' => __(
+                'app.show_detail_title',
+                ['name' => $this->name, 'type' => __('subscription.subscription')]
+            ),
+        ]);
+    }
+
+    /**
      * Check weather the subscription is near it's due date.
      *
      * @return bool
diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php
index 9c7791f..fde1ef9 100644
--- a/tests/Unit/Models/SubscriptionTest.php
+++ b/tests/Unit/Models/SubscriptionTest.php
@@ -31,6 +31,21 @@ class SubscriptionTest extends TestCase
     }
 
     /** @test */
+    public function it_has_name_link_attribute()
+    {
+        $subscription = factory(Subscription::class)->create();
+
+        $this->assertEquals(
+            link_to_route('subscriptions.show', $subscription->name, $subscription, [
+                'title' => trans(
+                    'app.show_detail_title',
+                    ['name' => $subscription->name, 'type' => trans('subscription.subscription')]
+                ),
+            ]), $subscription->name_link
+        );
+    }
+
+    /** @test */
     public function it_has_near_of_due_date_method()
     {
         $next3Months = Carbon::now()->addMonths(3)->format('Y-m-d');

From 3bb84cc998939f58776cf2f27dddab0b0373a3e9 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 22 Feb 2019 21:33:53 +0800
Subject: [PATCH 062/113] Change all nameLink method to name_link attribute

---
 resources/views/customers/subscriptions.blade.php           | 2 +-
 resources/views/pages/home.blade.php                        | 2 +-
 resources/views/projects/subscriptions.blade.php            | 2 +-
 resources/views/subscriptions/index.blade.php               | 2 +-
 resources/views/subscriptions/partials/breadcrumb.blade.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/customers/subscriptions.blade.php b/resources/views/customers/subscriptions.blade.php
index 96271c9..f7cefd0 100755
--- a/resources/views/customers/subscriptions.blade.php
+++ b/resources/views/customers/subscriptions.blade.php
@@ -20,7 +20,7 @@
             @forelse($subscriptions as $key => $subscription)
             <tr>
                 <td>{{ 1 + $key }}</td>
-                <td>{{ $subscription->nameLink() }}</td>
+                <td>{{ $subscription->name_link }}</td>
                 <td class="text-center">{!! $subscription->type_label !!}</td>
                 <td>{{ $subscription->customer->name }}</td>
                 <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 8f930d4..721229d 100755
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -71,7 +71,7 @@
                 </tr>
                 @forelse(AdminDashboard::upcomingSubscriptionDueDatesList() as $subscription)
                 <tr>
-                    <td>{{ $subscription->nameLink() }}</td>
+                    <td>{{ $subscription->name_link }}</td>
                     <td>{{ $subscription->customer->name }}</td>
                     <td class="text-right">{{ format_money($subscription->price) }}</td>
                     <td class="text-center">
diff --git a/resources/views/projects/subscriptions.blade.php b/resources/views/projects/subscriptions.blade.php
index 29e1e35..7ad29fa 100755
--- a/resources/views/projects/subscriptions.blade.php
+++ b/resources/views/projects/subscriptions.blade.php
@@ -30,7 +30,7 @@
         <tr>
             <td>{{ 1 + $key }}</td>
             <td class="text-center">{{ $subscription->type }}</td>
-            <td>{{ $subscription->nameLink() }}</td>
+            <td>{{ $subscription->name_link }}</td>
             <td class="text-right">{{ date_id($subscription->start_date) }}</td>
             <td class="text-right">{{ date_id($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!}</td>
             <td class="text-right">{{ format_money($subscription->price) }}</td>
diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php
index 2d0fdda..49c9c09 100755
--- a/resources/views/subscriptions/index.blade.php
+++ b/resources/views/subscriptions/index.blade.php
@@ -30,7 +30,7 @@
         @forelse($subscriptions as $key => $subscription)
         <tr>
             <td>{{ $subscriptions->firstItem() + $key }}</td>
-            <td>{{ $subscription->nameLink() }}</td>
+            <td>{{ $subscription->name_link }}</td>
             <td class="text-center">{!! $subscription->type_label !!}</td>
             <td>{{ $subscription->customer->name }}</td>
             <td class="text-right" title="{!! $subscription->dueDateDescription() !!}">
diff --git a/resources/views/subscriptions/partials/breadcrumb.blade.php b/resources/views/subscriptions/partials/breadcrumb.blade.php
index 02ed975..5d18636 100644
--- a/resources/views/subscriptions/partials/breadcrumb.blade.php
+++ b/resources/views/subscriptions/partials/breadcrumb.blade.php
@@ -1,5 +1,5 @@
 <ul class="breadcrumb hidden-print">
     <li>{{ link_to_route('subscriptions.index',trans('subscription.list')) }}</li>
-    <li>{{ $subscription->nameLink() }}</li>
+    <li>{{ $subscription->name_link }}</li>
     <li class="active">{{ isset($title) ? $title : trans('subscription.detail') }}</li>
 </ul>

From f609d5c7a4553b55b1388c6a863e549a8f136bd7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 22 Feb 2019 21:39:52 +0800
Subject: [PATCH 063/113] Remove nameLink() method on Subscription model

---
 app/Entities/Subscriptions/Subscription.php | 15 ---------------
 tests/Unit/Models/SubscriptionTest.php      | 15 ---------------
 2 files changed, 30 deletions(-)

diff --git a/app/Entities/Subscriptions/Subscription.php b/app/Entities/Subscriptions/Subscription.php
index e5d4c0e..79abf4b 100755
--- a/app/Entities/Subscriptions/Subscription.php
+++ b/app/Entities/Subscriptions/Subscription.php
@@ -20,21 +20,6 @@ class Subscription extends Model
     protected $guarded = ['id', 'created_at', 'updated_at'];
 
     /**
-     * Show subscription name with link to subscription detail.
-     *
-     * @return Illuminate\Support\HtmlString
-     */
-    public function nameLink()
-    {
-        return link_to_route('subscriptions.show', $this->name, [$this->id], [
-            'title' => __(
-                'app.show_detail_title',
-                ['name' => $this->name, 'type' => __('subscription.subscription')]
-            ),
-        ]);
-    }
-
-    /**
      * Show subscription name with link to subscription detail attribute.
      *
      * @return Illuminate\Support\HtmlString
diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php
index fde1ef9..7e6ee5d 100644
--- a/tests/Unit/Models/SubscriptionTest.php
+++ b/tests/Unit/Models/SubscriptionTest.php
@@ -16,21 +16,6 @@ class SubscriptionTest extends TestCase
     use RefreshDatabase;
 
     /** @test */
-    public function it_has_name_link_method()
-    {
-        $subscription = factory(Subscription::class)->create();
-
-        $this->assertEquals(
-            link_to_route('subscriptions.show', $subscription->name, [$subscription->id], [
-                'title' => trans(
-                    'app.show_detail_title',
-                    ['name' => $subscription->name, 'type' => trans('subscription.subscription')]
-                ),
-            ]), $subscription->nameLink()
-        );
-    }
-
-    /** @test */
     public function it_has_name_link_attribute()
     {
         $subscription = factory(Subscription::class)->create();

From 5cbf55e70f8fe370c2a63ee44d1d566f65d9985d Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 24 Feb 2019 18:18:14 +0800
Subject: [PATCH 064/113] Project deletion will also deletes project files

Move file delete action to File model
---
 app/Entities/Projects/File.php                    |  8 ++++++++
 app/Entities/Projects/Project.php                 |  1 +
 app/Http/Controllers/Projects/FilesController.php |  3 ---
 tests/Unit/Models/ProjectTest.php                 | 21 +++++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/Entities/Projects/File.php b/app/Entities/Projects/File.php
index b2ed936..90e62a7 100644
--- a/app/Entities/Projects/File.php
+++ b/app/Entities/Projects/File.php
@@ -2,6 +2,7 @@
 
 namespace App\Entities\Projects;
 
+use Storage;
 use Illuminate\Database\Eloquent\Model;
 
 class File extends Model
@@ -37,4 +38,11 @@ class File extends Model
     {
         return \Storage::exists('public/files/'.$this->filename);
     }
+
+    public function delete()
+    {
+        Storage::delete('public/files/'.$this->filename);
+
+        return parent::delete();
+    }
 }
diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index d2ed10c..1607f58 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -255,6 +255,7 @@ class Project extends Model
     {
         DB::beginTransaction();
         $this->jobs->each->delete();
+        $this->files->each->delete();
         $this->invoices()->delete();
         $this->payments()->delete();
         $this->subscriptions()->delete();
diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php
index 12f3baa..9779c51 100644
--- a/app/Http/Controllers/Projects/FilesController.php
+++ b/app/Http/Controllers/Projects/FilesController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Projects;
 
-use Storage;
 use File as FileSystem;
 use Illuminate\Http\Request;
 use App\Entities\Projects\File;
@@ -93,9 +92,7 @@ class FilesController extends Controller
 
     public function destroy(Request $request, File $file)
     {
-        Storage::delete('public/files/'.$file->filename);
         $file->delete();
-
         flash(__('file.deleted'), 'warning');
 
         return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index c8233e2..ff9a2f7 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -4,6 +4,7 @@ namespace Tests\Unit\Models;
 
 use Tests\TestCase;
 use App\Entities\Projects\Job;
+use App\Entities\Projects\File;
 use App\Entities\Projects\Task;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
@@ -223,10 +224,30 @@ class ProjectTest extends TestCase
     public function a_project_has_many_files()
     {
         $project = factory(Project::class)->create();
+
         $this->assertInstanceOf(Collection::class, $project->files);
     }
 
     /** @test */
+    public function project_deletion_also_deletes_related_files()
+    {
+        $project = factory(Project::class)->create();
+        $file = File::create([
+            'fileable_id'   => $project->id,
+            'fileable_type' => 'projects',
+            'filename'      => 'filename.jpg',
+            'title'         => 'filename.jpg',
+        ]);
+
+        $project->delete();
+
+        $this->dontSeeInDatabase('files', [
+            'fileable_id'   => $project->id,
+            'fileable_type' => 'projects',
+        ]);
+    }
+
+    /** @test */
     public function a_project_has_collectible_earnings_method()
     {
         // Collectible earnings is total of (price * avg task progress of each job)

From a770076eeddfa225e2126b3d570ca7623576eed8 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 3 Mar 2019 20:58:53 +0800
Subject: [PATCH 065/113] [wip] Project issue failing feature tests

---
 tests/Feature/Projects/ProjectIssuesTest.php | 106 +++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 tests/Feature/Projects/ProjectIssuesTest.php

diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
new file mode 100644
index 0000000..bd3cc51
--- /dev/null
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Feature\Projects;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class ProjectIssuesTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function user_can_view_project_issues()
+    {
+        $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+        $issue = factory(Issue::class)->create([
+            'project_id' => $project->id,
+            'title'      => 'The issue title.',
+            'body'       => 'This is a project issue body.',
+        ]);
+
+        $this->visitRoute('projects.issues.index', $project);
+        $this->seeRouteIs('projects.issues.index', $project);
+
+        $this->seeText('The issue title.');
+        $this->seeText('This is a project issue.');
+    }
+
+    /** @test */
+    public function admin_can_add_issue_to_a_project()
+    {
+        $admin = $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+
+        $this->visitRoute('projects.issues.index', $project);
+
+        $this->submitForm(__('issue.create'), [
+            'title' => 'First Issue.',
+            'body'  => 'First Issue description.',
+        ]);
+
+        $this->seePageIs(route('projects.issues.index', $project));
+        $this->see(__('issue.created'));
+
+        $this->seeInDatabase('issues', [
+            'project_id' => $project->id,
+            'title'      => 'First Issue.',
+            'body'       => 'First Issue description.',
+            'creator_id' => $admin->id,
+        ]);
+    }
+
+    /** @test */
+    public function user_can_edit_issue()
+    {
+        $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+        $issue = factory(Issue::class)->create([
+            'project_id' => $project->id,
+            'title'      => 'The issue title.',
+            'body'       => 'This is a project issue body.',
+        ]);
+
+        $this->visitRoute('projects.issues.index', $project);
+        $this->seeElement('a', ['id' => 'edit-issue-'.$issue->id]);
+        $this->click('edit-issue-'.$issue->id);
+        $this->seeRouteIs('projects.issues.index', [$project, 'action' => 'issue-edit', 'issue_id' => $issue->id]);
+
+        $this->submitForm(__('issue.update'), [
+            'title' => 'First Issue.',
+            'body'  => 'This is a project issue body.',
+        ]);
+
+        $this->seePageIs(route('projects.issues.index', $project));
+        $this->see(__('issue.updated'));
+
+        $this->seeInDatabase('issues', [
+            'id'         => $issue->id,
+            'project_id' => $project->id,
+            'title'      => 'First Issue.',
+            'body'       => 'This is a project issue body.',
+        ]);
+    }
+
+    /** @test */
+    public function user_can_delete_issue()
+    {
+        $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+        $issue = factory(Issue::class)->create([
+            'project_id' => $project->id,
+        ]);
+
+        $this->visitRoute('projects.issues.index', $project);
+        $this->seeElement('button', ['id' => 'delete-issue-'.$issue->id]);
+        $this->press('delete-issue-'.$issue->id);
+
+        $this->seePageIs(route('projects.issues.index', $project));
+        $this->see(__('issue.deleted'));
+
+        $this->dontSeeInDatabase('issues', [
+            'id' => $issue->id,
+        ]);
+    }
+}

From 5b703da256104ea0bf04240f09eaf75aaab1e39a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 3 Mar 2019 21:18:34 +0800
Subject: [PATCH 066/113] Add project issue listing page and model relation

---
 app/Entities/Projects/Issue.php                    | 10 +++++++
 app/Entities/Projects/Project.php                  | 11 +++++++
 app/Http/Controllers/Projects/IssueController.php  | 16 ++++++++++
 database/factories/IssueFactory.php                | 15 ++++++++++
 .../2019_03_03_210017_create_issues_table.php      | 34 ++++++++++++++++++++++
 resources/views/projects/issues.blade.php          | 32 ++++++++++++++++++++
 routes/web/projects.php                            |  5 ++++
 tests/Feature/Projects/ProjectIssuesTest.php       |  3 +-
 tests/Unit/Models/ProjectTest.php                  | 11 +++++++
 9 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 app/Entities/Projects/Issue.php
 create mode 100644 app/Http/Controllers/Projects/IssueController.php
 create mode 100644 database/factories/IssueFactory.php
 create mode 100644 database/migrations/2019_03_03_210017_create_issues_table.php
 create mode 100755 resources/views/projects/issues.blade.php

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
new file mode 100644
index 0000000..44f1658
--- /dev/null
+++ b/app/Entities/Projects/Issue.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Entities\Projects;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Issue extends Model
+{
+    //
+}
diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index 1607f58..6c6d59e 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -3,6 +3,7 @@
 namespace App\Entities\Projects;
 
 use DB;
+use App\Entities\Projects\Issue;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
 use App\Entities\Partners\Customer;
@@ -264,4 +265,14 @@ class Project extends Model
 
         return parent::delete();
     }
+
+    /**
+     * Project has many Issues relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function issues()
+    {
+        return $this->hasMany(Issue::class);
+    }
 }
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
new file mode 100644
index 0000000..fe977e1
--- /dev/null
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Projects;
+
+use App\Entities\Projects\Project;
+use App\Http\Controllers\Controller;
+
+class IssueController extends Controller
+{
+    public function index(Project $project)
+    {
+        $issues = $project->issues;
+
+        return view('projects.issues', compact('project', 'issues'));
+    }
+}
diff --git a/database/factories/IssueFactory.php b/database/factories/IssueFactory.php
new file mode 100644
index 0000000..a99dc3b
--- /dev/null
+++ b/database/factories/IssueFactory.php
@@ -0,0 +1,15 @@
+<?php
+
+use Faker\Generator as Faker;
+use App\Entities\Projects\Issue;
+use App\Entities\Projects\Project;
+
+$factory->define(Issue::class, function (Faker $faker) {
+    return [
+        'project_id' => function () {
+            return factory(Project::class)->create()->id;
+        },
+        'title'      => $faker->words(3, true),
+        'body'       => $faker->sentences(3, true),
+    ];
+});
diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php
new file mode 100644
index 0000000..d2cf1ab
--- /dev/null
+++ b/database/migrations/2019_03_03_210017_create_issues_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateIssuesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('issues', function (Blueprint $table) {
+            $table->increments('id');
+            $table->unsignedInteger('project_id');
+            $table->string('title', 60);
+            $table->string('body');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('issues');
+    }
+}
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
new file mode 100755
index 0000000..8011433
--- /dev/null
+++ b/resources/views/projects/issues.blade.php
@@ -0,0 +1,32 @@
+@extends('layouts.project')
+
+@section('subtitle', __('project.issues'))
+
+@section('content-project')
+<div id="project-issues" class="panel panel-default table-responsive">
+    <div class="panel-heading">
+        <h3 class="panel-title">{{ __('project.issues') }}</h3>
+    </div>
+    <table class="table table-condensed table-striped">
+        <thead>
+            <th>{{ __('app.table_no') }}</th>
+            <th>{{ __('issue.name') }}</th>
+            <th class="text-center">{{ __('app.action') }}</th>
+        </thead>
+        <tbody>
+            @forelse($issues as $key => $issue)
+            @php
+            $no = 1 + $key;
+            @endphp
+            <tr id="{{ $issue->id }}">
+                <td>{{ $no }}</td>
+                <td>{{ $issue->title }}</td>
+                <td class="text-center">&nbsp;</td>
+            </tr>
+            @empty
+            <tr><td colspan="3">{{ __('issue.empty') }}</td></tr>
+            @endforelse
+        </tbody>
+    </table>
+</div>
+@endsection
diff --git a/routes/web/projects.php b/routes/web/projects.php
index c1b6deb..61fab86 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -46,6 +46,11 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
     Route::delete('projects/{project}/comments/{comment}', 'CommentsController@destroy')->name('projects.comments.destroy');
 
     /*
+     * Project Issues Routes
+     */
+    Route::get('projects/{project}/issues', 'IssueController@index')->name('projects.issues.index');
+
+    /*
      * Tasks Routes
      */
     Route::get('jobs/{job}/tasks/create', ['as' => 'tasks.create', 'uses' => 'TasksController@create']);
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index bd3cc51..59c1ecf 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -3,6 +3,8 @@
 namespace Tests\Feature\Projects;
 
 use Tests\TestCase;
+use App\Entities\Projects\Issue;
+use App\Entities\Projects\Project;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class ProjectIssuesTest extends TestCase
@@ -24,7 +26,6 @@ class ProjectIssuesTest extends TestCase
         $this->seeRouteIs('projects.issues.index', $project);
 
         $this->seeText('The issue title.');
-        $this->seeText('This is a project issue.');
     }
 
     /** @test */
diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php
index ff9a2f7..5164333 100644
--- a/tests/Unit/Models/ProjectTest.php
+++ b/tests/Unit/Models/ProjectTest.php
@@ -6,6 +6,7 @@ use Tests\TestCase;
 use App\Entities\Projects\Job;
 use App\Entities\Projects\File;
 use App\Entities\Projects\Task;
+use App\Entities\Projects\Issue;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
 use App\Entities\Projects\Comment;
@@ -350,4 +351,14 @@ class ProjectTest extends TestCase
             'project_id' => $project->id,
         ]);
     }
+
+    /** @test */
+    public function a_project_has_many_issues_relation()
+    {
+        $project = factory(Project::class)->create();
+        $issue = factory(Issue::class)->create(['project_id' => $project->id]);
+
+        $this->assertInstanceOf(Collection::class, $project->issues);
+        $this->assertInstanceOf(Issue::class, $project->issues->first());
+    }
 }

From 94f051dff618fc3293e1d9fdc3f7f1a19ba9b7e0 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 4 Mar 2019 21:09:11 +0800
Subject: [PATCH 067/113] Add issue creation form

---
 app/Entities/Projects/Issue.php                    |  2 +-
 app/Http/Controllers/Projects/IssueController.php  | 24 +++++++++++++++++
 .../2019_03_03_210017_create_issues_table.php      |  1 +
 resources/views/projects/issues/create.blade.php   | 30 ++++++++++++++++++++++
 routes/web.php                                     |  3 +++
 routes/web/projects.php                            |  2 ++
 tests/Feature/Projects/ProjectIssuesTest.php       |  2 +-
 7 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100755 resources/views/projects/issues/create.blade.php

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 44f1658..877c7b3 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class Issue extends Model
 {
-    //
+    protected $fillable = ['project_id', 'title', 'body', 'creator_id'];
 }
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index fe977e1..7f70e94 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers\Projects;
 
+use Illuminate\Http\Request;
+use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
 use App\Http\Controllers\Controller;
 
@@ -13,4 +15,26 @@ class IssueController extends Controller
 
         return view('projects.issues', compact('project', 'issues'));
     }
+
+    public function create(Project $project)
+    {
+        return view('projects.issues.create', compact('project'));
+    }
+
+    public function store(Request $request, Project $project)
+    {
+        $issueData = $request->validate([
+            'title' => 'required|max:60',
+            'body'  => 'required|max:255',
+        ]);
+        Issue::create([
+            'project_id' => $project->id,
+            'creator_id' => auth()->id(),
+            'title'      => $issueData['title'],
+            'body'       => $issueData['body'],
+        ]);
+        flash(__('issue.created'), 'success');
+
+        return redirect()->route('projects.issues.index', $project);
+    }
 }
diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php
index d2cf1ab..f67ddbf 100644
--- a/database/migrations/2019_03_03_210017_create_issues_table.php
+++ b/database/migrations/2019_03_03_210017_create_issues_table.php
@@ -18,6 +18,7 @@ class CreateIssuesTable extends Migration
             $table->unsignedInteger('project_id');
             $table->string('title', 60);
             $table->string('body');
+            $table->unsignedInteger('creator_id');
             $table->timestamps();
         });
     }
diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php
new file mode 100755
index 0000000..b3deedb
--- /dev/null
+++ b/resources/views/projects/issues/create.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.project')
+
+@section('subtitle', __('issue.create'))
+
+@section('action-buttons')
+@can('create', new App\Entities\Projects\Job)
+    {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
+@endcan
+@endsection
+
+@section('content-project')
+
+<div class="row">
+    <div class="col-sm-6 col-sm-offset-2">
+        {{ Form::open(['route' => ['projects.issues.store', $project]]) }}
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('issue.create') }}</h3></div>
+            <div class="panel-body">
+                {!! FormField::text('title', ['label' => __('issue.title')]) !!}
+                {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+            </div>
+            <div class="panel-footer">
+                {{ Form::submit(__('issue.create'), ['class' => 'btn btn-primary']) }}
+                {{ link_to_route('projects.issues.index', __('app.cancel'), $project, ['class' => 'btn btn-default']) }}
+            </div>
+        </div>
+        {{ Form::close() }}
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index e7922bc..4fd2e73 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,4 +1,7 @@
 <?php
+if (!app()->runningUnitTests()) {
+    auth()->loginUsingId(1);
+}
 
 require __DIR__.'/web/pages.php';
 require __DIR__.'/web/users.php';
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 61fab86..79a2847 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -49,6 +49,8 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
      * Project Issues Routes
      */
     Route::get('projects/{project}/issues', 'IssueController@index')->name('projects.issues.index');
+    Route::get('projects/{project}/issues/create', 'IssueController@create')->name('projects.issues.create');
+    Route::post('projects/{project}/issues', 'IssueController@store')->name('projects.issues.store');
 
     /*
      * Tasks Routes
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 59c1ecf..0e2b488 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -34,7 +34,7 @@ class ProjectIssuesTest extends TestCase
         $admin = $this->adminUserSigningIn();
         $project = factory(Project::class)->create();
 
-        $this->visitRoute('projects.issues.index', $project);
+        $this->visitRoute('projects.issues.create', $project);
 
         $this->submitForm(__('issue.create'), [
             'title' => 'First Issue.',

From df9f47739eadb6da84b2c3082efbea14565256cb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 4 Mar 2019 21:13:35 +0800
Subject: [PATCH 068/113] Update issue lang files

---
 resources/lang/de/issue.php                      | 33 ++++++++++++++++++++++++
 resources/lang/en/issue.php                      | 33 ++++++++++++++++++++++++
 resources/lang/id/issue.php                      | 33 ++++++++++++++++++++++++
 resources/views/projects/issues/create.blade.php |  2 +-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 resources/lang/de/issue.php
 create mode 100644 resources/lang/en/issue.php
 create mode 100644 resources/lang/id/issue.php

diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
new file mode 100644
index 0000000..23ad493
--- /dev/null
+++ b/resources/lang/de/issue.php
@@ -0,0 +1,33 @@
+<?php
+
+return [
+    // Labels
+    'issue'         => 'Issue',
+    'list'          => 'Issue List',
+    'search'        => 'Search Issue',
+    'search_text'   => 'Title ...',
+    'all'           => 'All Issue',
+    'select'        => 'Select Issue',
+    'detail'        => 'Issue Detail',
+    'not_found'     => 'Issue not found.',
+    'empty'         => 'Issue is empty.',
+    'back_to_show'  => 'Back to Issue Detail',
+    'back_to_index' => 'Back to Issue List',
+
+    // Actions
+    'create'         => 'Create new Issue',
+    'created'        => 'A new Issue has been created.',
+    'show'           => 'View Issue Detail',
+    'edit'           => 'Edit Issue',
+    'update'         => 'Update Issue',
+    'updated'        => 'Issue data has been updated.',
+    'delete'         => 'Delete Issue',
+    'delete_confirm' => 'Are you sure to delete this Issue?',
+    'deleted'        => 'Issue has been deleted.',
+    'undeleted'      => 'Issue not deleted.',
+    'undeleteable'   => 'Issue data cannot be deleted.',
+
+    // Attributes
+    'title' => 'Issue Title',
+    'body'  => 'Issue Description',
+];
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
new file mode 100644
index 0000000..23ad493
--- /dev/null
+++ b/resources/lang/en/issue.php
@@ -0,0 +1,33 @@
+<?php
+
+return [
+    // Labels
+    'issue'         => 'Issue',
+    'list'          => 'Issue List',
+    'search'        => 'Search Issue',
+    'search_text'   => 'Title ...',
+    'all'           => 'All Issue',
+    'select'        => 'Select Issue',
+    'detail'        => 'Issue Detail',
+    'not_found'     => 'Issue not found.',
+    'empty'         => 'Issue is empty.',
+    'back_to_show'  => 'Back to Issue Detail',
+    'back_to_index' => 'Back to Issue List',
+
+    // Actions
+    'create'         => 'Create new Issue',
+    'created'        => 'A new Issue has been created.',
+    'show'           => 'View Issue Detail',
+    'edit'           => 'Edit Issue',
+    'update'         => 'Update Issue',
+    'updated'        => 'Issue data has been updated.',
+    'delete'         => 'Delete Issue',
+    'delete_confirm' => 'Are you sure to delete this Issue?',
+    'deleted'        => 'Issue has been deleted.',
+    'undeleted'      => 'Issue not deleted.',
+    'undeleteable'   => 'Issue data cannot be deleted.',
+
+    // Attributes
+    'title' => 'Issue Title',
+    'body'  => 'Issue Description',
+];
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
new file mode 100644
index 0000000..da09115
--- /dev/null
+++ b/resources/lang/id/issue.php
@@ -0,0 +1,33 @@
+<?php
+
+return [
+    // Labels
+    'issue'         => 'Issue',
+    'list'          => 'Daftar Issue',
+    'search'        => 'Cari Issue',
+    'search_text'   => 'Nama ...',
+    'all'           => 'Semua Issue',
+    'select'        => 'Pilih Issue',
+    'detail'        => 'Detail Issue',
+    'not_found'     => 'Issue tidak ditemukan',
+    'empty'         => 'Belum ada Issue',
+    'back_to_show'  => 'Kembali ke detail Issue',
+    'back_to_index' => 'Kembali ke daftar Issue',
+
+    // Actions
+    'create'         => 'Input Issue Baru',
+    'created'        => 'Input Issue baru telah berhasil.',
+    'show'           => 'Lihat Detail Issue',
+    'edit'           => 'Edit Issue',
+    'update'         => 'Update Issue',
+    'updated'        => 'Update data Issue telah berhasil.',
+    'delete'         => 'Hapus Issue',
+    'delete_confirm' => 'Anda yakin akan menghapus Issue ini?',
+    'deleted'        => 'Hapus data Issue telah berhasil.',
+    'undeleted'      => 'Data Issue gagal dihapus.',
+    'undeleteable'   => 'Data Issue tidak dapat dihapus.',
+
+    // Attributes
+    'title' => 'Judul Issue',
+    'body'  => 'Deskripsi Issue',
+];
diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php
index b3deedb..7981727 100755
--- a/resources/views/projects/issues/create.blade.php
+++ b/resources/views/projects/issues/create.blade.php
@@ -20,7 +20,7 @@
                 {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
             </div>
             <div class="panel-footer">
-                {{ Form::submit(__('issue.create'), ['class' => 'btn btn-primary']) }}
+                {{ Form::submit(__('issue.create'), ['class' => 'btn btn-success']) }}
                 {{ link_to_route('projects.issues.index', __('app.cancel'), $project, ['class' => 'btn btn-default']) }}
             </div>
         </div>

From 08c2281d472613b263401b27d9ae9bf79987be82 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 6 Mar 2019 23:10:56 +0800
Subject: [PATCH 069/113] Add issue detail page

---
 app/Http/Controllers/Projects/IssueController.php |  5 +++++
 database/factories/IssueFactory.php               |  4 ++++
 resources/views/projects/issues.blade.php         |  9 ++++++++-
 resources/views/projects/issues/create.blade.php  |  2 +-
 resources/views/projects/issues/show.blade.php    | 20 ++++++++++++++++++++
 routes/web/projects.php                           |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      | 16 ++++++++++++++++
 7 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100755 resources/views/projects/issues/show.blade.php

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 7f70e94..d0f1e9d 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -37,4 +37,9 @@ class IssueController extends Controller
 
         return redirect()->route('projects.issues.index', $project);
     }
+
+    public function show(Project $project, Issue $issue)
+    {
+        return view('projects.issues.show', compact('project', 'issue'));
+    }
 }
diff --git a/database/factories/IssueFactory.php b/database/factories/IssueFactory.php
index a99dc3b..859781d 100644
--- a/database/factories/IssueFactory.php
+++ b/database/factories/IssueFactory.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Entities\Users\User;
 use Faker\Generator as Faker;
 use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
@@ -11,5 +12,8 @@ $factory->define(Issue::class, function (Faker $faker) {
         },
         'title'      => $faker->words(3, true),
         'body'       => $faker->sentences(3, true),
+        'creator_id' => function () {
+            return factory(User::class)->create()->id;
+        },
     ];
 });
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index 8011433..514ef5e 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -21,7 +21,14 @@
             <tr id="{{ $issue->id }}">
                 <td>{{ $no }}</td>
                 <td>{{ $issue->title }}</td>
-                <td class="text-center">&nbsp;</td>
+                <td class="text-center">
+                    {{ link_to_route(
+                        'projects.issues.show',
+                        __('app.show'),
+                        [$project, $issue],
+                        ['class' => 'small', 'title' => __('issue.show')]
+                    ) }}
+                </td>
             </tr>
             @empty
             <tr><td colspan="3">{{ __('issue.empty') }}</td></tr>
diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php
index 7981727..46df9d4 100755
--- a/resources/views/projects/issues/create.blade.php
+++ b/resources/views/projects/issues/create.blade.php
@@ -3,7 +3,7 @@
 @section('subtitle', __('issue.create'))
 
 @section('action-buttons')
-@can('create', new App\Entities\Projects\Job)
+@can('create', new App\Entities\Projects\Issue)
     {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
 @endcan
 @endsection
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
new file mode 100755
index 0000000..a632104
--- /dev/null
+++ b/resources/views/projects/issues/show.blade.php
@@ -0,0 +1,20 @@
+@extends('layouts.project')
+
+@section('subtitle', __('issue.detail'))
+
+@section('content-project')
+
+<div class="row">
+    <div class="col-md-5">
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('issue.detail') }}</h3></div>
+            <table class="table table-condensed">
+                <tbody>
+                    <tr><th class="col-md-4">{{ __('issue.title') }}</th><td class="col-md-8">{{ $issue->title }}</td></tr>
+                    <tr><th>{{ __('issue.body') }}</th><td>{{ $issue->body }}</td></tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 79a2847..fe5e331 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -51,6 +51,7 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
     Route::get('projects/{project}/issues', 'IssueController@index')->name('projects.issues.index');
     Route::get('projects/{project}/issues/create', 'IssueController@create')->name('projects.issues.create');
     Route::post('projects/{project}/issues', 'IssueController@store')->name('projects.issues.store');
+    Route::get('projects/{project}/issues/{issue}', 'IssueController@show')->name('projects.issues.show');
 
     /*
      * Tasks Routes
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 0e2b488..83b5544 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -53,6 +53,22 @@ class ProjectIssuesTest extends TestCase
     }
 
     /** @test */
+    public function user_can_view_an_issue_detail()
+    {
+        $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+        $issue = factory(Issue::class)->create([
+            'project_id' => $project->id,
+            'title'      => 'The issue title.',
+            'body'       => 'This is a project issue body.',
+        ]);
+
+        $this->visitRoute('projects.issues.show', [$project, $issue]);
+        $this->seeText($issue->title);
+        $this->seeText($issue->body);
+    }
+
+    /** @test */
     public function user_can_edit_issue()
     {
         $this->adminUserSigningIn();

From 7460d08cd89f1d93bee16a9fc7e403bafe8d8cdd Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 6 Mar 2019 23:13:41 +0800
Subject: [PATCH 070/113] Update lang files for project issue label

---
 resources/lang/de/project.php             | 1 +
 resources/lang/en/project.php             | 1 +
 resources/lang/id/project.php             | 1 +
 resources/views/projects/issues.blade.php | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de/project.php b/resources/lang/de/project.php
index fcbeb7f..07898c5 100644
--- a/resources/lang/de/project.php
+++ b/resources/lang/de/project.php
@@ -71,6 +71,7 @@ return [
     'subscriptions' => 'Abonnements',
     'status'        => 'Projektstatus',
     'payments'      => 'Zahlungen',
+    'issues'        => 'Issues',
 
     // Statuses
     'planned'  => 'geplant',
diff --git a/resources/lang/en/project.php b/resources/lang/en/project.php
index 31886ef..c3a5c40 100644
--- a/resources/lang/en/project.php
+++ b/resources/lang/en/project.php
@@ -71,6 +71,7 @@ return [
     'subscriptions' => 'Subscriptions',
     'status'        => 'Project Status',
     'payments'      => 'Payments',
+    'issues'        => 'Issues',
 
     // Statuses
     'planned'  => 'Planned',
diff --git a/resources/lang/id/project.php b/resources/lang/id/project.php
index 998a19b..2ea3b04 100644
--- a/resources/lang/id/project.php
+++ b/resources/lang/id/project.php
@@ -71,6 +71,7 @@ return [
     'subscriptions' => 'Langganan',
     'status'        => 'Status Project',
     'payments'      => 'Pembayaran',
+    'issues'        => 'Issue',
 
     // Statuses
     'planned'  => 'Rencana',
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index 514ef5e..edc3256 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -10,7 +10,7 @@
     <table class="table table-condensed table-striped">
         <thead>
             <th>{{ __('app.table_no') }}</th>
-            <th>{{ __('issue.name') }}</th>
+            <th>{{ __('issue.title') }}</th>
             <th class="text-center">{{ __('app.action') }}</th>
         </thead>
         <tbody>

From 9cfc4754e0c65eaf92f16430919ae3771be082dc Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 7 Mar 2019 21:30:22 +0800
Subject: [PATCH 071/113] User can edit a project issue

---
 app/Http/Controllers/Projects/IssueController.php | 20 ++++++++++++++++++++
 resources/views/projects/issues/edit.blade.php    | 23 +++++++++++++++++++++++
 resources/views/projects/issues/show.blade.php    |  3 +++
 routes/web/projects.php                           |  2 ++
 tests/Feature/Projects/ProjectIssuesTest.php      |  6 +++---
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100755 resources/views/projects/issues/edit.blade.php

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index d0f1e9d..16147d8 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -42,4 +42,24 @@ class IssueController extends Controller
     {
         return view('projects.issues.show', compact('project', 'issue'));
     }
+
+    public function edit(Project $project, Issue $issue)
+    {
+        return view('projects.issues.edit', compact('project', 'issue'));
+    }
+
+    public function update(Request $request, Project $project, Issue $issue)
+    {
+        $issueData = $request->validate([
+            'title' => 'required|max:60',
+            'body'  => 'required|max:255',
+        ]);
+        $issue->title = $issueData['title'];
+        $issue->body = $issueData['body'];
+        $issue->save();
+
+        flash(__('issue.updated'), 'success');
+
+        return redirect()->route('projects.issues.show', [$project, $issue]);
+    }
 }
diff --git a/resources/views/projects/issues/edit.blade.php b/resources/views/projects/issues/edit.blade.php
new file mode 100755
index 0000000..cbd2194
--- /dev/null
+++ b/resources/views/projects/issues/edit.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.project')
+
+@section('subtitle', __('issue.update'))
+
+@section('content-project')
+<div class="row">
+    <div class="col-sm-6 col-sm-offset-2">
+        {{ Form::model($issue, ['route' => ['projects.issues.update', $project, $issue], 'method' => 'patch']) }}
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('issue.update') }}</h3></div>
+            <div class="panel-body">
+                {!! FormField::text('title', ['label' => __('issue.title')]) !!}
+                {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+            </div>
+            <div class="panel-footer">
+                {{ Form::submit(__('issue.update'), ['class' => 'btn btn-success']) }}
+                {{ link_to_route('projects.issues.show', __('app.cancel'), [$project, $issue], ['class' => 'btn btn-default']) }}
+            </div>
+        </div>
+        {{ Form::close() }}
+    </div>
+</div>
+@endsection
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index a632104..4a8f716 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -14,6 +14,9 @@
                     <tr><th>{{ __('issue.body') }}</th><td>{{ $issue->body }}</td></tr>
                 </tbody>
             </table>
+            <div class="panel-footer">
+                {{ link_to_route('projects.issues.edit', __('issue.edit'), [$project, $issue], ['id' => 'edit-issue-'.$issue->id, 'class' => 'btn btn-warning']) }}
+            </div>
         </div>
     </div>
 </div>
diff --git a/routes/web/projects.php b/routes/web/projects.php
index fe5e331..53b6af9 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -52,6 +52,8 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
     Route::get('projects/{project}/issues/create', 'IssueController@create')->name('projects.issues.create');
     Route::post('projects/{project}/issues', 'IssueController@store')->name('projects.issues.store');
     Route::get('projects/{project}/issues/{issue}', 'IssueController@show')->name('projects.issues.show');
+    Route::get('projects/{project}/issues/{issue}/edit', 'IssueController@edit')->name('projects.issues.edit');
+    Route::patch('projects/{project}/issues/{issue}', 'IssueController@update')->name('projects.issues.update');
 
     /*
      * Tasks Routes
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 83b5544..7ae6f45 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -79,17 +79,17 @@ class ProjectIssuesTest extends TestCase
             'body'       => 'This is a project issue body.',
         ]);
 
-        $this->visitRoute('projects.issues.index', $project);
+        $this->visitRoute('projects.issues.show', [$project, $issue]);
         $this->seeElement('a', ['id' => 'edit-issue-'.$issue->id]);
         $this->click('edit-issue-'.$issue->id);
-        $this->seeRouteIs('projects.issues.index', [$project, 'action' => 'issue-edit', 'issue_id' => $issue->id]);
+        $this->seeRouteIs('projects.issues.edit', [$project, $issue]);
 
         $this->submitForm(__('issue.update'), [
             'title' => 'First Issue.',
             'body'  => 'This is a project issue body.',
         ]);
 
-        $this->seePageIs(route('projects.issues.index', $project));
+        $this->seePageIs(route('projects.issues.show', [$project, $issue]));
         $this->see(__('issue.updated'));
 
         $this->seeInDatabase('issues', [

From d2ece73d44592641e344a34d4be613227427bcd5 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 7 Mar 2019 21:42:17 +0800
Subject: [PATCH 072/113] Add issue deletion feature

---
 app/Http/Controllers/Projects/IssueController.php | 14 +++++++
 resources/views/projects/issues/edit.blade.php    | 47 +++++++++++++++++------
 routes/web/projects.php                           |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      | 10 ++++-
 4 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 16147d8..e13d772 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -62,4 +62,18 @@ class IssueController extends Controller
 
         return redirect()->route('projects.issues.show', [$project, $issue]);
     }
+
+    public function destroy(Request $request, Project $project, Issue $issue)
+    {
+        $request->validate(['issue_id' => 'required']);
+
+        if ($request->get('issue_id') == $issue->id && $issue->delete()) {
+            flash(__('issue.deleted'), 'warning');
+
+            return redirect()->route('projects.issues.index', $project);
+        }
+        flash(__('issue.undeleted'), 'danger');
+
+        return back();
+    }
 }
diff --git a/resources/views/projects/issues/edit.blade.php b/resources/views/projects/issues/edit.blade.php
index cbd2194..7746ce3 100755
--- a/resources/views/projects/issues/edit.blade.php
+++ b/resources/views/projects/issues/edit.blade.php
@@ -5,19 +5,44 @@
 @section('content-project')
 <div class="row">
     <div class="col-sm-6 col-sm-offset-2">
-        {{ Form::model($issue, ['route' => ['projects.issues.update', $project, $issue], 'method' => 'patch']) }}
-        <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ __('issue.update') }}</h3></div>
-            <div class="panel-body">
-                {!! FormField::text('title', ['label' => __('issue.title')]) !!}
-                {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+        @if (request('action') == 'delete' && $issue)
+            <div class="panel panel-default">
+                <div class="panel-heading"><h3 class="panel-title">{{ __('issue.delete') }}</h3></div>
+                <div class="panel-body">
+                    <label class="control-label text-primary">{{ __('issue.title') }}</label>
+                    <p>{{ $issue->title }}</p>
+                    <label class="control-label text-primary">{{ __('issue.body') }}</label>
+                    <p>{{ $issue->body }}</p>
+                    {!! $errors->first('issue_id', '<span class="form-error small">:message</span>') !!}
+                </div>
+                <hr style="margin:0">
+                <div class="panel-body text-danger">{{ __('issue.delete_confirm') }}</div>
+                <div class="panel-footer">
+                    {!! FormField::delete(
+                        ['route' => ['projects.issues.destroy', $project, $issue]],
+                        __('app.delete_confirm_button'),
+                        ['id' => 'delete-issue-'.$issue->id, 'class' => 'btn btn-danger'],
+                        ['issue_id' => $issue->id]
+                    ) !!}
+                    {{ link_to_route('projects.issues.edit', __('app.cancel'), [$project, $issue], ['class' => 'btn btn-default']) }}
+                </div>
             </div>
-            <div class="panel-footer">
-                {{ Form::submit(__('issue.update'), ['class' => 'btn btn-success']) }}
-                {{ link_to_route('projects.issues.show', __('app.cancel'), [$project, $issue], ['class' => 'btn btn-default']) }}
+        @else
+            {{ Form::model($issue, ['route' => ['projects.issues.update', $project, $issue], 'method' => 'patch']) }}
+            <div class="panel panel-default">
+                <div class="panel-heading"><h3 class="panel-title">{{ __('issue.update') }}</h3></div>
+                <div class="panel-body">
+                    {!! FormField::text('title', ['label' => __('issue.title')]) !!}
+                    {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+                </div>
+                <div class="panel-footer">
+                    {{ Form::submit(__('issue.update'), ['class' => 'btn btn-success']) }}
+                    {{ link_to_route('projects.issues.show', __('app.cancel'), [$project, $issue], ['class' => 'btn btn-default']) }}
+                    {{ link_to_route('projects.issues.edit', __('app.delete'), [$project, $issue, 'action' => 'delete'], ['id' => 'delete-issue-'.$issue->id, 'class' => 'btn btn-danger pull-right']) }}
+                </div>
             </div>
-        </div>
-        {{ Form::close() }}
+            {{ Form::close() }}
+        @endif
     </div>
 </div>
 @endsection
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 53b6af9..167a291 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -54,6 +54,7 @@ Route::group(['middleware' => ['auth'], 'namespace' => 'Projects'], function ()
     Route::get('projects/{project}/issues/{issue}', 'IssueController@show')->name('projects.issues.show');
     Route::get('projects/{project}/issues/{issue}/edit', 'IssueController@edit')->name('projects.issues.edit');
     Route::patch('projects/{project}/issues/{issue}', 'IssueController@update')->name('projects.issues.update');
+    Route::delete('projects/{project}/issues/{issue}', 'IssueController@destroy')->name('projects.issues.destroy');
 
     /*
      * Tasks Routes
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 7ae6f45..43a6022 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -109,12 +109,18 @@ class ProjectIssuesTest extends TestCase
             'project_id' => $project->id,
         ]);
 
-        $this->visitRoute('projects.issues.index', $project);
+        $this->visitRoute('projects.issues.edit', [$project, $issue]);
+        $this->seeElement('a', ['id' => 'delete-issue-'.$issue->id]);
+
+        $this->click('delete-issue-'.$issue->id);
+
+        $this->seePageIs(route('projects.issues.edit', [$project, $issue, 'action' => 'delete']));
         $this->seeElement('button', ['id' => 'delete-issue-'.$issue->id]);
+
         $this->press('delete-issue-'.$issue->id);
 
         $this->seePageIs(route('projects.issues.index', $project));
-        $this->see(__('issue.deleted'));
+        $this->seeText(__('issue.deleted'));
 
         $this->dontSeeInDatabase('issues', [
             'id' => $issue->id,

From fc229dab9db5777946993ebc5a74b602a29e4729 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 7 Mar 2019 21:45:09 +0800
Subject: [PATCH 073/113] Add project issue tab

---
 resources/views/projects/partials/nav-tabs.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/projects/partials/nav-tabs.blade.php b/resources/views/projects/partials/nav-tabs.blade.php
index ca809c1..ed2ee19 100644
--- a/resources/views/projects/partials/nav-tabs.blade.php
+++ b/resources/views/projects/partials/nav-tabs.blade.php
@@ -8,6 +8,9 @@
         {!! link_to_route('projects.jobs.index', __('project.jobs').' ('.$project->jobs->count().')', $project) !!}
     </li>
     @endcan
+    <li class="{{ Request::segment(3) == 'issues' ? 'active' : '' }}">
+        {!! link_to_route('projects.issues.index', __('project.issues').' ('.$project->issues->count().')', $project) !!}
+    </li>
     @can('view-comments', $project)
     <li class="{{ Request::segment(3) == 'comments' ? 'active' : '' }}">
         {!! link_to_route('projects.comments.index', __('comment.list').' ('.$project->comments->count().')', $project) !!}

From 453a8261b0e39aeb1a6cf7a8caeda9b079653df4 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 7 Mar 2019 22:25:19 +0800
Subject: [PATCH 074/113] Remove unused script

---
 routes/web.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 4fd2e73..e7922bc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,4 @@
 <?php
-if (!app()->runningUnitTests()) {
-    auth()->loginUsingId(1);
-}
 
 require __DIR__.'/web/pages.php';
 require __DIR__.'/web/users.php';

From 27b27c38a483af68d636674b4e33ada6016e8ac9 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 07:40:44 +0800
Subject: [PATCH 075/113] Add issue relation to project and creator

---
 app/Entities/Projects/Issue.php | 12 ++++++++++++
 tests/Unit/Models/IssueTest.php | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/Unit/Models/IssueTest.php

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 877c7b3..025a4a0 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -2,9 +2,21 @@
 
 namespace App\Entities\Projects;
 
+use App\Entities\Users\User;
+use App\Entities\Projects\Project;
 use Illuminate\Database\Eloquent\Model;
 
 class Issue extends Model
 {
     protected $fillable = ['project_id', 'title', 'body', 'creator_id'];
+
+    public function project()
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public function creator()
+    {
+        return $this->belongsTo(User::class);
+    }
 }
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
new file mode 100644
index 0000000..cb0fcb7
--- /dev/null
+++ b/tests/Unit/Models/IssueTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Unit\Models;
+
+use Tests\TestCase;
+use App\Entities\Users\User;
+use App\Entities\Projects\Issue;
+use App\Entities\Projects\Project;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class IssueTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function an_issue_has_belongs_to_project_relation()
+    {
+        $issue = factory(Issue::class)->make();
+
+        $this->assertInstanceOf(Project::class, $issue->project);
+        $this->assertEquals($issue->project_id, $issue->project->id);
+    }
+
+    /** @test */
+    public function an_issue_has_belongs_to_creator_relation()
+    {
+        $issue = factory(Issue::class)->make();
+
+        $this->assertInstanceOf(User::class, $issue->creator);
+        $this->assertEquals($issue->creator_id, $issue->creator->id);
+    }
+}

From 96d38afe75297883bedf66b60106dc84866758a5 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 07:42:24 +0800
Subject: [PATCH 076/113] Add pic relation on issue model

---
 app/Entities/Projects/Issue.php |  5 +++++
 tests/Unit/Models/IssueTest.php | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 025a4a0..a3c6ef4 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -15,6 +15,11 @@ class Issue extends Model
         return $this->belongsTo(Project::class);
     }
 
+    public function pic()
+    {
+        return $this->belongsTo(User::class);
+    }
+
     public function creator()
     {
         return $this->belongsTo(User::class);
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index cb0fcb7..f3f4e37 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -22,6 +22,16 @@ class IssueTest extends TestCase
     }
 
     /** @test */
+    public function an_issue_has_belongs_to_pic_relation()
+    {
+        $pic = $this->createUser('worker');
+        $issue = factory(Issue::class)->make(['pic_id' => $pic->id]);
+
+        $this->assertInstanceOf(User::class, $issue->pic);
+        $this->assertEquals($issue->pic_id, $issue->pic->id);
+    }
+
+    /** @test */
     public function an_issue_has_belongs_to_creator_relation()
     {
         $issue = factory(Issue::class)->make();

From eb6506310754f76129c3c42f305dd649bf71f8a7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 07:55:39 +0800
Subject: [PATCH 077/113] User can assign pic to an issue

---
 app/Http/Controllers/Issues/PicController.php      | 23 ++++++++++++++++++++++
 app/Http/Controllers/Projects/IssueController.php  |  5 ++++-
 .../2019_03_03_210017_create_issues_table.php      |  1 +
 resources/views/projects/issues/show.blade.php     |  8 +++++++-
 routes/web.php                                     |  3 +++
 routes/web/projects.php                            |  5 +++++
 tests/Feature/Projects/ProjectIssuesTest.php       | 20 +++++++++++++++++++
 7 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 app/Http/Controllers/Issues/PicController.php

diff --git a/app/Http/Controllers/Issues/PicController.php b/app/Http/Controllers/Issues/PicController.php
new file mode 100644
index 0000000..ff37216
--- /dev/null
+++ b/app/Http/Controllers/Issues/PicController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Issues;
+
+use Illuminate\Http\Request;
+use App\Entities\Projects\Issue;
+use App\Http\Controllers\Controller;
+
+class PicController extends Controller
+{
+    public function update(Request $request, Issue $issue)
+    {
+        $picData = $request->validate([
+            'pic_id' => 'nullable|exists:users,id',
+        ]);
+        $issue->pic_id = $picData['pic_id'];
+        $issue->save();
+
+        flash(__('issue.pic_assigned'), 'success');
+
+        return back();
+    }
+}
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index e13d772..5d7f8b3 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Projects;
 
+use App\Entities\Users\User;
 use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
@@ -40,7 +41,9 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
-        return view('projects.issues.show', compact('project', 'issue'));
+        $users = User::all();
+
+        return view('projects.issues.show', compact('project', 'issue', 'users'));
     }
 
     public function edit(Project $project, Issue $issue)
diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php
index f67ddbf..789511d 100644
--- a/database/migrations/2019_03_03_210017_create_issues_table.php
+++ b/database/migrations/2019_03_03_210017_create_issues_table.php
@@ -19,6 +19,7 @@ class CreateIssuesTable extends Migration
             $table->string('title', 60);
             $table->string('body');
             $table->unsignedInteger('creator_id');
+            $table->unsignedInteger('pic_id')->nullable();
             $table->timestamps();
         });
     }
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 4a8f716..b6dd413 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -5,7 +5,7 @@
 @section('content-project')
 
 <div class="row">
-    <div class="col-md-5">
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('issue.detail') }}</h3></div>
             <table class="table table-condensed">
@@ -19,5 +19,11 @@
             </div>
         </div>
     </div>
+    <div class="col-md-6">
+        {{ Form::model($issue, ['route' => ['issues.pic.update', $issue], 'method' => 'patch']) }}
+        {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic')]) !!}
+        {{ Form::submit(__('issue.assign_pic'), ['class' => 'btn btn-success']) }}
+        {{ Form::close() }}
+    </div>
 </div>
 @endsection
diff --git a/routes/web.php b/routes/web.php
index e7922bc..4fd2e73 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,4 +1,7 @@
 <?php
+if (!app()->runningUnitTests()) {
+    auth()->loginUsingId(1);
+}
 
 require __DIR__.'/web/pages.php';
 require __DIR__.'/web/users.php';
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 167a291..a04aab7 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -100,3 +100,8 @@ Route::group(['middleware' => ['auth']], function () {
     Route::patch('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@update')->name('jobs.comments.update');
     Route::delete('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@destroy')->name('jobs.comments.destroy');
 });
+
+/**
+ * Issue PIC Routes
+ */
+Route::patch('issues/{issue}/assign_pic', 'Issues\PicController@update')->name('issues.pic.update');
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 43a6022..48dcbe0 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -126,4 +126,24 @@ class ProjectIssuesTest extends TestCase
             'id' => $issue->id,
         ]);
     }
+
+    /** @test */
+    public function user_can_assign_someone_to_an_issue_as_pic()
+    {
+        $this->adminUserSigningIn();
+        $worker = $this->createUser('worker');
+        $issue = factory(Issue::class)->create();
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->submitForm(__('issue.assign_pic'), [
+            'pic_id' => $worker->id,
+        ]);
+        $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
+        $this->seeText(__('issue.pic_assigned'));
+
+        $this->seeInDatabase('issues', [
+            'id'     => $issue->id,
+            'pic_id' => $worker->id,
+        ]);
+    }
 }

From 85ce2fa73111638a138766aa3f522b108945de92 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 08:06:33 +0800
Subject: [PATCH 078/113] Update pic selector placeholder and labels

---
 app/Http/Controllers/Projects/IssueController.php | 2 +-
 resources/lang/de/issue.php                       | 3 +++
 resources/lang/en/issue.php                       | 3 +++
 resources/lang/id/issue.php                       | 3 +++
 resources/views/projects/issues/show.blade.php    | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 5d7f8b3..a6b740c 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -41,7 +41,7 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
-        $users = User::all();
+        $users = User::pluck('name', 'id');
 
         return view('projects.issues.show', compact('project', 'issue', 'users'));
     }
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index 23ad493..fe8f6ac 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -26,6 +26,9 @@ return [
     'deleted'        => 'Issue has been deleted.',
     'undeleted'      => 'Issue not deleted.',
     'undeleteable'   => 'Issue data cannot be deleted.',
+    'assign_pic'     => 'Assign PIC',
+    'select_pic'     => 'Select a PIC',
+    'pic_assigned'   => 'Issue PIC has been assigned.',
 
     // Attributes
     'title' => 'Issue Title',
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 23ad493..fe8f6ac 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -26,6 +26,9 @@ return [
     'deleted'        => 'Issue has been deleted.',
     'undeleted'      => 'Issue not deleted.',
     'undeleteable'   => 'Issue data cannot be deleted.',
+    'assign_pic'     => 'Assign PIC',
+    'select_pic'     => 'Select a PIC',
+    'pic_assigned'   => 'Issue PIC has been assigned.',
 
     // Attributes
     'title' => 'Issue Title',
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index da09115..76212a5 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -26,6 +26,9 @@ return [
     'deleted'        => 'Hapus data Issue telah berhasil.',
     'undeleted'      => 'Data Issue gagal dihapus.',
     'undeleteable'   => 'Data Issue tidak dapat dihapus.',
+    'assign_pic'     => 'Tugaskan PIC',
+    'select_pic'     => 'Pilih PIC',
+    'pic_assigned'   => 'PIC telah ditugaskan.',
 
     // Attributes
     'title' => 'Judul Issue',
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index b6dd413..c3d24ef 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -21,7 +21,7 @@
     </div>
     <div class="col-md-6">
         {{ Form::model($issue, ['route' => ['issues.pic.update', $issue], 'method' => 'patch']) }}
-        {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic')]) !!}
+        {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
         {{ Form::submit(__('issue.assign_pic'), ['class' => 'btn btn-success']) }}
         {{ Form::close() }}
     </div>

From fe3da97edf059cf1979e3ededb80c971d33aa7ff Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 08:09:06 +0800
Subject: [PATCH 079/113] User can remove pic from an issue

---
 app/Http/Controllers/Issues/PicController.php |  6 +++++-
 resources/lang/de/issue.php                   |  1 +
 resources/lang/en/issue.php                   |  1 +
 resources/lang/id/issue.php                   |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php  | 20 ++++++++++++++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Issues/PicController.php b/app/Http/Controllers/Issues/PicController.php
index ff37216..8a5c63f 100644
--- a/app/Http/Controllers/Issues/PicController.php
+++ b/app/Http/Controllers/Issues/PicController.php
@@ -16,7 +16,11 @@ class PicController extends Controller
         $issue->pic_id = $picData['pic_id'];
         $issue->save();
 
-        flash(__('issue.pic_assigned'), 'success');
+        if ($issue->pic_id) {
+            flash(__('issue.pic_assigned'), 'success');
+        } else {
+            flash(__('issue.pic_removed'), 'warning');
+        }
 
         return back();
     }
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index fe8f6ac..254e9d6 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -29,6 +29,7 @@ return [
     'assign_pic'     => 'Assign PIC',
     'select_pic'     => 'Select a PIC',
     'pic_assigned'   => 'Issue PIC has been assigned.',
+    'pic_removed'    => 'Issue PIC has been removed.',
 
     // Attributes
     'title' => 'Issue Title',
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index fe8f6ac..254e9d6 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -29,6 +29,7 @@ return [
     'assign_pic'     => 'Assign PIC',
     'select_pic'     => 'Select a PIC',
     'pic_assigned'   => 'Issue PIC has been assigned.',
+    'pic_removed'    => 'Issue PIC has been removed.',
 
     // Attributes
     'title' => 'Issue Title',
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index 76212a5..ea142ec 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -29,6 +29,7 @@ return [
     'assign_pic'     => 'Tugaskan PIC',
     'select_pic'     => 'Pilih PIC',
     'pic_assigned'   => 'PIC telah ditugaskan.',
+    'pic_removed'    => 'PIC telah dihapus.',
 
     // Attributes
     'title' => 'Judul Issue',
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 48dcbe0..365d62d 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -146,4 +146,24 @@ class ProjectIssuesTest extends TestCase
             'pic_id' => $worker->id,
         ]);
     }
+
+    /** @test */
+    public function user_can_remove_pic_assignment()
+    {
+        $this->adminUserSigningIn();
+        $worker = $this->createUser('worker');
+        $issue = factory(Issue::class)->create(['pic_id' => $worker->id]);
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->submitForm(__('issue.assign_pic'), [
+            'pic_id' => null,
+        ]);
+        $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
+        $this->seeText(__('issue.pic_removed'));
+
+        $this->seeInDatabase('issues', [
+            'id'     => $issue->id,
+            'pic_id' => null,
+        ]);
+    }
 }

From d49f47803a5596d7b4f52bcd6715166e02d5cb0a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 08:12:47 +0800
Subject: [PATCH 080/113] Update pic issue form

---
 resources/views/projects/issues/show.blade.php | 11 +++++++++--
 tests/Feature/Projects/ProjectIssuesTest.php   |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index c3d24ef..1a69443 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -21,8 +21,15 @@
     </div>
     <div class="col-md-6">
         {{ Form::model($issue, ['route' => ['issues.pic.update', $issue], 'method' => 'patch']) }}
-        {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
-        {{ Form::submit(__('issue.assign_pic'), ['class' => 'btn btn-success']) }}
+        <div class="panel panel-default">
+            <div class="panel-heading"><h3 class="panel-title">{{ __('app.action') }}</h3></div>
+            <div class="panel-body">
+                {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
+            </div>
+            <div class="panel-footer">
+                {{ Form::submit(__('issue.update'), ['class' => 'btn btn-success']) }}
+            </div>
+        </div>
         {{ Form::close() }}
     </div>
 </div>
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index 365d62d..ac655ce 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -135,7 +135,7 @@ class ProjectIssuesTest extends TestCase
         $issue = factory(Issue::class)->create();
 
         $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
-        $this->submitForm(__('issue.assign_pic'), [
+        $this->submitForm(__('issue.update'), [
             'pic_id' => $worker->id,
         ]);
         $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
@@ -155,7 +155,7 @@ class ProjectIssuesTest extends TestCase
         $issue = factory(Issue::class)->create(['pic_id' => $worker->id]);
 
         $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
-        $this->submitForm(__('issue.assign_pic'), [
+        $this->submitForm(__('issue.update'), [
             'pic_id' => null,
         ]);
         $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);

From f6b0aa98dca54b400564a8e07f02457c2730530e Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 08:19:22 +0800
Subject: [PATCH 081/113] Add default attribute on issue pic relation

---
 app/Entities/Projects/Issue.php | 2 +-
 resources/lang/de/issue.php     | 6 ++++++
 resources/lang/en/issue.php     | 6 ++++++
 resources/lang/id/issue.php     | 6 ++++++
 tests/Unit/Models/IssueTest.php | 8 ++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index a3c6ef4..ed6e538 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -17,7 +17,7 @@ class Issue extends Model
 
     public function pic()
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class)->withDefault(['name' => __('issue.no_pic')]);
     }
 
     public function creator()
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index 254e9d6..de4bc36 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -13,6 +13,7 @@ return [
     'empty'         => 'Issue is empty.',
     'back_to_show'  => 'Back to Issue Detail',
     'back_to_index' => 'Back to Issue List',
+    'no_pic'        => 'No issue PIC',
 
     // Actions
     'create'         => 'Create new Issue',
@@ -34,4 +35,9 @@ return [
     // Attributes
     'title' => 'Issue Title',
     'body'  => 'Issue Description',
+
+    // Relations
+    'project' => 'Issue Project',
+    'pic'     => 'Issue PIC',
+    'creator' => 'Issue Creator',
 ];
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 254e9d6..de4bc36 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -13,6 +13,7 @@ return [
     'empty'         => 'Issue is empty.',
     'back_to_show'  => 'Back to Issue Detail',
     'back_to_index' => 'Back to Issue List',
+    'no_pic'        => 'No issue PIC',
 
     // Actions
     'create'         => 'Create new Issue',
@@ -34,4 +35,9 @@ return [
     // Attributes
     'title' => 'Issue Title',
     'body'  => 'Issue Description',
+
+    // Relations
+    'project' => 'Issue Project',
+    'pic'     => 'Issue PIC',
+    'creator' => 'Issue Creator',
 ];
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index ea142ec..200859e 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -13,6 +13,7 @@ return [
     'empty'         => 'Belum ada Issue',
     'back_to_show'  => 'Kembali ke detail Issue',
     'back_to_index' => 'Kembali ke daftar Issue',
+    'no_pic'        => 'Belum ada PIC',
 
     // Actions
     'create'         => 'Input Issue Baru',
@@ -34,4 +35,9 @@ return [
     // Attributes
     'title' => 'Judul Issue',
     'body'  => 'Deskripsi Issue',
+
+    // Relations
+    'project' => 'Project Issue',
+    'pic'     => 'PIC Issue',
+    'creator' => 'Pembuat Issue',
 ];
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index f3f4e37..0f73412 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -32,6 +32,14 @@ class IssueTest extends TestCase
     }
 
     /** @test */
+    public function issue_pic_name_has_default_value()
+    {
+        $issue = factory(Issue::class)->make(['pic_id' => null]);
+
+        $this->assertEquals(__('issue.no_pic'), $issue->pic->name);
+    }
+
+    /** @test */
     public function an_issue_has_belongs_to_creator_relation()
     {
         $issue = factory(Issue::class)->make();

From 9e2e840f64f612e0ea9301c9a7aa4bdb3e3e1971 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Fri, 8 Mar 2019 08:26:07 +0800
Subject: [PATCH 082/113] Add issue pic and creator information

---
 app/Http/Controllers/Projects/IssueController.php | 2 +-
 resources/views/projects/issues.blade.php         | 8 ++++++--
 resources/views/projects/issues/show.blade.php    | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index a6b740c..8bd8f13 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -12,7 +12,7 @@ class IssueController extends Controller
 {
     public function index(Project $project)
     {
-        $issues = $project->issues;
+        $issues = $project->issues()->with(['pic', 'creator'])->get();
 
         return view('projects.issues', compact('project', 'issues'));
     }
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index edc3256..4410c3b 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -11,6 +11,8 @@
         <thead>
             <th>{{ __('app.table_no') }}</th>
             <th>{{ __('issue.title') }}</th>
+            <th>{{ __('issue.pic') }}</th>
+            <th>{{ __('issue.creator') }}</th>
             <th class="text-center">{{ __('app.action') }}</th>
         </thead>
         <tbody>
@@ -21,17 +23,19 @@
             <tr id="{{ $issue->id }}">
                 <td>{{ $no }}</td>
                 <td>{{ $issue->title }}</td>
+                <td>{{ $issue->pic->name }}</td>
+                <td>{{ $issue->creator->name }}</td>
                 <td class="text-center">
                     {{ link_to_route(
                         'projects.issues.show',
                         __('app.show'),
                         [$project, $issue],
-                        ['class' => 'small', 'title' => __('issue.show')]
+                        ['title' => __('issue.show')]
                     ) }}
                 </td>
             </tr>
             @empty
-            <tr><td colspan="3">{{ __('issue.empty') }}</td></tr>
+            <tr><td colspan="5">{{ __('issue.empty') }}</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 1a69443..c33b605 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -12,6 +12,8 @@
                 <tbody>
                     <tr><th class="col-md-4">{{ __('issue.title') }}</th><td class="col-md-8">{{ $issue->title }}</td></tr>
                     <tr><th>{{ __('issue.body') }}</th><td>{{ $issue->body }}</td></tr>
+                    <tr><th>{{ __('issue.pic') }}</th><td>{{ $issue->pic->name }}</td></tr>
+                    <tr><th>{{ __('app.created_by') }}</th><td>{{ $issue->creator->name }}</td></tr>
                 </tbody>
             </table>
             <div class="panel-footer">

From d3e4d0c1adc2e156fab6913be014eaf8b8cc4868 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 12 Mar 2019 23:41:14 +0800
Subject: [PATCH 083/113] Update luthfi/formfield package

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 49256f0..03b7677 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a298d20cfcff4c54b1cce7bb8db3515e",
+    "content-hash": "935f96036f78f878a265f90061c07ece",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -1230,16 +1230,16 @@
         },
         {
             "name": "luthfi/formfield",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nafiesl/FormField.git",
-                "reference": "59e3ae44a0e04ae6eb6ff66a7f95f29acc5ea109"
+                "reference": "38d206d7b5e1e7893b67b06689d70305b998f0a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nafiesl/FormField/zipball/59e3ae44a0e04ae6eb6ff66a7f95f29acc5ea109",
-                "reference": "59e3ae44a0e04ae6eb6ff66a7f95f29acc5ea109",
+                "url": "https://api.github.com/repos/nafiesl/FormField/zipball/38d206d7b5e1e7893b67b06689d70305b998f0a1",
+                "reference": "38d206d7b5e1e7893b67b06689d70305b998f0a1",
                 "shasum": ""
             },
             "require": {
@@ -1278,7 +1278,7 @@
                 }
             ],
             "description": "Laravel Form Field the extension of Laravelcollective Form for Laravel 5.3 and newer with Twitter Bootstrap 3",
-            "time": "2018-09-16T11:40:29+00:00"
+            "time": "2019-03-12T15:08:48+00:00"
         },
         {
             "name": "monolog/monolog",

From ca75fa04e6d4fe24ae61ac24e6b48a8a2f0a1a73 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 13 Mar 2019 22:39:53 +0800
Subject: [PATCH 084/113] Add create issue button on project issue pages

---
 resources/views/projects/issues.blade.php      | 6 ++++++
 resources/views/projects/issues/edit.blade.php | 6 ++++++
 resources/views/projects/issues/show.blade.php | 7 ++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index 4410c3b..b05420d 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -2,6 +2,12 @@
 
 @section('subtitle', __('project.issues'))
 
+@section('action-buttons')
+@can('create', new App\Entities\Projects\Issue)
+    {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
+@endcan
+@endsection
+
 @section('content-project')
 <div id="project-issues" class="panel panel-default table-responsive">
     <div class="panel-heading">
diff --git a/resources/views/projects/issues/edit.blade.php b/resources/views/projects/issues/edit.blade.php
index 7746ce3..0de5462 100755
--- a/resources/views/projects/issues/edit.blade.php
+++ b/resources/views/projects/issues/edit.blade.php
@@ -2,6 +2,12 @@
 
 @section('subtitle', __('issue.update'))
 
+@section('action-buttons')
+@can('create', new App\Entities\Projects\Issue)
+    {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
+@endcan
+@endsection
+
 @section('content-project')
 <div class="row">
     <div class="col-sm-6 col-sm-offset-2">
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index c33b605..191b16d 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -2,8 +2,13 @@
 
 @section('subtitle', __('issue.detail'))
 
-@section('content-project')
+@section('action-buttons')
+@can('create', new App\Entities\Projects\Issue)
+    {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
+@endcan
+@endsection
 
+@section('content-project')
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">

From 4cf04146c7f666265ad38ffa5dcc3853f6420c85 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 13 Mar 2019 22:40:15 +0800
Subject: [PATCH 085/113] Add create issue authorization for users

---
 app/Policies/Projects/IssuePolicy.php   | 17 +++++++++++++++++
 app/Providers/AuthServiceProvider.php   |  1 +
 tests/Unit/Policies/IssuePolicyTest.php | 25 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 app/Policies/Projects/IssuePolicy.php
 create mode 100644 tests/Unit/Policies/IssuePolicyTest.php

diff --git a/app/Policies/Projects/IssuePolicy.php b/app/Policies/Projects/IssuePolicy.php
new file mode 100644
index 0000000..9bd8c8d
--- /dev/null
+++ b/app/Policies/Projects/IssuePolicy.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Policies\Projects;
+
+use App\Entities\Users\User;
+use App\Entities\Projects\Issue;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class IssuePolicy
+{
+    use HandlesAuthorization;
+
+    public function create(User $user, Issue $issue)
+    {
+        return true;
+    }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 4584098..353f008 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -18,6 +18,7 @@ class AuthServiceProvider extends ServiceProvider
         'App\Entities\Projects\Project'  => 'App\Policies\Projects\ProjectPolicy',
         'App\Entities\Projects\Comment'  => 'App\Policies\Projects\CommentPolicy',
         'App\Entities\Projects\Job'      => 'App\Policies\Projects\JobPolicy',
+        'App\Entities\Projects\Issue'    => 'App\Policies\Projects\IssuePolicy',
         'App\Entities\Projects\Task'     => 'App\Policies\Projects\TaskPolicy',
         'App\Entities\Payments\Payment'  => 'App\Policies\PaymentPolicy',
         'App\Entities\Users\User'        => 'App\Policies\UserPolicy',
diff --git a/tests/Unit/Policies/IssuePolicyTest.php b/tests/Unit/Policies/IssuePolicyTest.php
new file mode 100644
index 0000000..051e927
--- /dev/null
+++ b/tests/Unit/Policies/IssuePolicyTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Unit\Policies;
+
+use Tests\TestCase;
+use App\Entities\Projects\Issue;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+/**
+ * Issue Policy Test.
+ *
+ * @author Nafies Luthfi <nafiesl@gmail.com>
+ */
+class IssuePolicyTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function admin_can_create_issue()
+    {
+        $admin = $this->createUser('admin');
+
+        $this->assertTrue($admin->can('create', new Issue()));
+    }
+}

From 72786f04d9f492eefc991dbccd30fe866b441222 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Wed, 13 Mar 2019 22:43:51 +0800
Subject: [PATCH 086/113] User can add pic on issue creation

---
 app/Entities/Projects/Issue.php                   |  2 +-
 app/Http/Controllers/Projects/IssueController.php | 10 +++++++---
 resources/views/projects/issues/create.blade.php  |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      |  6 ++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index ed6e538..00ef0a6 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Issue extends Model
 {
-    protected $fillable = ['project_id', 'title', 'body', 'creator_id'];
+    protected $fillable = ['project_id', 'title', 'body', 'pic_id', 'creator_id'];
 
     public function project()
     {
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 8bd8f13..1dddc69 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -19,20 +19,24 @@ class IssueController extends Controller
 
     public function create(Project $project)
     {
-        return view('projects.issues.create', compact('project'));
+        $users = User::pluck('name', 'id');
+
+        return view('projects.issues.create', compact('project', 'users'));
     }
 
     public function store(Request $request, Project $project)
     {
         $issueData = $request->validate([
-            'title' => 'required|max:60',
-            'body'  => 'required|max:255',
+            'title'  => 'required|max:60',
+            'body'   => 'required|max:255',
+            'pic_id' => 'nullable|exists:users,id',
         ]);
         Issue::create([
             'project_id' => $project->id,
             'creator_id' => auth()->id(),
             'title'      => $issueData['title'],
             'body'       => $issueData['body'],
+            'pic_id'     => $issueData['pic_id'],
         ]);
         flash(__('issue.created'), 'success');
 
diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php
index 46df9d4..c7a7da7 100755
--- a/resources/views/projects/issues/create.blade.php
+++ b/resources/views/projects/issues/create.blade.php
@@ -18,6 +18,7 @@
             <div class="panel-body">
                 {!! FormField::text('title', ['label' => __('issue.title')]) !!}
                 {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+                {!! FormField::select('pic_id', $users, ['label' => __('issue.pic')]) !!}
             </div>
             <div class="panel-footer">
                 {{ Form::submit(__('issue.create'), ['class' => 'btn btn-success']) }}
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index ac655ce..bc32579 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -37,8 +37,9 @@ class ProjectIssuesTest extends TestCase
         $this->visitRoute('projects.issues.create', $project);
 
         $this->submitForm(__('issue.create'), [
-            'title' => 'First Issue.',
-            'body'  => 'First Issue description.',
+            'title'  => 'First Issue.',
+            'body'   => 'First Issue description.',
+            'pic_id' => $admin->id,
         ]);
 
         $this->seePageIs(route('projects.issues.index', $project));
@@ -48,6 +49,7 @@ class ProjectIssuesTest extends TestCase
             'project_id' => $project->id,
             'title'      => 'First Issue.',
             'body'       => 'First Issue description.',
+            'pic_id'     => $admin->id,
             'creator_id' => $admin->id,
         ]);
     }

From adcc013405ff9580254fc07a4d1a12cfca945826 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 17 Mar 2019 21:15:57 +0800
Subject: [PATCH 087/113] Remove unused script

---
 routes/web.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 4fd2e73..e7922bc 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,4 @@
 <?php
-if (!app()->runningUnitTests()) {
-    auth()->loginUsingId(1);
-}
 
 require __DIR__.'/web/pages.php';
 require __DIR__.'/web/users.php';

From 0f9b813a626e6e10aa9b0676199e9d94c4b8886d Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 17 Mar 2019 23:29:25 +0800
Subject: [PATCH 088/113] New entry issue has open status by default

---
 app/Entities/Projects/Issue.php                    |  5 +++
 app/Entities/Projects/IssueStatus.php              | 39 ++++++++++++++++++++++
 database/factories/IssueFactory.php                |  1 +
 .../2019_03_03_210017_create_issues_table.php      |  1 +
 resources/lang/de/issue.php                        |  3 ++
 resources/lang/en/issue.php                        |  3 ++
 resources/lang/id/issue.php                        |  3 ++
 tests/Unit/Models/IssueTest.php                    |  8 +++++
 8 files changed, 63 insertions(+)
 create mode 100644 app/Entities/Projects/IssueStatus.php

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 00ef0a6..8bc9ec4 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -24,4 +24,9 @@ class Issue extends Model
     {
         return $this->belongsTo(User::class);
     }
+
+    public function getStatusAttribute()
+    {
+        return IssueStatus::getNameById($this->status_id);
+    }
 }
diff --git a/app/Entities/Projects/IssueStatus.php b/app/Entities/Projects/IssueStatus.php
new file mode 100644
index 0000000..159b60a
--- /dev/null
+++ b/app/Entities/Projects/IssueStatus.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Entities\Projects;
+
+use App\Entities\ReferenceAbstract;
+
+class IssueStatus extends ReferenceAbstract
+{
+    protected static $lists = [
+        0 => 'open',
+        1 => 'resolved',
+        2 => 'closed',
+        3 => 'on_hold',
+        4 => 'invalid',
+    ];
+
+    protected static $colors = [
+        0 => 'yellow',
+        1 => 'green',
+        2 => 'primary',
+        3 => 'default',
+        4 => 'warning',
+    ];
+
+    public static function getNameById($singleId)
+    {
+        return trans('issue.'.static::getById($singleId));
+    }
+
+    public static function toArray()
+    {
+        $lists = [];
+        foreach (static::$lists as $key => $value) {
+            $lists[$key] = trans('issue.'.$value);
+        }
+
+        return $lists;
+    }
+}
diff --git a/database/factories/IssueFactory.php b/database/factories/IssueFactory.php
index 859781d..5c43722 100644
--- a/database/factories/IssueFactory.php
+++ b/database/factories/IssueFactory.php
@@ -15,5 +15,6 @@ $factory->define(Issue::class, function (Faker $faker) {
         'creator_id' => function () {
             return factory(User::class)->create()->id;
         },
+        'status_id'  => 0,
     ];
 });
diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php
index 789511d..520a386 100644
--- a/database/migrations/2019_03_03_210017_create_issues_table.php
+++ b/database/migrations/2019_03_03_210017_create_issues_table.php
@@ -20,6 +20,7 @@ class CreateIssuesTable extends Migration
             $table->string('body');
             $table->unsignedInteger('creator_id');
             $table->unsignedInteger('pic_id')->nullable();
+            $table->unsignedTinyInteger('status_id')->default(0);
             $table->timestamps();
         });
     }
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index de4bc36..4417898 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -40,4 +40,7 @@ return [
     'project' => 'Issue Project',
     'pic'     => 'Issue PIC',
     'creator' => 'Issue Creator',
+
+    // Statuses
+    'open' => 'Open',
 ];
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index de4bc36..4417898 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -40,4 +40,7 @@ return [
     'project' => 'Issue Project',
     'pic'     => 'Issue PIC',
     'creator' => 'Issue Creator',
+
+    // Statuses
+    'open' => 'Open',
 ];
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index 200859e..c9f914c 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -40,4 +40,7 @@ return [
     'project' => 'Project Issue',
     'pic'     => 'PIC Issue',
     'creator' => 'Pembuat Issue',
+
+    // Statuses
+    'open' => 'Open',
 ];
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index 0f73412..9f658cc 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -47,4 +47,12 @@ class IssueTest extends TestCase
         $this->assertInstanceOf(User::class, $issue->creator);
         $this->assertEquals($issue->creator_id, $issue->creator->id);
     }
+
+    /** @test */
+    public function an_issue_has_status_attribute()
+    {
+        $issue = factory(Issue::class)->make();
+
+        $this->assertEquals(__('issue.open'), $issue->status);
+    }
 }

From 4110f39bc8b808ed0b1f8ac6201978c41a95e24b Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 17 Mar 2019 23:42:23 +0800
Subject: [PATCH 089/113] Add status badge on issue index and detail page

---
 app/Entities/Projects/Issue.php                | 5 +++++
 resources/views/projects/issues.blade.php      | 2 ++
 resources/views/projects/issues/show.blade.php | 7 ++++++-
 tests/Unit/Models/IssueTest.php                | 8 ++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 8bc9ec4..b8cf43d 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -29,4 +29,9 @@ class Issue extends Model
     {
         return IssueStatus::getNameById($this->status_id);
     }
+
+    public function getStatusLabelAttribute()
+    {
+        return '<span class="badge">'.$this->status.'</span>';
+    }
 }
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index b05420d..2ad1db6 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -17,6 +17,7 @@
         <thead>
             <th>{{ __('app.table_no') }}</th>
             <th>{{ __('issue.title') }}</th>
+            <th>{{ __('app.status') }}</th>
             <th>{{ __('issue.pic') }}</th>
             <th>{{ __('issue.creator') }}</th>
             <th class="text-center">{{ __('app.action') }}</th>
@@ -29,6 +30,7 @@
             <tr id="{{ $issue->id }}">
                 <td>{{ $no }}</td>
                 <td>{{ $issue->title }}</td>
+                <td>{!! $issue->status_label !!}</td>
                 <td>{{ $issue->pic->name }}</td>
                 <td>{{ $issue->creator->name }}</td>
                 <td class="text-center">
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 191b16d..e7f756e 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -12,7 +12,12 @@
 <div class="row">
     <div class="col-md-6">
         <div class="panel panel-default">
-            <div class="panel-heading"><h3 class="panel-title">{{ __('issue.detail') }}</h3></div>
+            <div class="panel-heading">
+                <h3 class="panel-title">
+                    <div class="pull-right">{!! $issue->status_label !!}</div>
+                    {{ __('issue.detail') }}
+                </h3>
+            </div>
             <table class="table table-condensed">
                 <tbody>
                     <tr><th class="col-md-4">{{ __('issue.title') }}</th><td class="col-md-8">{{ $issue->title }}</td></tr>
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index 9f658cc..f0a6b4e 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -55,4 +55,12 @@ class IssueTest extends TestCase
 
         $this->assertEquals(__('issue.open'), $issue->status);
     }
+
+    /** @test */
+    public function an_issue_has_status_label_attribute()
+    {
+        $issue = factory(Issue::class)->make();
+
+        $this->assertEquals('<span class="badge">'.$issue->status.'</span>', $issue->status_label);
+    }
 }

From bf52f5b3af7107d461cac1077fb4fd42c2c0f649 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 17 Mar 2019 23:51:44 +0800
Subject: [PATCH 090/113] User can change issue status

---
 app/Http/Controllers/Issues/PicController.php     |  4 +++-
 app/Http/Controllers/Projects/IssueController.php |  4 +++-
 resources/lang/de/issue.php                       |  6 +++++-
 resources/lang/en/issue.php                       |  6 +++++-
 resources/lang/id/issue.php                       |  6 +++++-
 resources/views/projects/issues/show.blade.php    |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      | 22 ++++++++++++++++++++++
 7 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Issues/PicController.php b/app/Http/Controllers/Issues/PicController.php
index 8a5c63f..3fc2bec 100644
--- a/app/Http/Controllers/Issues/PicController.php
+++ b/app/Http/Controllers/Issues/PicController.php
@@ -11,8 +11,10 @@ class PicController extends Controller
     public function update(Request $request, Issue $issue)
     {
         $picData = $request->validate([
-            'pic_id' => 'nullable|exists:users,id',
+            'status_id' => 'required|in:0,1,2,3,4',
+            'pic_id'    => 'nullable|exists:users,id',
         ]);
+        $issue->status_id = $picData['status_id'];
         $issue->pic_id = $picData['pic_id'];
         $issue->save();
 
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 1dddc69..86fb337 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
 use App\Http\Controllers\Controller;
+use App\Entities\Projects\IssueStatus;
 
 class IssueController extends Controller
 {
@@ -45,9 +46,10 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
+        $statuses = IssueStatus::toArray();
         $users = User::pluck('name', 'id');
 
-        return view('projects.issues.show', compact('project', 'issue', 'users'));
+        return view('projects.issues.show', compact('project', 'issue', 'users', 'statuses'));
     }
 
     public function edit(Project $project, Issue $issue)
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index 4417898..9def5f9 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -42,5 +42,9 @@ return [
     'creator' => 'Issue Creator',
 
     // Statuses
-    'open' => 'Open',
+    'open'     => 'Open',
+    'resolved' => 'Resolved',
+    'closed'   => 'Closed',
+    'on_hold'  => 'On Hold',
+    'invalid'  => 'Invalid',
 ];
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 4417898..9def5f9 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -42,5 +42,9 @@ return [
     'creator' => 'Issue Creator',
 
     // Statuses
-    'open' => 'Open',
+    'open'     => 'Open',
+    'resolved' => 'Resolved',
+    'closed'   => 'Closed',
+    'on_hold'  => 'On Hold',
+    'invalid'  => 'Invalid',
 ];
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index c9f914c..8948b23 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -42,5 +42,9 @@ return [
     'creator' => 'Pembuat Issue',
 
     // Statuses
-    'open' => 'Open',
+    'open'     => 'Open',
+    'resolved' => 'Selesai',
+    'closed'   => 'Ditutup',
+    'on_hold'  => 'Ditunda',
+    'invalid'  => 'Tidak Valid',
 ];
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index e7f756e..84f9589 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -36,6 +36,7 @@
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('app.action') }}</h3></div>
             <div class="panel-body">
+                {!! FormField::radios('status_id', $statuses, ['label' => __('app.status')]) !!}
                 {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
             </div>
             <div class="panel-footer">
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index bc32579..c23631b 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -168,4 +168,26 @@ class ProjectIssuesTest extends TestCase
             'pic_id' => null,
         ]);
     }
+
+    /** @test */
+    public function user_can_change_issue_status()
+    {
+        $this->adminUserSigningIn();
+        $worker = $this->createUser('worker');
+        $issue = factory(Issue::class)->create();
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->submitForm(__('issue.update'), [
+            'status_id' => 2, // resolved
+            'pic_id'    => $worker->id,
+        ]);
+        $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
+        $this->seeText(__('issue.pic_assigned'));
+
+        $this->seeInDatabase('issues', [
+            'id'        => $issue->id,
+            'pic_id'    => $worker->id,
+            'status_id' => 2, // resolved
+        ]);
+    }
 }

From 51d16391fb2539c37dfa369ee8695a39b85cea48 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 18 Mar 2019 22:04:54 +0800
Subject: [PATCH 091/113] Change issue pic and status update controller action

---
 .../Issues/{PicController.php => OptionController.php}    | 15 +++++----------
 resources/views/projects/issues.blade.php                 |  2 +-
 resources/views/projects/issues/show.blade.php            |  2 +-
 routes/web/projects.php                                   |  4 ++--
 tests/Feature/Projects/ProjectIssuesTest.php              |  6 +++---
 5 files changed, 12 insertions(+), 17 deletions(-)
 rename app/Http/Controllers/Issues/{PicController.php => OptionController.php} (53%)

diff --git a/app/Http/Controllers/Issues/PicController.php b/app/Http/Controllers/Issues/OptionController.php
similarity index 53%
rename from app/Http/Controllers/Issues/PicController.php
rename to app/Http/Controllers/Issues/OptionController.php
index 3fc2bec..bad3511 100644
--- a/app/Http/Controllers/Issues/PicController.php
+++ b/app/Http/Controllers/Issues/OptionController.php
@@ -6,23 +6,18 @@ use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
 use App\Http\Controllers\Controller;
 
-class PicController extends Controller
+class OptionController extends Controller
 {
     public function update(Request $request, Issue $issue)
     {
-        $picData = $request->validate([
+        $issueData = $request->validate([
             'status_id' => 'required|in:0,1,2,3,4',
             'pic_id'    => 'nullable|exists:users,id',
         ]);
-        $issue->status_id = $picData['status_id'];
-        $issue->pic_id = $picData['pic_id'];
+        $issue->status_id = $issueData['status_id'];
+        $issue->pic_id = $issueData['pic_id'];
         $issue->save();
-
-        if ($issue->pic_id) {
-            flash(__('issue.pic_assigned'), 'success');
-        } else {
-            flash(__('issue.pic_removed'), 'warning');
-        }
+        flash(__('issue.updated'), 'success');
 
         return back();
     }
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index 2ad1db6..890da34 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -43,7 +43,7 @@
                 </td>
             </tr>
             @empty
-            <tr><td colspan="5">{{ __('issue.empty') }}</td></tr>
+            <tr><td colspan="6">{{ __('issue.empty') }}</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 84f9589..70bf183 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -32,7 +32,7 @@
         </div>
     </div>
     <div class="col-md-6">
-        {{ Form::model($issue, ['route' => ['issues.pic.update', $issue], 'method' => 'patch']) }}
+        {{ Form::model($issue, ['route' => ['issues.options.update', $issue], 'method' => 'patch']) }}
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('app.action') }}</h3></div>
             <div class="panel-body">
diff --git a/routes/web/projects.php b/routes/web/projects.php
index a04aab7..45d403f 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -102,6 +102,6 @@ Route::group(['middleware' => ['auth']], function () {
 });
 
 /**
- * Issue PIC Routes
+ * Issue Options Routes
  */
-Route::patch('issues/{issue}/assign_pic', 'Issues\PicController@update')->name('issues.pic.update');
+Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('issues.options.update');
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index c23631b..c85d1c4 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -141,7 +141,7 @@ class ProjectIssuesTest extends TestCase
             'pic_id' => $worker->id,
         ]);
         $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
-        $this->seeText(__('issue.pic_assigned'));
+        $this->seeText(__('issue.updated'));
 
         $this->seeInDatabase('issues', [
             'id'     => $issue->id,
@@ -161,7 +161,7 @@ class ProjectIssuesTest extends TestCase
             'pic_id' => null,
         ]);
         $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
-        $this->seeText(__('issue.pic_removed'));
+        $this->seeText(__('issue.updated'));
 
         $this->seeInDatabase('issues', [
             'id'     => $issue->id,
@@ -182,7 +182,7 @@ class ProjectIssuesTest extends TestCase
             'pic_id'    => $worker->id,
         ]);
         $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
-        $this->seeText(__('issue.pic_assigned'));
+        $this->seeText(__('issue.updated'));
 
         $this->seeInDatabase('issues', [
             'id'        => $issue->id,

From 08ae6d037455569e0a36d867288c0951b5a64f6a Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 18 Mar 2019 23:34:23 +0800
Subject: [PATCH 092/113] Every issue has priority level

---
 app/Entities/Projects/Issue.php                    |  5 +++
 app/Entities/Projects/Priority.php                 | 36 ++++++++++++++++++++++
 database/factories/IssueFactory.php                | 11 ++++---
 .../2019_03_03_210017_create_issues_table.php      |  1 +
 resources/lang/de/issue.php                        |  5 +++
 resources/lang/en/issue.php                        |  5 +++
 resources/lang/id/issue.php                        |  5 +++
 tests/Unit/Models/IssueTest.php                    |  8 +++++
 8 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 app/Entities/Projects/Priority.php

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index b8cf43d..535276f 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -25,6 +25,11 @@ class Issue extends Model
         return $this->belongsTo(User::class);
     }
 
+    public function getPriorityAttribute()
+    {
+        return Priority::getNameById($this->priority_id);
+    }
+
     public function getStatusAttribute()
     {
         return IssueStatus::getNameById($this->status_id);
diff --git a/app/Entities/Projects/Priority.php b/app/Entities/Projects/Priority.php
new file mode 100644
index 0000000..2e61f52
--- /dev/null
+++ b/app/Entities/Projects/Priority.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Entities\Projects;
+
+use App\Entities\ReferenceAbstract;
+
+class Priority extends ReferenceAbstract
+{
+    protected static $lists = [
+        1 => 'minor',
+        2 => 'major',
+        3 => 'critical',
+    ];
+
+    protected static $colors = [
+        0 => 'yellow',
+        1 => 'info',
+        2 => 'warning',
+        3 => 'danger',
+    ];
+
+    public static function getNameById($singleId)
+    {
+        return trans('issue.'.static::getById($singleId));
+    }
+
+    public static function toArray()
+    {
+        $lists = [];
+        foreach (static::$lists as $key => $value) {
+            $lists[$key] = trans('issue.'.$value);
+        }
+
+        return $lists;
+    }
+}
diff --git a/database/factories/IssueFactory.php b/database/factories/IssueFactory.php
index 5c43722..2941f50 100644
--- a/database/factories/IssueFactory.php
+++ b/database/factories/IssueFactory.php
@@ -7,14 +7,15 @@ use App\Entities\Projects\Project;
 
 $factory->define(Issue::class, function (Faker $faker) {
     return [
-        'project_id' => function () {
+        'project_id'  => function () {
             return factory(Project::class)->create()->id;
         },
-        'title'      => $faker->words(3, true),
-        'body'       => $faker->sentences(3, true),
-        'creator_id' => function () {
+        'title'       => $faker->words(3, true),
+        'body'        => $faker->sentences(3, true),
+        'creator_id'  => function () {
             return factory(User::class)->create()->id;
         },
-        'status_id'  => 0,
+        'status_id'   => 0,
+        'priority_id' => 1,
     ];
 });
diff --git a/database/migrations/2019_03_03_210017_create_issues_table.php b/database/migrations/2019_03_03_210017_create_issues_table.php
index 520a386..ea55458 100644
--- a/database/migrations/2019_03_03_210017_create_issues_table.php
+++ b/database/migrations/2019_03_03_210017_create_issues_table.php
@@ -19,6 +19,7 @@ class CreateIssuesTable extends Migration
             $table->string('title', 60);
             $table->string('body');
             $table->unsignedInteger('creator_id');
+            $table->unsignedTinyInteger('priority_id');
             $table->unsignedInteger('pic_id')->nullable();
             $table->unsignedTinyInteger('status_id')->default(0);
             $table->timestamps();
diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index 9def5f9..2d81052 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -41,6 +41,11 @@ return [
     'pic'     => 'Issue PIC',
     'creator' => 'Issue Creator',
 
+    // Priority
+    'minor'    => 'Minor',
+    'major'    => 'Major',
+    'critical' => 'Critical',
+
     // Statuses
     'open'     => 'Open',
     'resolved' => 'Resolved',
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 9def5f9..2d81052 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -41,6 +41,11 @@ return [
     'pic'     => 'Issue PIC',
     'creator' => 'Issue Creator',
 
+    // Priority
+    'minor'    => 'Minor',
+    'major'    => 'Major',
+    'critical' => 'Critical',
+
     // Statuses
     'open'     => 'Open',
     'resolved' => 'Resolved',
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index 8948b23..3946ac5 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -41,6 +41,11 @@ return [
     'pic'     => 'PIC Issue',
     'creator' => 'Pembuat Issue',
 
+    // Priority
+    'minor'    => 'Minor',
+    'major'    => 'Major',
+    'critical' => 'Critical',
+
     // Statuses
     'open'     => 'Open',
     'resolved' => 'Selesai',
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index f0a6b4e..1c61152 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -63,4 +63,12 @@ class IssueTest extends TestCase
 
         $this->assertEquals('<span class="badge">'.$issue->status.'</span>', $issue->status_label);
     }
+
+    /** @test */
+    public function an_issue_has_priority_attribute()
+    {
+        $issue = factory(Issue::class)->make();
+
+        $this->assertEquals(__('issue.minor'), $issue->priority);
+    }
 }

From 7b30caff8eaec92770c7e856660c2ff4089fa010 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Mar 2019 22:23:11 +0800
Subject: [PATCH 093/113] User can create issue with selected priority

---
 app/Entities/Projects/Issue.php                   |  4 +++-
 app/Entities/Projects/Priority.php                |  1 -
 app/Http/Controllers/Projects/IssueController.php | 22 +++++++++++++---------
 resources/lang/en/issue.php                       |  1 +
 resources/views/projects/issues/create.blade.php  |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      | 18 ++++++++++--------
 6 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 535276f..1e69c8b 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class Issue extends Model
 {
-    protected $fillable = ['project_id', 'title', 'body', 'pic_id', 'creator_id'];
+    protected $fillable = [
+        'project_id', 'title', 'body', 'priority_id', 'pic_id', 'creator_id',
+    ];
 
     public function project()
     {
diff --git a/app/Entities/Projects/Priority.php b/app/Entities/Projects/Priority.php
index 2e61f52..da953f1 100644
--- a/app/Entities/Projects/Priority.php
+++ b/app/Entities/Projects/Priority.php
@@ -13,7 +13,6 @@ class Priority extends ReferenceAbstract
     ];
 
     protected static $colors = [
-        0 => 'yellow',
         1 => 'info',
         2 => 'warning',
         3 => 'danger',
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 86fb337..09ea564 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -6,6 +6,7 @@ use App\Entities\Users\User;
 use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
+use App\Entities\Projects\Priority;
 use App\Http\Controllers\Controller;
 use App\Entities\Projects\IssueStatus;
 
@@ -21,23 +22,26 @@ class IssueController extends Controller
     public function create(Project $project)
     {
         $users = User::pluck('name', 'id');
+        $priorities = Priority::toArray();
 
-        return view('projects.issues.create', compact('project', 'users'));
+        return view('projects.issues.create', compact('project', 'users', 'priorities'));
     }
 
     public function store(Request $request, Project $project)
     {
         $issueData = $request->validate([
-            'title'  => 'required|max:60',
-            'body'   => 'required|max:255',
-            'pic_id' => 'nullable|exists:users,id',
+            'title'       => 'required|max:60',
+            'body'        => 'required|max:255',
+            'priority_id' => 'required|in:1,2,3',
+            'pic_id'      => 'nullable|exists:users,id',
         ]);
         Issue::create([
-            'project_id' => $project->id,
-            'creator_id' => auth()->id(),
-            'title'      => $issueData['title'],
-            'body'       => $issueData['body'],
-            'pic_id'     => $issueData['pic_id'],
+            'project_id'  => $project->id,
+            'creator_id'  => auth()->id(),
+            'title'       => $issueData['title'],
+            'body'        => $issueData['body'],
+            'priority_id' => $issueData['priority_id'],
+            'pic_id'      => $issueData['pic_id'],
         ]);
         flash(__('issue.created'), 'success');
 
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 2d81052..1be2737 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -42,6 +42,7 @@ return [
     'creator' => 'Issue Creator',
 
     // Priority
+    'priority' => 'Priority',
     'minor'    => 'Minor',
     'major'    => 'Major',
     'critical' => 'Critical',
diff --git a/resources/views/projects/issues/create.blade.php b/resources/views/projects/issues/create.blade.php
index c7a7da7..1422715 100755
--- a/resources/views/projects/issues/create.blade.php
+++ b/resources/views/projects/issues/create.blade.php
@@ -18,6 +18,7 @@
             <div class="panel-body">
                 {!! FormField::text('title', ['label' => __('issue.title')]) !!}
                 {!! FormField::textarea('body', ['label' => __('issue.body')]) !!}
+                {!! FormField::radios('priority_id', $priorities, ['label' => __('issue.priority'), 'placeholder' => false]) !!}
                 {!! FormField::select('pic_id', $users, ['label' => __('issue.pic')]) !!}
             </div>
             <div class="panel-footer">
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index c85d1c4..fa5f75c 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -37,20 +37,22 @@ class ProjectIssuesTest extends TestCase
         $this->visitRoute('projects.issues.create', $project);
 
         $this->submitForm(__('issue.create'), [
-            'title'  => 'First Issue.',
-            'body'   => 'First Issue description.',
-            'pic_id' => $admin->id,
+            'title'       => 'First Issue.',
+            'body'        => 'First Issue description.',
+            'priority_id' => 1,
+            'pic_id'      => $admin->id,
         ]);
 
         $this->seePageIs(route('projects.issues.index', $project));
         $this->see(__('issue.created'));
 
         $this->seeInDatabase('issues', [
-            'project_id' => $project->id,
-            'title'      => 'First Issue.',
-            'body'       => 'First Issue description.',
-            'pic_id'     => $admin->id,
-            'creator_id' => $admin->id,
+            'project_id'  => $project->id,
+            'title'       => 'First Issue.',
+            'body'        => 'First Issue description.',
+            'priority_id' => 1,
+            'pic_id'      => $admin->id,
+            'creator_id'  => $admin->id,
         ]);
     }
 

From 449a0ac45eea56e086f5318da0ccf7a1389e5983 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Mar 2019 22:30:50 +0800
Subject: [PATCH 094/113] Add issue priority label on issue list and detail
 page

---
 app/Entities/Projects/Issue.php                |  7 +++++++
 resources/views/projects/issues.blade.php      |  2 ++
 resources/views/projects/issues/show.blade.php |  1 +
 tests/Unit/Models/IssueTest.php                | 10 ++++++++++
 4 files changed, 20 insertions(+)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 1e69c8b..17a31af 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -32,6 +32,13 @@ class Issue extends Model
         return Priority::getNameById($this->priority_id);
     }
 
+    public function getPriorityLabelAttribute()
+    {
+        $classColor = Priority::getColorById($this->priority_id);
+
+        return '<span class="label label-'.$classColor.'">'.$this->priority.'</span>';
+    }
+
     public function getStatusAttribute()
     {
         return IssueStatus::getNameById($this->status_id);
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues.blade.php
index 890da34..a582c34 100755
--- a/resources/views/projects/issues.blade.php
+++ b/resources/views/projects/issues.blade.php
@@ -17,6 +17,7 @@
         <thead>
             <th>{{ __('app.table_no') }}</th>
             <th>{{ __('issue.title') }}</th>
+            <th>{{ __('issue.priority') }}</th>
             <th>{{ __('app.status') }}</th>
             <th>{{ __('issue.pic') }}</th>
             <th>{{ __('issue.creator') }}</th>
@@ -30,6 +31,7 @@
             <tr id="{{ $issue->id }}">
                 <td>{{ $no }}</td>
                 <td>{{ $issue->title }}</td>
+                <td>{!! $issue->priority_label !!}</td>
                 <td>{!! $issue->status_label !!}</td>
                 <td>{{ $issue->pic->name }}</td>
                 <td>{{ $issue->creator->name }}</td>
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 70bf183..42f60af 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -22,6 +22,7 @@
                 <tbody>
                     <tr><th class="col-md-4">{{ __('issue.title') }}</th><td class="col-md-8">{{ $issue->title }}</td></tr>
                     <tr><th>{{ __('issue.body') }}</th><td>{{ $issue->body }}</td></tr>
+                    <tr><th>{{ __('issue.priority') }}</th><td>{!! $issue->priority_label !!}</td></tr>
                     <tr><th>{{ __('issue.pic') }}</th><td>{{ $issue->pic->name }}</td></tr>
                     <tr><th>{{ __('app.created_by') }}</th><td>{{ $issue->creator->name }}</td></tr>
                 </tbody>
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index 1c61152..7877fdd 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -6,6 +6,7 @@ use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Projects\Issue;
 use App\Entities\Projects\Project;
+use App\Entities\Projects\Priority;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class IssueTest extends TestCase
@@ -71,4 +72,13 @@ class IssueTest extends TestCase
 
         $this->assertEquals(__('issue.minor'), $issue->priority);
     }
+
+    /** @test */
+    public function an_issue_has_priority_label_attribute()
+    {
+        $issue = factory(Issue::class)->make();
+        $colorClass = Priority::getColorById($issue->priority_id);
+
+        $this->assertEquals('<span class="label label-'.$colorClass.'">'.$issue->priority.'</span>', $issue->priority_label);
+    }
 }

From 7746ca7f2fdecd7a244e22b402148a3fcb0b2240 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Mar 2019 22:34:57 +0800
Subject: [PATCH 095/113] User can change issue priority

---
 app/Http/Controllers/Issues/OptionController.php  |  6 ++++--
 app/Http/Controllers/Projects/IssueController.php |  5 ++++-
 resources/views/projects/issues/show.blade.php    |  1 +
 tests/Feature/Projects/ProjectIssuesTest.php      | 24 +++++++++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Issues/OptionController.php b/app/Http/Controllers/Issues/OptionController.php
index bad3511..a37a200 100644
--- a/app/Http/Controllers/Issues/OptionController.php
+++ b/app/Http/Controllers/Issues/OptionController.php
@@ -11,9 +11,11 @@ class OptionController extends Controller
     public function update(Request $request, Issue $issue)
     {
         $issueData = $request->validate([
-            'status_id' => 'required|in:0,1,2,3,4',
-            'pic_id'    => 'nullable|exists:users,id',
+            'priority_id' => 'required|in:1,2,3',
+            'status_id'   => 'required|in:0,1,2,3,4',
+            'pic_id'      => 'nullable|exists:users,id',
         ]);
+        $issue->priority_id = $issueData['priority_id'];
         $issue->status_id = $issueData['status_id'];
         $issue->pic_id = $issueData['pic_id'];
         $issue->save();
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 09ea564..247143e 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -50,10 +50,13 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
+        $priorities = Priority::toArray();
         $statuses = IssueStatus::toArray();
         $users = User::pluck('name', 'id');
 
-        return view('projects.issues.show', compact('project', 'issue', 'users', 'statuses'));
+        return view('projects.issues.show', compact(
+            'project', 'issue', 'users', 'statuses', 'priorities'
+        ));
     }
 
     public function edit(Project $project, Issue $issue)
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 42f60af..e06613a 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -37,6 +37,7 @@
         <div class="panel panel-default">
             <div class="panel-heading"><h3 class="panel-title">{{ __('app.action') }}</h3></div>
             <div class="panel-body">
+                {!! FormField::radios('priority_id', $priorities, ['label' => __('issue.priority')]) !!}
                 {!! FormField::radios('status_id', $statuses, ['label' => __('app.status')]) !!}
                 {!! FormField::select('pic_id', $users, ['label' => __('issue.assign_pic'), 'placeholder' => __('issue.select_pic')]) !!}
             </div>
diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php
index fa5f75c..9d27f9f 100644
--- a/tests/Feature/Projects/ProjectIssuesTest.php
+++ b/tests/Feature/Projects/ProjectIssuesTest.php
@@ -192,4 +192,28 @@ class ProjectIssuesTest extends TestCase
             'status_id' => 2, // resolved
         ]);
     }
+
+    /** @test */
+    public function user_can_change_issue_priority()
+    {
+        $this->adminUserSigningIn();
+        $worker = $this->createUser('worker');
+        $issue = factory(Issue::class)->create();
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->submitForm(__('issue.update'), [
+            'priority_id' => 2, // major
+            'status_id'   => 2, // resolved
+            'pic_id'      => $worker->id,
+        ]);
+        $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]);
+        $this->seeText(__('issue.updated'));
+
+        $this->seeInDatabase('issues', [
+            'id'          => $issue->id,
+            'pic_id'      => $worker->id,
+            'priority_id' => 2, // major
+            'status_id'   => 2, // resolved
+        ]);
+    }
 }

From e6d2b21000da5bac848046dd3bb507c343c347e2 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Mar 2019 22:36:51 +0800
Subject: [PATCH 096/113] Add back to issue listing link

---
 resources/views/projects/issues/show.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index e06613a..42ccb12 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -29,6 +29,7 @@
             </table>
             <div class="panel-footer">
                 {{ link_to_route('projects.issues.edit', __('issue.edit'), [$project, $issue], ['id' => 'edit-issue-'.$issue->id, 'class' => 'btn btn-warning']) }}
+                {{ link_to_route('projects.issues.index', __('issue.back_to_index'), [$project], ['class' => 'btn btn-default pull-right']) }}
             </div>
         </div>
     </div>

From 3697dae4a5919ba0da7edaff5cdb88df421bfa34 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 19 Mar 2019 22:38:36 +0800
Subject: [PATCH 097/113] Move issue listing view to projects/issues directory

---
 app/Http/Controllers/Projects/IssueController.php                     | 2 +-
 resources/views/projects/{issues.blade.php => issues/index.blade.php} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename resources/views/projects/{issues.blade.php => issues/index.blade.php} (100%)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 247143e..1a0c603 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -16,7 +16,7 @@ class IssueController extends Controller
     {
         $issues = $project->issues()->with(['pic', 'creator'])->get();
 
-        return view('projects.issues', compact('project', 'issues'));
+        return view('projects.issues.index', compact('project', 'issues'));
     }
 
     public function create(Project $project)
diff --git a/resources/views/projects/issues.blade.php b/resources/views/projects/issues/index.blade.php
similarity index 100%
rename from resources/views/projects/issues.blade.php
rename to resources/views/projects/issues/index.blade.php

From 72828e9f3adfe4c1588034524f372ee307019be0 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 25 Mar 2019 21:04:33 +0800
Subject: [PATCH 098/113] Add job has has many comments relation

---
 app/Entities/Projects/Issue.php      | 11 +++++++++++
 app/Providers/AppServiceProvider.php |  1 +
 tests/Unit/Models/IssueTest.php      | 15 +++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 17a31af..2ec06fc 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -3,6 +3,7 @@
 namespace App\Entities\Projects;
 
 use App\Entities\Users\User;
+use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
 use Illuminate\Database\Eloquent\Model;
 
@@ -48,4 +49,14 @@ class Issue extends Model
     {
         return '<span class="badge">'.$this->status.'</span>';
     }
+
+    /**
+     * Issue has many comments relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function comments()
+    {
+        return $this->morphMany(Comment::class, 'commentable');
+    }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 818ae3c..d8823c2 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -22,6 +22,7 @@ class AppServiceProvider extends ServiceProvider
 
         Relation::morphMap([
             'projects' => 'App\Entities\Projects\Project',
+            'issues'   => 'App\Entities\Projects\Issue',
             'jobs'     => 'App\Entities\Projects\Job',
         ]);
     }
diff --git a/tests/Unit/Models/IssueTest.php b/tests/Unit/Models/IssueTest.php
index 7877fdd..a43ed72 100644
--- a/tests/Unit/Models/IssueTest.php
+++ b/tests/Unit/Models/IssueTest.php
@@ -5,7 +5,9 @@ namespace Tests\Unit\Models;
 use Tests\TestCase;
 use App\Entities\Users\User;
 use App\Entities\Projects\Issue;
+use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
+use Illuminate\Support\Collection;
 use App\Entities\Projects\Priority;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
@@ -81,4 +83,17 @@ class IssueTest extends TestCase
 
         $this->assertEquals('<span class="label label-'.$colorClass.'">'.$issue->priority.'</span>', $issue->priority_label);
     }
+
+    /** @test */
+    public function an_issue_has_many_comments_relation()
+    {
+        $issue = factory(Issue::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+        ]);
+
+        $this->assertInstanceOf(Collection::class, $issue->comments);
+        $this->assertInstanceOf(Comment::class, $issue->comments->first());
+    }
 }

From bc9f380c853f9d9de2161529370239f96751a568 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 25 Mar 2019 21:14:06 +0800
Subject: [PATCH 099/113] User can see issue comments

---
 app/Http/Controllers/Projects/IssueController.php  |  3 ++-
 .../issues/partials/comment-section.blade.php      |  9 +++++++
 resources/views/projects/issues/show.blade.php     |  2 ++
 tests/Feature/Projects/IssueCommentsTest.php       | 29 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/projects/issues/partials/comment-section.blade.php
 create mode 100644 tests/Feature/Projects/IssueCommentsTest.php

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 1a0c603..a18938a 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -50,12 +50,13 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
+        $comments = $issue->comments;
         $priorities = Priority::toArray();
         $statuses = IssueStatus::toArray();
         $users = User::pluck('name', 'id');
 
         return view('projects.issues.show', compact(
-            'project', 'issue', 'users', 'statuses', 'priorities'
+            'project', 'issue', 'users', 'statuses', 'priorities', 'comments'
         ));
     }
 
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
new file mode 100644
index 0000000..d19d66a
--- /dev/null
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -0,0 +1,9 @@
+@foreach($comments as $comment)
+<div class="alert alert-warning">
+    <legend style="font-size: 14px;margin-bottom: 10px;">
+        <span class="label label-default pull-right">{{ $comment->time_display }}</span>
+        <strong>{{ $comment->creator->name }}</strong>
+    </legend>
+    {!! nl2br($comment->body) !!}
+</div>
+@endforeach
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 42ccb12..b069268 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -32,6 +32,8 @@
                 {{ link_to_route('projects.issues.index', __('issue.back_to_index'), [$project], ['class' => 'btn btn-default pull-right']) }}
             </div>
         </div>
+
+        @include('projects.issues.partials.comment-section')
     </div>
     <div class="col-md-6">
         {{ Form::model($issue, ['route' => ['issues.options.update', $issue], 'method' => 'patch']) }}
diff --git a/tests/Feature/Projects/IssueCommentsTest.php b/tests/Feature/Projects/IssueCommentsTest.php
new file mode 100644
index 0000000..22b0890
--- /dev/null
+++ b/tests/Feature/Projects/IssueCommentsTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Feature\Projects;
+
+use Tests\TestCase;
+use App\Entities\Projects\Issue;
+use App\Entities\Projects\Comment;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class IssueCommentsTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function user_can_view_issue_comments()
+    {
+        $this->adminUserSigningIn();
+        $issue = factory(Issue::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+            'body'             => 'This is issue comment.',
+        ]);
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+
+        $this->seeText('This is issue comment.');
+    }
+}

From eaf5619c691177a3e7a53030fab9c8630d1f84ba Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 25 Mar 2019 21:14:52 +0800
Subject: [PATCH 100/113] Eagerloads issue comment creator

---
 app/Http/Controllers/Projects/IssueController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index a18938a..2164c7b 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -50,10 +50,10 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
-        $comments = $issue->comments;
         $priorities = Priority::toArray();
         $statuses = IssueStatus::toArray();
         $users = User::pluck('name', 'id');
+        $comments = $issue->comments()->with('creator')->get();
 
         return view('projects.issues.show', compact(
             'project', 'issue', 'users', 'statuses', 'priorities', 'comments'

From a0b7c66e40044af28f6dd2c113d191432d96004c Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 25 Mar 2019 21:24:21 +0800
Subject: [PATCH 101/113] User can add comment to a project issue

---
 app/Http/Controllers/Issues/CommentController.php  | 34 ++++++++++++++++++++++
 .../issues/partials/comment-section.blade.php      |  6 ++++
 resources/views/projects/issues/show.blade.php     |  2 +-
 routes/web/projects.php                            |  5 ++++
 tests/Feature/Projects/IssueCommentsTest.php       | 23 +++++++++++++++
 5 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/Issues/CommentController.php

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
new file mode 100644
index 0000000..d7f66e4
--- /dev/null
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers\Issues;
+
+use Illuminate\Http\Request;
+use App\Entities\Projects\Issue;
+use App\Http\Controllers\Controller;
+
+class CommentController extends Controller
+{
+
+    /**
+     * Store a new comment in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Entities\Projects\Issue  $issue
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function store(Request $request, Issue $issue)
+    {
+        $newComment = $request->validate([
+            'body' => 'required|string|max:255',
+        ]);
+
+        $issue->comments()->create([
+            'body'       => $newComment['body'],
+            'creator_id' => auth()->id(),
+        ]);
+
+        flash(__('comment.created'), 'success');
+
+        return back();
+    }
+}
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
index d19d66a..949ec7a 100644
--- a/resources/views/projects/issues/partials/comment-section.blade.php
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -7,3 +7,9 @@
     {!! nl2br($comment->body) !!}
 </div>
 @endforeach
+
+{{ Form::open(['route' => ['issues.comments.store', $issue]]) }}
+{!! FormField::textarea('body', ['required' => true, 'label' => false, 'placeholder' => __('comment.create_text')]) !!}
+{{ Form::submit(__('comment.create'), ['class' => 'btn btn-success pull-right']) }}
+{{ Form::close() }}
+<div class="clearfix"></div><br>
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index b069268..906d5f3 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -32,7 +32,7 @@
                 {{ link_to_route('projects.issues.index', __('issue.back_to_index'), [$project], ['class' => 'btn btn-default pull-right']) }}
             </div>
         </div>
-
+        <hr>
         @include('projects.issues.partials.comment-section')
     </div>
     <div class="col-md-6">
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 45d403f..1b585a1 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -105,3 +105,8 @@ Route::group(['middleware' => ['auth']], function () {
  * Issue Options Routes
  */
 Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('issues.options.update');
+
+/**
+ * Issue Comments Routes
+ */
+Route::post('issues/{issue}/comments', 'Issues\CommentController@store')->name('issues.comments.store');
diff --git a/tests/Feature/Projects/IssueCommentsTest.php b/tests/Feature/Projects/IssueCommentsTest.php
index 22b0890..fe8c2db 100644
--- a/tests/Feature/Projects/IssueCommentsTest.php
+++ b/tests/Feature/Projects/IssueCommentsTest.php
@@ -26,4 +26,27 @@ class IssueCommentsTest extends TestCase
 
         $this->seeText('This is issue comment.');
     }
+
+    /** @test */
+    public function admin_can_add_comment_to_an_issue()
+    {
+        $admin = $this->adminUserSigningIn();
+        $issue = factory(Issue::class)->create();
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+
+        $this->submitForm(__('comment.create'), [
+            'body' => 'First comment.',
+        ]);
+
+        $this->seePageIs(route('projects.issues.show', [$issue->project, $issue]));
+        $this->see(__('comment.created'));
+
+        $this->seeInDatabase('comments', [
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+            'body'             => 'First comment.',
+            'creator_id'       => $admin->id,
+        ]);
+    }
 }

From 3168ae91ac4281e8427476072c36f72fe0c8dbd1 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 25 Mar 2019 21:36:13 +0800
Subject: [PATCH 102/113] Add authoriation for issue commentings

---
 app/Http/Controllers/Issues/CommentController.php            |  2 ++
 app/Policies/Projects/IssuePolicy.php                        | 12 ++++++++++++
 .../views/projects/issues/partials/comment-section.blade.php |  2 ++
 tests/Unit/Policies/IssuePolicyTest.php                      |  9 +++++++++
 4 files changed, 25 insertions(+)

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
index d7f66e4..8288f3b 100644
--- a/app/Http/Controllers/Issues/CommentController.php
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -18,6 +18,8 @@ class CommentController extends Controller
      */
     public function store(Request $request, Issue $issue)
     {
+        $this->authorize('comment-on', $issue);
+
         $newComment = $request->validate([
             'body' => 'required|string|max:255',
         ]);
diff --git a/app/Policies/Projects/IssuePolicy.php b/app/Policies/Projects/IssuePolicy.php
index 9bd8c8d..7fe975a 100644
--- a/app/Policies/Projects/IssuePolicy.php
+++ b/app/Policies/Projects/IssuePolicy.php
@@ -14,4 +14,16 @@ class IssuePolicy
     {
         return true;
     }
+
+    /**
+     * Determine whether the user can add comment to an issue.
+     *
+     * @param  \App\Entities\Users\User  $user
+     * @param  \App\Entities\Projects\Issue  $issue
+     * @return bool
+     */
+    public function commentOn(User $user, Issue $issue)
+    {
+        return true;
+    }
 }
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
index 949ec7a..dff082a 100644
--- a/resources/views/projects/issues/partials/comment-section.blade.php
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -8,8 +8,10 @@
 </div>
 @endforeach
 
+@can('comment-on', $issue)
 {{ Form::open(['route' => ['issues.comments.store', $issue]]) }}
 {!! FormField::textarea('body', ['required' => true, 'label' => false, 'placeholder' => __('comment.create_text')]) !!}
 {{ Form::submit(__('comment.create'), ['class' => 'btn btn-success pull-right']) }}
 {{ Form::close() }}
 <div class="clearfix"></div><br>
+@endcan
diff --git a/tests/Unit/Policies/IssuePolicyTest.php b/tests/Unit/Policies/IssuePolicyTest.php
index 051e927..a5b1016 100644
--- a/tests/Unit/Policies/IssuePolicyTest.php
+++ b/tests/Unit/Policies/IssuePolicyTest.php
@@ -22,4 +22,13 @@ class IssuePolicyTest extends TestCase
 
         $this->assertTrue($admin->can('create', new Issue()));
     }
+
+    /** @test */
+    public function admin_can_add_comment_to_an_issue()
+    {
+        $admin = $this->createUser('admin');
+        $issue = factory(Issue::class)->create();
+
+        $this->assertTrue($admin->can('comment-on', $issue));
+    }
 }

From f07912eb81f926d96f524867d4a97ce57e2cfd09 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 16:20:43 +0800
Subject: [PATCH 103/113] User can edit issue comment

---
 app/Http/Controllers/Issues/CommentController.php  | 21 +++++++++++++-
 app/Http/Controllers/Projects/IssueController.php  |  9 +++++-
 resources/lang/id/comment.php                      |  2 +-
 .../issues/partials/comment-section.blade.php      | 27 ++++++++++++++++++
 resources/views/projects/issues/show.blade.php     | 11 ++++++++
 routes/web/projects.php                            |  1 +
 tests/Feature/Projects/IssueCommentsTest.php       | 32 ++++++++++++++++++++++
 7 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
index 8288f3b..31f9888 100644
--- a/app/Http/Controllers/Issues/CommentController.php
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -4,11 +4,11 @@ namespace App\Http\Controllers\Issues;
 
 use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
+use App\Entities\Projects\Comment;
 use App\Http\Controllers\Controller;
 
 class CommentController extends Controller
 {
-
     /**
      * Store a new comment in storage.
      *
@@ -33,4 +33,23 @@ class CommentController extends Controller
 
         return back();
     }
+
+    /**
+     * Update the specified comment.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Entities\Projects\Issue  $issue
+     * @param  \App\Entities\Projects\Comment  $comment
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Issue $issue, Comment $comment)
+    {
+        $commentData = $request->validate([
+            'body' => 'required|string|max:255',
+        ]);
+        $comment->update($commentData);
+        flash(__('comment.updated'), 'success');
+
+        return redirect()->route('projects.issues.show', [$issue->project, $issue]);
+    }
 }
diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 2164c7b..830df9c 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Projects;
 use App\Entities\Users\User;
 use Illuminate\Http\Request;
 use App\Entities\Projects\Issue;
+use App\Entities\Projects\Comment;
 use App\Entities\Projects\Project;
 use App\Entities\Projects\Priority;
 use App\Http\Controllers\Controller;
@@ -50,13 +51,19 @@ class IssueController extends Controller
 
     public function show(Project $project, Issue $issue)
     {
+        $editableComment = null;
         $priorities = Priority::toArray();
         $statuses = IssueStatus::toArray();
         $users = User::pluck('name', 'id');
         $comments = $issue->comments()->with('creator')->get();
 
+        if (request('action') == 'comment-edit' && request('comment_id') != null) {
+            $editableComment = Comment::find(request('comment_id'));
+        }
+
         return view('projects.issues.show', compact(
-            'project', 'issue', 'users', 'statuses', 'priorities', 'comments'
+            'project', 'issue', 'users', 'statuses', 'priorities', 'comments',
+            'editableComment'
         ));
     }
 
diff --git a/resources/lang/id/comment.php b/resources/lang/id/comment.php
index 95a1586..b79cd50 100644
--- a/resources/lang/id/comment.php
+++ b/resources/lang/id/comment.php
@@ -12,7 +12,7 @@ return [
     'created'        => 'Input Komentar berhasil.',
     'edit'           => 'Edit Komentar',
     'update'         => 'Update Komentar',
-    'updated'        => 'Update data Komentar telah berhasil.',
+    'updated'        => 'Update Komentar berhasil.',
     'delete'         => 'Hapus Komentar',
     'delete_confirm' => 'Anda yakin akan menghapus Komentar ini?',
     'deleted'        => 'Komentar berhasil dihapus.',
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
index dff082a..094df69 100644
--- a/resources/views/projects/issues/partials/comment-section.blade.php
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -4,6 +4,9 @@
         <span class="label label-default pull-right">{{ $comment->time_display }}</span>
         <strong>{{ $comment->creator->name }}</strong>
     </legend>
+    <div class="pull-right">
+        {{ link_to_route('projects.issues.show', __('app.edit'), [$project, $issue, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }}
+    </div>
     {!! nl2br($comment->body) !!}
 </div>
 @endforeach
@@ -15,3 +18,27 @@
 {{ Form::close() }}
 <div class="clearfix"></div><br>
 @endcan
+
+@if (Request::get('action') == 'comment-edit' && $editableComment)
+    <div id="commentModal" class="modal" role="dialog">
+        <div class="modal-dialog">
+            <!-- Modal content-->
+            <div class="modal-content">
+                <div class="modal-header">
+                    {{ link_to_route('projects.issues.show', '&times;', [$issue->project, $issue], ['class' => 'close']) }}
+                    <h4 class="modal-title">{{ __('comment.edit') }}</h4>
+                </div>
+                {!! Form::model($editableComment, ['route' => ['issues.comments.update', $issue, $editableComment],'method' => 'patch']) !!}
+                <div class="modal-body">
+                    {!! FormField::textarea('body', ['label' => __('comment.body')]) !!}
+                    {{ Form::hidden('page', request('page')) }}
+                </div>
+                <div class="modal-footer">
+                    {!! Form::submit(__('comment.update'), ['class' => 'btn btn-success']) !!}
+                    {{ link_to_route('projects.issues.show', __('app.cancel'), [$project->issue, $issue] + request(['page']), ['class' => 'btn btn-default']) }}
+                </div>
+                {!! Form::close() !!}
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/projects/issues/show.blade.php b/resources/views/projects/issues/show.blade.php
index 906d5f3..beb3017 100755
--- a/resources/views/projects/issues/show.blade.php
+++ b/resources/views/projects/issues/show.blade.php
@@ -52,3 +52,14 @@
     </div>
 </div>
 @endsection
+
+@section('script')
+<script>
+(function () {
+    $('#commentModal').modal({
+        show: true,
+        backdrop: 'static',
+    });
+})();
+</script>
+@endsection
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 1b585a1..c162b54 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -110,3 +110,4 @@ Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('
  * Issue Comments Routes
  */
 Route::post('issues/{issue}/comments', 'Issues\CommentController@store')->name('issues.comments.store');
+Route::patch('issues/{issue}/comments/{comment}', 'Issues\CommentController@update')->name('issues.comments.update');
diff --git a/tests/Feature/Projects/IssueCommentsTest.php b/tests/Feature/Projects/IssueCommentsTest.php
index fe8c2db..a57cc29 100644
--- a/tests/Feature/Projects/IssueCommentsTest.php
+++ b/tests/Feature/Projects/IssueCommentsTest.php
@@ -49,4 +49,36 @@ class IssueCommentsTest extends TestCase
             'creator_id'       => $admin->id,
         ]);
     }
+
+    /** @test */
+    public function user_can_edit_an_issue_comment()
+    {
+        $this->adminUserSigningIn();
+        $issue = factory(Issue::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+            'body'             => 'This is issue comment.',
+        ]);
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->seeElement('a', ['id' => 'edit-comment-'.$comment->id]);
+        $this->click('edit-comment-'.$comment->id);
+        $this->seeRouteIs('projects.issues.show', [$issue->project, $issue, 'action' => 'comment-edit', 'comment_id' => $comment->id]);
+
+        $this->submitForm(__('comment.update'), [
+            'body' => 'Edited comment.',
+        ]);
+
+        $this->seePageIs(route('projects.issues.show', [$issue->project, $issue]));
+        $this->see(__('comment.updated'));
+
+        $this->seeInDatabase('comments', [
+            'id'               => $comment->id,
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+            'body'             => 'Edited comment.',
+        ]);
+    }
+
 }

From e9c725e263a3f34f6058ee0226cdeff4dc768a6f Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 16:24:56 +0800
Subject: [PATCH 104/113] Add authorization to edit comment

---
 app/Http/Controllers/Issues/CommentController.php                  | 2 ++
 resources/views/projects/issues/index.blade.php                    | 2 +-
 resources/views/projects/issues/partials/comment-section.blade.php | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
index 31f9888..1894e32 100644
--- a/app/Http/Controllers/Issues/CommentController.php
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -44,6 +44,8 @@ class CommentController extends Controller
      */
     public function update(Request $request, Issue $issue, Comment $comment)
     {
+        $this->authorize('update', $comment);
+
         $commentData = $request->validate([
             'body' => 'required|string|max:255',
         ]);
diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index a582c34..e90ff77 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -45,7 +45,7 @@
                 </td>
             </tr>
             @empty
-            <tr><td colspan="6">{{ __('issue.empty') }}</td></tr>
+            <tr><td colspan="7">{{ __('issue.empty') }}</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
index 094df69..3cc9d69 100644
--- a/resources/views/projects/issues/partials/comment-section.blade.php
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -5,7 +5,9 @@
         <strong>{{ $comment->creator->name }}</strong>
     </legend>
     <div class="pull-right">
-        {{ link_to_route('projects.issues.show', __('app.edit'), [$project, $issue, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }}
+        @can('update', $comment)
+            {{ link_to_route('projects.issues.show', __('app.edit'), [$project, $issue, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }}
+        @endcan
     </div>
     {!! nl2br($comment->body) !!}
 </div>

From 27f77dcb2e3944dcbea5871dc7126346631bc0b7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 16:37:04 +0800
Subject: [PATCH 105/113] User can delete issue comments

---
 app/Http/Controllers/Issues/CommentController.php  | 25 ++++++++++++++++++++++
 .../issues/partials/comment-section.blade.php      |  8 +++++++
 routes/web/projects.php                            |  1 +
 tests/Feature/Projects/IssueCommentsTest.php       | 22 +++++++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
index 1894e32..95dcdbc 100644
--- a/app/Http/Controllers/Issues/CommentController.php
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -54,4 +54,29 @@ class CommentController extends Controller
 
         return redirect()->route('projects.issues.show', [$issue->project, $issue]);
     }
+
+    /**
+     * Remove the specified comment.
+     *
+     * @param  \App\Entities\Projects\Issue  $issue
+     * @param  \\App\Entities\Projects\Comment  $comment
+     * @return \Illuminate\Routing\Redirector
+     */
+    public function destroy(Issue $issue, Comment $comment)
+    {
+        $this->authorize('delete', $comment);
+
+        request()->validate([
+            'comment_id' => 'required|exists:comments,id',
+        ]);
+
+        if (request('comment_id') == $comment->id && $comment->delete()) {
+            flash(__('comment.deleted'), 'warning');
+
+            return redirect()->route('projects.issues.show', [$issue->project, $issue]);
+        }
+        flash(__('comment.undeleted'), 'error');
+
+        return back();
+    }
 }
diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php
index 3cc9d69..73eec00 100644
--- a/resources/views/projects/issues/partials/comment-section.blade.php
+++ b/resources/views/projects/issues/partials/comment-section.blade.php
@@ -8,6 +8,14 @@
         @can('update', $comment)
             {{ link_to_route('projects.issues.show', __('app.edit'), [$project, $issue, 'action' => 'comment-edit', 'comment_id' => $comment->id], ['id' => 'edit-comment-'.$comment->id, 'class' => 'small', 'title' => __('comment.edit')]) }}
         @endcan
+        @can('delete', $comment)
+            {!! FormField::delete(
+                ['route' => ['issues.comments.destroy', $issue, $comment], 'class' => ''],
+                '&times;',
+                ['class' => 'btn-link', 'id' => 'delete-comment-'.$comment->id],
+                ['comment_id' => $comment->id]
+            ) !!}
+        @endcan
     </div>
     {!! nl2br($comment->body) !!}
 </div>
diff --git a/routes/web/projects.php b/routes/web/projects.php
index c162b54..2f4ae02 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -111,3 +111,4 @@ Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('
  */
 Route::post('issues/{issue}/comments', 'Issues\CommentController@store')->name('issues.comments.store');
 Route::patch('issues/{issue}/comments/{comment}', 'Issues\CommentController@update')->name('issues.comments.update');
+Route::delete('issues/{issue}/comments/{comment}', 'Issues\CommentController@destroy')->name('issues.comments.destroy');
diff --git a/tests/Feature/Projects/IssueCommentsTest.php b/tests/Feature/Projects/IssueCommentsTest.php
index a57cc29..a85c290 100644
--- a/tests/Feature/Projects/IssueCommentsTest.php
+++ b/tests/Feature/Projects/IssueCommentsTest.php
@@ -81,4 +81,26 @@ class IssueCommentsTest extends TestCase
         ]);
     }
 
+    /** @test */
+    public function user_can_delete_an_issue_comment()
+    {
+        $this->adminUserSigningIn();
+        $issue = factory(Issue::class)->create();
+        $comment = factory(Comment::class)->create([
+            'commentable_type' => 'issues',
+            'commentable_id'   => $issue->id,
+            'body'             => 'This is issue comment.',
+        ]);
+
+        $this->visitRoute('projects.issues.show', [$issue->project, $issue]);
+        $this->seeElement('button', ['id' => 'delete-comment-'.$comment->id]);
+        $this->press('delete-comment-'.$comment->id);
+
+        $this->seePageIs(route('projects.issues.show', [$issue->project, $issue]));
+        $this->see(__('comment.deleted'));
+
+        $this->dontSeeInDatabase('comments', [
+            'id' => $comment->id,
+        ]);
+    }
 }

From 803e1edaefcb4b44eb537d71cf8a9b467384dab2 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 16:49:29 +0800
Subject: [PATCH 106/113] Add issue comments count on issue index page

---
 app/Http/Controllers/Projects/IssueController.php | 5 ++++-
 resources/views/projects/issues/index.blade.php   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 830df9c..942c579 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -15,7 +15,10 @@ class IssueController extends Controller
 {
     public function index(Project $project)
     {
-        $issues = $project->issues()->with(['pic', 'creator'])->get();
+        $issues = $project->issues()
+            ->with(['pic', 'creator'])
+            ->withCount(['comments'])
+            ->get();
 
         return view('projects.issues.index', compact('project', 'issues'));
     }
diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index e90ff77..8d0c4e1 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -19,6 +19,7 @@
             <th>{{ __('issue.title') }}</th>
             <th>{{ __('issue.priority') }}</th>
             <th>{{ __('app.status') }}</th>
+            <th class="text-center">{{ __('comment.comment') }}</th>
             <th>{{ __('issue.pic') }}</th>
             <th>{{ __('issue.creator') }}</th>
             <th class="text-center">{{ __('app.action') }}</th>
@@ -33,6 +34,7 @@
                 <td>{{ $issue->title }}</td>
                 <td>{!! $issue->priority_label !!}</td>
                 <td>{!! $issue->status_label !!}</td>
+                <td class="text-center">{{ $issue->comments_count }}</td>
                 <td>{{ $issue->pic->name }}</td>
                 <td>{{ $issue->creator->name }}</td>
                 <td class="text-center">

From 2339a5f5172d74c9ba61ada6e04d5121421e5be7 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:14:38 +0800
Subject: [PATCH 107/113] Sort project issue by update time

---
 app/Http/Controllers/Projects/IssueController.php | 1 +
 resources/lang/de/app.php                         | 1 +
 resources/lang/en/app.php                         | 1 +
 resources/lang/id/app.php                         | 1 +
 resources/views/projects/issues/index.blade.php   | 2 ++
 5 files changed, 6 insertions(+)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 942c579..99e4463 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -16,6 +16,7 @@ class IssueController extends Controller
     public function index(Project $project)
     {
         $issues = $project->issues()
+            ->orderBy('updated_at', 'desc')
             ->with(['pic', 'creator'])
             ->withCount(['comments'])
             ->get();
diff --git a/resources/lang/de/app.php b/resources/lang/de/app.php
index 2547e4e..6b6d461 100644
--- a/resources/lang/de/app.php
+++ b/resources/lang/de/app.php
@@ -17,6 +17,7 @@ return [
     'total'             => 'gesamt',
     'count'             => 'Summe',
     'remark'            => 'Remark',
+    'last_update'       => 'Last Update',
 
     // Action
     'add'                   => 'Hinzufügen',
diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
index 2f55d05..2fb3794 100644
--- a/resources/lang/en/app.php
+++ b/resources/lang/en/app.php
@@ -17,6 +17,7 @@ return [
     'total'             => 'Total',
     'count'             => 'Count',
     'remark'            => 'Remark',
+    'last_update'       => 'Last Update',
 
     // Action
     'add'                   => 'Add',
diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php
index 3906fd0..99fffa1 100644
--- a/resources/lang/id/app.php
+++ b/resources/lang/id/app.php
@@ -17,6 +17,7 @@ return [
     'total'             => 'Total',
     'count'             => 'Jumlah',
     'remark'            => 'Keterangan',
+    'last_update'       => 'Update',
 
     // Action
     'add'                   => 'Tambah',
diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index 8d0c4e1..cfcfbde 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -22,6 +22,7 @@
             <th class="text-center">{{ __('comment.comment') }}</th>
             <th>{{ __('issue.pic') }}</th>
             <th>{{ __('issue.creator') }}</th>
+            <th>{{ __('app.last_update') }}</th>
             <th class="text-center">{{ __('app.action') }}</th>
         </thead>
         <tbody>
@@ -37,6 +38,7 @@
                 <td class="text-center">{{ $issue->comments_count }}</td>
                 <td>{{ $issue->pic->name }}</td>
                 <td>{{ $issue->creator->name }}</td>
+                <td>{{ $issue->updated_at->diffForHumans() }}</td>
                 <td class="text-center">
                     {{ link_to_route(
                         'projects.issues.show',

From c532c5bad92d1f08d80fe99fabe615283debe731 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:15:04 +0800
Subject: [PATCH 108/113] Touch issue timestamp on comment creation

---
 app/Http/Controllers/Issues/CommentController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Issues/CommentController.php b/app/Http/Controllers/Issues/CommentController.php
index 95dcdbc..1b3d312 100644
--- a/app/Http/Controllers/Issues/CommentController.php
+++ b/app/Http/Controllers/Issues/CommentController.php
@@ -28,6 +28,7 @@ class CommentController extends Controller
             'body'       => $newComment['body'],
             'creator_id' => auth()->id(),
         ]);
+        $issue->touch();
 
         flash(__('comment.created'), 'success');
 

From 6e54e38f345be712561d4d7d88a109c1c1033855 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:30:19 +0800
Subject: [PATCH 109/113] Prepare project issue filter

---
 resources/lang/de/issue.php                     | 18 ++++++++++--------
 resources/lang/en/issue.php                     | 20 +++++++++++---------
 resources/lang/id/issue.php                     | 18 ++++++++++--------
 resources/views/projects/issues/index.blade.php |  5 +++++
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/resources/lang/de/issue.php b/resources/lang/de/issue.php
index 2d81052..2841cb4 100644
--- a/resources/lang/de/issue.php
+++ b/resources/lang/de/issue.php
@@ -42,14 +42,16 @@ return [
     'creator' => 'Issue Creator',
 
     // Priority
-    'minor'    => 'Minor',
-    'major'    => 'Major',
-    'critical' => 'Critical',
+    'minor'        => 'Minor',
+    'major'        => 'Major',
+    'critical'     => 'Critical',
+    'all_priority' => 'All Priority',
 
     // Statuses
-    'open'     => 'Open',
-    'resolved' => 'Resolved',
-    'closed'   => 'Closed',
-    'on_hold'  => 'On Hold',
-    'invalid'  => 'Invalid',
+    'open'       => 'Open',
+    'resolved'   => 'Resolved',
+    'closed'     => 'Closed',
+    'on_hold'    => 'On Hold',
+    'invalid'    => 'Invalid',
+    'all_status' => 'All Status',
 ];
diff --git a/resources/lang/en/issue.php b/resources/lang/en/issue.php
index 1be2737..4c68a2a 100644
--- a/resources/lang/en/issue.php
+++ b/resources/lang/en/issue.php
@@ -42,15 +42,17 @@ return [
     'creator' => 'Issue Creator',
 
     // Priority
-    'priority' => 'Priority',
-    'minor'    => 'Minor',
-    'major'    => 'Major',
-    'critical' => 'Critical',
+    'priority'     => 'Priority',
+    'minor'        => 'Minor',
+    'major'        => 'Major',
+    'critical'     => 'Critical',
+    'all_priority' => 'All Priority',
 
     // Statuses
-    'open'     => 'Open',
-    'resolved' => 'Resolved',
-    'closed'   => 'Closed',
-    'on_hold'  => 'On Hold',
-    'invalid'  => 'Invalid',
+    'open'       => 'Open',
+    'resolved'   => 'Resolved',
+    'closed'     => 'Closed',
+    'on_hold'    => 'On Hold',
+    'invalid'    => 'Invalid',
+    'all_status' => 'All Status',
 ];
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index 3946ac5..873be9e 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -42,14 +42,16 @@ return [
     'creator' => 'Pembuat Issue',
 
     // Priority
-    'minor'    => 'Minor',
-    'major'    => 'Major',
-    'critical' => 'Critical',
+    'minor'        => 'Minor',
+    'major'        => 'Major',
+    'critical'     => 'Critical',
+    'all_priority' => 'Semua Priority',
 
     // Statuses
-    'open'     => 'Open',
-    'resolved' => 'Selesai',
-    'closed'   => 'Ditutup',
-    'on_hold'  => 'Ditunda',
-    'invalid'  => 'Tidak Valid',
+    'open'       => 'Open',
+    'resolved'   => 'Selesai',
+    'closed'     => 'Ditutup',
+    'on_hold'    => 'Ditunda',
+    'invalid'    => 'Tidak Valid',
+    'all_status' => 'Semua Status',
 ];
diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index cfcfbde..00e070a 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -3,6 +3,11 @@
 @section('subtitle', __('project.issues'))
 
 @section('action-buttons')
+{{ Form::open(['method' => 'get', 'class' => 'form-inline', 'style' => 'display:inline']) }}
+{!! FormField::select('priority_id', [], ['label' => false, 'placeholder' => __('issue.all_priority')]) !!}
+{!! FormField::select('status_id', [], ['label' => false, 'placeholder' => __('issue.all_status')]) !!}
+{{ Form::submit(__('app.filter'), ['class' => 'btn btn-info']) }}
+{{ Form::close() }}
 @can('create', new App\Entities\Projects\Issue)
     {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
 @endcan

From 54f3389df10112f7f85b4eb6a220af9616a40104 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:33:47 +0800
Subject: [PATCH 110/113] Add priority and issue status dropdown

---
 resources/views/projects/issues/index.blade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index 00e070a..7c4f020 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -1,11 +1,13 @@
+@inject('priorities', 'App\Entities\Projects\Priority')
+@inject('issueStatuses', 'App\Entities\Projects\IssueStatus')
 @extends('layouts.project')
 
 @section('subtitle', __('project.issues'))
 
 @section('action-buttons')
 {{ Form::open(['method' => 'get', 'class' => 'form-inline', 'style' => 'display:inline']) }}
-{!! FormField::select('priority_id', [], ['label' => false, 'placeholder' => __('issue.all_priority')]) !!}
-{!! FormField::select('status_id', [], ['label' => false, 'placeholder' => __('issue.all_status')]) !!}
+{!! FormField::select('priority_id', $priorities::toArray(), ['label' => false, 'placeholder' => __('issue.all_priority'), 'value' => request('priority_id')]) !!}
+{!! FormField::select('status_id', $issueStatuses::toArray(), ['label' => false, 'placeholder' => __('issue.all_status'), 'value' => request('status_id')]) !!}
 {{ Form::submit(__('app.filter'), ['class' => 'btn btn-info']) }}
 {{ Form::close() }}
 @can('create', new App\Entities\Projects\Issue)

From 456f5a2446541810abfaf11f578c259d554ac74b Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:37:40 +0800
Subject: [PATCH 111/113] Apply filter issue by priority and and status

---
 app/Http/Controllers/Projects/IssueController.php | 15 ++++++++++++---
 resources/lang/id/issue.php                       |  2 +-
 resources/views/projects/issues/index.blade.php   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Projects/IssueController.php b/app/Http/Controllers/Projects/IssueController.php
index 99e4463..97c46e2 100644
--- a/app/Http/Controllers/Projects/IssueController.php
+++ b/app/Http/Controllers/Projects/IssueController.php
@@ -15,11 +15,20 @@ class IssueController extends Controller
 {
     public function index(Project $project)
     {
-        $issues = $project->issues()
+        $issueQuery = $project->issues()
             ->orderBy('updated_at', 'desc')
             ->with(['pic', 'creator'])
-            ->withCount(['comments'])
-            ->get();
+            ->withCount(['comments']);
+
+        if ($priorityId = request('priority_id')) {
+            $issueQuery->where('priority_id', $priorityId);
+        }
+
+        if ($statusId = request('status_id')) {
+            $issueQuery->where('status_id', $priorityId);
+        }
+
+        $issues = $issueQuery->get();
 
         return view('projects.issues.index', compact('project', 'issues'));
     }
diff --git a/resources/lang/id/issue.php b/resources/lang/id/issue.php
index 873be9e..120fd46 100644
--- a/resources/lang/id/issue.php
+++ b/resources/lang/id/issue.php
@@ -9,7 +9,7 @@ return [
     'all'           => 'Semua Issue',
     'select'        => 'Pilih Issue',
     'detail'        => 'Detail Issue',
-    'not_found'     => 'Issue tidak ditemukan',
+    'not_found'     => 'Issue tidak ditemukan.',
     'empty'         => 'Belum ada Issue',
     'back_to_show'  => 'Kembali ke detail Issue',
     'back_to_index' => 'Kembali ke daftar Issue',
diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index 7c4f020..629b524 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -56,7 +56,7 @@
                 </td>
             </tr>
             @empty
-            <tr><td colspan="7">{{ __('issue.empty') }}</td></tr>
+            <tr><td colspan="9">{{ __('issue.not_found') }}</td></tr>
             @endforelse
         </tbody>
     </table>

From a42292c6c9a83e74d9b753de4fbd697eb45960b1 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 17:41:16 +0800
Subject: [PATCH 112/113] Add reset button on filtered issue listing page

---
 resources/views/projects/issues/index.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/projects/issues/index.blade.php b/resources/views/projects/issues/index.blade.php
index 629b524..383a6bf 100755
--- a/resources/views/projects/issues/index.blade.php
+++ b/resources/views/projects/issues/index.blade.php
@@ -9,6 +9,9 @@
 {!! FormField::select('priority_id', $priorities::toArray(), ['label' => false, 'placeholder' => __('issue.all_priority'), 'value' => request('priority_id')]) !!}
 {!! FormField::select('status_id', $issueStatuses::toArray(), ['label' => false, 'placeholder' => __('issue.all_status'), 'value' => request('status_id')]) !!}
 {{ Form::submit(__('app.filter'), ['class' => 'btn btn-info']) }}
+@if (request(['priority_id', 'status_id']))
+    {{ link_to_route('projects.issues.index', __('app.reset'), $project, ['class' => 'btn btn-default']) }}
+@endif
 {{ Form::close() }}
 @can('create', new App\Entities\Projects\Issue)
     {!! html_link_to_route('projects.issues.create', __('issue.create'), $project, ['class' => 'btn btn-success', 'icon' => 'plus']) !!}

From e164cbfbdb920bbbb9a8c59b571d534fa3cc3e63 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Tue, 26 Mar 2019 09:47:01 +0000
Subject: [PATCH 113/113] Apply fixes from StyleCI

---
 app/Entities/BaseRepository.php   | 1 -
 app/Entities/Projects/Issue.php   | 2 --
 app/Entities/Projects/Project.php | 1 -
 routes/web/projects.php           | 4 ++--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php
index 860569c..7a9800d 100755
--- a/app/Entities/BaseRepository.php
+++ b/app/Entities/BaseRepository.php
@@ -4,7 +4,6 @@ namespace App\Entities;
 
 use App\Entities\Users\User;
 use App\Entities\Projects\Job;
-use App\Entities\Projects\Project;
 use App\Entities\Partners\Customer;
 
 /**
diff --git a/app/Entities/Projects/Issue.php b/app/Entities/Projects/Issue.php
index 2ec06fc..65b5b62 100644
--- a/app/Entities/Projects/Issue.php
+++ b/app/Entities/Projects/Issue.php
@@ -3,8 +3,6 @@
 namespace App\Entities\Projects;
 
 use App\Entities\Users\User;
-use App\Entities\Projects\Comment;
-use App\Entities\Projects\Project;
 use Illuminate\Database\Eloquent\Model;
 
 class Issue extends Model
diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php
index 6c6d59e..f47e1ef 100755
--- a/app/Entities/Projects/Project.php
+++ b/app/Entities/Projects/Project.php
@@ -3,7 +3,6 @@
 namespace App\Entities\Projects;
 
 use DB;
-use App\Entities\Projects\Issue;
 use App\Entities\Invoices\Invoice;
 use App\Entities\Payments\Payment;
 use App\Entities\Partners\Customer;
diff --git a/routes/web/projects.php b/routes/web/projects.php
index 2f4ae02..e31823c 100644
--- a/routes/web/projects.php
+++ b/routes/web/projects.php
@@ -101,12 +101,12 @@ Route::group(['middleware' => ['auth']], function () {
     Route::delete('jobs/{job}/comments/{comment}', 'Jobs\CommentsController@destroy')->name('jobs.comments.destroy');
 });
 
-/**
+/*
  * Issue Options Routes
  */
 Route::patch('issues/{issue}/options', 'Issues\OptionController@update')->name('issues.options.update');
 
-/**
+/*
  * Issue Comments Routes
  */
 Route::post('issues/{issue}/comments', 'Issues\CommentController@store')->name('issues.comments.store');