diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index 68fcd8b7e..08a9049b6 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -133,7 +133,7 @@ class LocaleController extends Controller $locale = $this->localeRepository->findOrFail($id); if ($this->localeRepository->count() == 1) { - session()->flash('error', trans('admin::app.settings.locales.last-delete-error')); + session()->flash('warning', trans('admin::app.settings.locales.last-delete-error')); } else { try { Event::dispatch('core.locale.delete.before', $id); diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php index 1a98615eb..ea89bf301 100644 --- a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php +++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php @@ -34,7 +34,12 @@ class AdminHelper { $data = request()->all(); $type = 'category_icon_path'; - $category = $this->categoryRepository->findOrFail($category); + + if ($category instanceof \Webkul\Category\Models\Category) { + $category = $category; + } else { + $category = $this->categoryRepository->findOrFail($category); + } $category = $this->uploadImage($category, $data, $type);