From 0740527b54239ea9580bdb3fb7c71908e0bdb762 Mon Sep 17 00:00:00 2001
From: Jitendra Singh <jitendra@webkul.com>
Date: Thu, 20 Feb 2020 12:37:53 +0530
Subject: [PATCH] Improved tax package code style

---
 .../Controllers/TaxCategoryController.php     | 16 ++++----
 .../Http/Controllers/TaxRateController.php    | 39 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
index dba75461c..445d3d502 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
@@ -75,11 +75,11 @@ class TaxCategoryController extends Controller
         $data = request()->input();
 
         $this->validate(request(), [
-            'channel_id' => 'required|numeric',
-            'code' => 'required|string|unique:tax_categories,code',
-            'name' => 'required|string',
+            'channel_id'  => 'required|numeric',
+            'code'        => 'required|string|unique:tax_categories,code',
+            'name'        => 'required|string',
             'description' => 'required|string',
-            'taxrates' => 'array|required'
+            'taxrates'    => 'array|required'
         ]);
 
         Event::dispatch('tax.tax_category.create.before');
@@ -118,11 +118,11 @@ class TaxCategoryController extends Controller
     public function update($id)
     {
         $this->validate(request(), [
-            'channel_id' => 'required|numeric',
-            'code' => 'required|string|unique:tax_categories,code,' . $id,
-            'name' => 'required|string',
+            'channel_id'  => 'required|numeric',
+            'code'        => 'required|string|unique:tax_categories,code,' . $id,
+            'name'        => 'required|string',
             'description' => 'required|string',
-            'taxrates' => 'array|required'
+            'taxrates'    => 'array|required'
         ]);
 
         $data = request()->input();
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
index e54c7f56b..20f843c41 100755
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
@@ -73,18 +73,19 @@ class TaxRateController extends Controller
     {
         $this->validate(request(), [
             'identifier' => 'required|string|unique:tax_rates,identifier',
-            'is_zip' => 'sometimes',
-            'zip_code' => 'sometimes|required_without:is_zip',
-            'zip_from' => 'nullable|required_with:is_zip',
-            'zip_to' => 'nullable|required_with:is_zip,zip_from',
-            'country' => 'required|string',
-            'tax_rate' => 'required|numeric|min:0.0001'
+            'is_zip'     => 'sometimes',
+            'zip_code'   => 'sometimes|required_without:is_zip',
+            'zip_from'   => 'nullable|required_with:is_zip',
+            'zip_to'     => 'nullable|required_with:is_zip,zip_from',
+            'country'    => 'required|string',
+            'tax_rate'   => 'required|numeric|min:0.0001'
         ]);
 
         $data = request()->all();
 
         if (isset($data['is_zip'])) {
             $data['is_zip'] = 1;
+
             unset($data['zip_code']);
         }
 
@@ -121,11 +122,11 @@ class TaxRateController extends Controller
     {
         $this->validate(request(), [
             'identifier' => 'required|string|unique:tax_rates,identifier,'.$id,
-            'is_zip' => 'sometimes',
-            'zip_from' => 'nullable|required_with:is_zip',
-            'zip_to' => 'nullable|required_with:is_zip,zip_from',
-            'country' => 'required|string',
-            'tax_rate' => 'required|numeric|min:0.0001'
+            'is_zip'     => 'sometimes',
+            'zip_from'   => 'nullable|required_with:is_zip',
+            'zip_to'     => 'nullable|required_with:is_zip,zip_from',
+            'country'    => 'required|string',
+            'tax_rate'   => 'required|numeric|min:0.0001'
         ]);
 
         Event::dispatch('tax.tax_rate.update.before', $id);
@@ -184,19 +185,19 @@ class TaxRateController extends Controller
                 foreach ($excelData as $data) {
                     foreach ($data as $column => $uploadData) {
 
-                        if (!is_null($uploadData['zip_from']) && !is_null($uploadData['zip_to'])) {
+                        if (! is_null($uploadData['zip_from']) && !is_null($uploadData['zip_to'])) {
                             $uploadData['is_zip'] = 1;
                         }
 
                         $validator = Validator::make($uploadData, [
                             'identifier' => 'required|string',
-                            'state' => 'required|string',
-                            'country' => 'required|string',
-                            'tax_rate' => 'required|numeric|min:0.0001',
-                            'is_zip' => 'sometimes',
-                            'zip_code' => 'sometimes|required_without:is_zip',
-                            'zip_from' => 'nullable|required_with:is_zip',
-                            'zip_to' => 'nullable|required_with:is_zip,zip_from',
+                            'state'      => 'required|string',
+                            'country'    => 'required|string',
+                            'tax_rate'   => 'required|numeric|min:0.0001',
+                            'is_zip'     => 'sometimes',
+                            'zip_code'   => 'sometimes|required_without:is_zip',
+                            'zip_from'   => 'nullable|required_with:is_zip',
+                            'zip_to'     => 'nullable|required_with:is_zip,zip_from',
                         ]);
 
                         if ($validator->fails()) {