From 5ebe171117ab6a3e24064b46ba6be8bff563a47a Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Fri, 21 Dec 2018 14:18:59 +0530
Subject: [PATCH] Fixed issue #363

---
 .../Http/Controllers/TaxCategoryController.php   | 12 +++++-------
 .../src/Http/Controllers/TaxRateController.php   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
index 8bb061042..7a6c64626 100644
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
@@ -144,14 +144,14 @@ class TaxCategoryController extends Controller
         ]);
 
         $data = request()->input();
-        
+
         $taxCategory = $this->taxCategory->update($data, $id);
 
         if(!$taxCategory) {
             session()->flash('error', trans('admin::app.settings.tax-categories.update-error'));
             return redirect()->back();
         }
-        
+
         $taxRates = $data['taxrates'];
 
         //attach the categories in the tax map table
@@ -170,12 +170,10 @@ class TaxCategoryController extends Controller
      */
     public function destroy($id)
     {
-        if($this->taxCategory->count() == 1) {
-            session()->flash('error', trans('admin::app.settings.tax-categories.atleast-one'));
-        } else {
+        try {
             $this->taxCategory->delete($id);
-
-            session()->flash('success', trans('admin::app.settings.tax-categories.delete'));
+        } catch(Exception $e) {
+            return redirect()->back();
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
index 5ee2771fe..d01627e75 100644
--- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
+++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
@@ -157,12 +157,18 @@ class TaxRateController extends Controller
      */
     public function destroy($id)
     {
-        if($this->taxRate->count() == 1) {
-            session()->flash('error', trans('admin::app.settings.tax-rates.atleast-one'));
-        } else {
-            $this->taxRate->delete($id);
+        // if($this->taxRate->count() == 1) {
+        //     session()->flash('error', trans('admin::app.settings.tax-rates.atleast-one'));
+        // } else {
 
-            session()->flash('success', trans('admin::app.settings.tax-rates.delete'));
+
+        //     session()->flash('success', trans('admin::app.settings.tax-rates.delete'));
+        // }
+
+        try{
+            $this->taxRate->delete($id);
+        } catch(Exception $e) {
+            return redirect()->back();
         }
 
         return redirect()->back();