diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 475870df5..bf9bfea6a 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -131,7 +131,7 @@ class AttributeController extends Controller { $attribute = $this->attribute->findOrFail($id); - if (!$attribute->is_user_defined) { + if (! $attribute->is_user_defined) { session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute'])); } else { try { diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 0c97e6d7c..f49bbe27c 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -154,7 +154,7 @@ class ChannelController extends Controller Event::fire('core.channel.delete.before', $id); try { - $this->channel->findOrFail($id)->delete(); + $this->channel->delete($id); } catch(\Exception $e) { session()->flash('warning', trans($e->getMessage())); } diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index 20664ead5..09b2bef8d 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -135,7 +135,7 @@ class CurrencyController extends Controller try { Event::fire('core.currency.delete.before', $id); - $result = $this->currency->findOrFail($id)->delete(); + $result = $this->currency->delete($id); Event::fire('core.currency.delete.after', $id); diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index 45f5ede90..bb6ef5ce1 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -152,7 +152,7 @@ class ExchangeRateController extends Controller } else { Event::fire('core.exchange_rate.delete.before', $id); - $this->exchangeRate->findOrFail($id)->delete(); + $this->exchangeRate->delete($id); Event::fire('core.exchange_rate.delete.after', $id); diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index fccfbc466..fdb10d001 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -137,7 +137,7 @@ class LocaleController extends Controller } else { Event::fire('core.locale.delete.before', $id); - $this->locale->findOrFail($id)->delete(); + $this->locale->delete($id); Event::fire('core.locale.delete.after', $id); diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php index 2b20f78d4..055137e9a 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php @@ -136,7 +136,7 @@ class SliderController extends Controller if ($this->slider->findWhere(['channel_id' => core()->getCurrentChannel()->id])->count() == 1) { session()->flash('warning', trans('admin::app.settings.sliders.delete-success')); } else { - $this->slider->findOrFail($id)->delete(); + $this->slider->delete($id); session()->flash('success', trans('admin::app.settings.sliders.delete-fail')); } diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index bdb515811..ef4adcae9 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -160,7 +160,7 @@ class InventorySourceController extends Controller } else { Event::fire('inventory.inventory_source.delete.before', $id); - $this->inventorySource->findOrFail($id)->delete(); + $this->inventorySource->delete($id); Event::fire('inventory.inventory_source.delete.after', $id); diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php index 33631169f..be4d04605 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php @@ -107,7 +107,7 @@ class ReviewController extends Controller { Event::fire('customer.review.delete.before', $id); - $this->productReview->findOrFail($id)->delete(); + $this->productReview->delete($id); Event::fire('customer.review.delete.after', $id); diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index 889a04c5c..0ebab98b2 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -176,7 +176,7 @@ class TaxCategoryController extends Controller try { Event::fire('tax.tax_category.delete.before', $id); - $this->taxCategory->findOrFail($id)->delete(); + $this->taxCategory->delete($id); Event::fire('tax.tax_category.delete.after', $id); } catch(Exception $e) { diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 0ff815911..71943d0ca 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -165,7 +165,7 @@ class TaxRateController extends Controller // } Event::fire('tax.tax_rate.delete.before', $id); - $this->taxRate->findOrFail($id)->delete(); + $this->taxRate->delete($id); Event::fire('tax.tax_rate.delete.after', $id); diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index 94fec3db6..18bd16c20 100755 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -139,7 +139,7 @@ class RoleController extends Controller } else { Event::fire('user.role.delete.before', $id); - $this->role->findOrFail($id)->delete(); + $this->role->delete($id); Event::fire('user.role.delete.after', $id); diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index f4a035863..d1026f624 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -168,7 +168,7 @@ class UserController extends Controller return view('admin::customers.confirm-password'); } - $this->admin->findOrFail($id)->delete(); + $this->admin->delete($id); Event::fire('user.admin.delete.after', $id);