From d30fe4da9b7ad3494fcb9e20cbe94c9307b17664 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Fri, 9 Nov 2018 12:14:06 +0300
Subject: [PATCH] close #611 Fixed: Create tax rate not null type.

---
 app/Http/Controllers/Settings/Taxes.php         | 8 +++++++-
 app/Http/Requests/Setting/Tax.php               | 2 ++
 resources/views/settings/taxes/create.blade.php | 2 +-
 resources/views/settings/taxes/edit.blade.php   | 2 +-
 resources/views/settings/taxes/index.blade.php  | 4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Settings/Taxes.php b/app/Http/Controllers/Settings/Taxes.php
index c56a307a6..bf296fdd8 100644
--- a/app/Http/Controllers/Settings/Taxes.php
+++ b/app/Http/Controllers/Settings/Taxes.php
@@ -18,7 +18,13 @@ class Taxes extends Controller
     {
         $taxes = Tax::collect();
 
-        return view('settings.taxes.index', compact('taxes', 'rates'));
+        $types = [
+            'normal' => trans('taxes.normal'),
+            'inclusive' => trans('taxes.inclusive'),
+            'compound' => trans('taxes.compound'),
+        ];
+
+        return view('settings.taxes.index', compact('taxes', 'types'));
     }
 
     /**
diff --git a/app/Http/Requests/Setting/Tax.php b/app/Http/Requests/Setting/Tax.php
index 15645d2bc..756e8764b 100644
--- a/app/Http/Requests/Setting/Tax.php
+++ b/app/Http/Requests/Setting/Tax.php
@@ -26,6 +26,8 @@ class Tax extends Request
         return [
             'name' => 'required|string',
             'rate' => 'required|min:0|max:100',
+            'type' => 'required|string',
+            'enabled' => 'integer|boolean',
         ];
     }
 }
diff --git a/resources/views/settings/taxes/create.blade.php b/resources/views/settings/taxes/create.blade.php
index 7f6286608..8994b52c2 100644
--- a/resources/views/settings/taxes/create.blade.php
+++ b/resources/views/settings/taxes/create.blade.php
@@ -12,7 +12,7 @@
 
             {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
-            {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null, []) }}
+            {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }}
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>
diff --git a/resources/views/settings/taxes/edit.blade.php b/resources/views/settings/taxes/edit.blade.php
index 68221d122..7ba951900 100644
--- a/resources/views/settings/taxes/edit.blade.php
+++ b/resources/views/settings/taxes/edit.blade.php
@@ -17,7 +17,7 @@
 
             {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
-            {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null, []) }}
+            {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null) }}
 
             {{ Form::radioGroup('enabled', trans('general.enabled')) }}
         </div>
diff --git a/resources/views/settings/taxes/index.blade.php b/resources/views/settings/taxes/index.blade.php
index 1861ff22b..4e2762c8f 100644
--- a/resources/views/settings/taxes/index.blade.php
+++ b/resources/views/settings/taxes/index.blade.php
@@ -32,7 +32,8 @@
                 <thead>
                     <tr>
                         <th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
-                        <th class="col-md-5">@sortablelink('rate', trans('taxes.rate_percent'))</th>
+                        <th class="col-md-3">@sortablelink('rate', trans('taxes.rate_percent'))</th>
+                        <th class="col-md-2">@sortablelink('type', trans_choice('general.types', 1))</th>
                         <th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
                         <th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
                     </tr>
@@ -42,6 +43,7 @@
                     <tr>
                         <td><a href="{{ url('settings/taxes/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
                         <td>{{ $item->rate }}</td>
+                        <td>{{ $types[$item->type] }}</td>
                         <td class="hidden-xs">
                             @if ($item->enabled)
                                 <span class="label label-success">{{ trans('general.enabled') }}</span>