From 264bc14ed30a1fd9287e31a1a313c9d1adeac5d8 Mon Sep 17 00:00:00 2001 From: Iman Date: Sat, 1 Dec 2018 10:48:19 +0330 Subject: [PATCH] Update TaxCategoryController.php --- .../Controllers/TaxCategoryController.php | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index 98655561d..8bb061042 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -144,21 +144,22 @@ class TaxCategoryController extends Controller ]); $data = request()->input(); + + $taxCategory = $this->taxCategory->update($data, $id); - if($taxCategory = $this->taxCategory->update($data, $id)) { - $taxRates = $data['taxrates']; - - //attach the categories in the tax map table - $this->taxCategory->attachOrDetach($taxCategory, $taxRates); - - session()->flash('success', trans('admin::app.settings.tax-categories.update-success')); - - return redirect()->route($this->_config['redirect']); - } else { + 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 + $this->taxCategory->attachOrDetach($taxCategory, $taxRates); + + session()->flash('success', trans('admin::app.settings.tax-categories.update-success')); + + return redirect()->route($this->_config['redirect']); } /** @@ -179,4 +180,4 @@ class TaxCategoryController extends Controller return redirect()->back(); } -} \ No newline at end of file +}