From 9d99fdf186124484bca44af6cbb19b61501f8c07 Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 11 Feb 2022 18:04:38 +0530 Subject: [PATCH] All Destroy Method Updated --- .../Customer/CustomerController.php | 16 ++------ .../Customer/CustomerGroupController.php | 30 ++++++++------- .../Http/Controllers/AttributeController.php | 22 +++++------ .../Controllers/AttributeFamilyController.php | 38 +++++++++++-------- .../Http/Controllers/Admin/PageController.php | 8 +--- .../Http/Controllers/CartRuleController.php | 10 ++--- .../Controllers/CatalogRuleController.php | 10 ++--- .../Http/Controllers/CategoryController.php | 22 +++++------ .../Http/Controllers/ChannelController.php | 20 ++++------ .../Http/Controllers/CurrencyController.php | 23 +++++------ .../Controllers/ExchangeRateController.php | 8 +--- .../src/Http/Controllers/LocaleController.php | 20 ++++------ .../src/Http/Controllers/SliderController.php | 8 +--- .../Controllers/SubscriptionController.php | 8 +--- .../Controllers/InventorySourceController.php | 24 +++++------- .../Http/Controllers/CampaignController.php | 10 ++--- .../src/Http/Controllers/EventController.php | 10 ++--- .../Http/Controllers/TemplateController.php | 10 ++--- .../Http/Controllers/ProductController.php | 2 +- .../src/Http/Controllers/ReviewController.php | 8 +--- .../Http/Controllers/OnepageController.php | 4 +- .../Controllers/TaxCategoryController.php | 10 ++--- .../Http/Controllers/TaxRateController.php | 10 ++--- .../src/Http/Controllers/RoleController.php | 26 ++++++------- .../src/Http/Controllers/UserController.php | 32 +++++++--------- .../Controllers/Admin/CategoryController.php | 19 ++++------ .../Controllers/Admin/ContentController.php | 10 ++--- .../Http/Controllers/Shop/CartController.php | 4 +- .../Controllers/Shop/ComparisonController.php | 4 +- 29 files changed, 171 insertions(+), 255 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 1a0138f1d..8d5d30f4c 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -200,24 +200,16 @@ class CustomerController extends Controller $customer = $this->customerRepository->findorFail($id); try { - if (! $this->customerRepository->checkIfCustomerHasOrderPendingOrProcessing($customer)) { - $this->customerRepository->delete($id); - } else { - session()->flash('error', trans('admin::app.response.order-pending', ['name' => 'Customer'])); - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Customer'])]); } - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer'])); - return response()->json(['message' => true], 200); - } catch (\Exception $e) { + return response()->json(['message' => trans('admin::app.response.order-pending', ['name' => 'Customer'])], 400); + } catch (\Exception $e) {} - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Customer'])], 400); } /** diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 2d36dffa0..98c44da4c 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -128,21 +128,23 @@ class CustomerGroupController extends Controller $customerGroup = $this->customerGroupRepository->findOrFail($id); if ($customerGroup->is_user_defined == 0) { - session()->flash('warning', trans('admin::app.customers.customers.group-default')); - } elseif (count($customerGroup->customers) > 0) { - session()->flash('warning', trans('admin::app.response.customer-associate', ['name' => 'Customer Group'])); - } else { - try { - $this->customerGroupRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer Group'])); - } + return response()->json([ + 'message' => trans('admin::app.customers.customers.group-default'), + ], 400); } - return response()->json(['message' => false], 400); + if (count($customerGroup->customers) > 0) { + return response()->json([ + 'message' => trans('admin::app.response.customer-associate', ['name' => 'Customer Group']), + ], 400); + } + + try { + $this->customerGroupRepository->delete($id); + + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Customer Group'])]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Customer Group'])], 500); } } diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 58414e914..fcfce12f3 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -140,20 +140,18 @@ class AttributeController extends Controller $attribute = $this->attributeRepository->findOrFail($id); if (! $attribute->is_user_defined) { - session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute'])); - } else { - try { - $this->attributeRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Attribute'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Attribute'])); - } + return response()->json([ + 'message' => trans('admin::app.response.user-define-error', ['name' => 'Attribute']), + ], 400); } - return response()->json(['message' => false], 400); + try { + $this->attributeRepository->delete($id); + + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Attribute'])]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Attribute'])], 500); } /** diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php index ac5bff95b..bb31f5ec0 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php @@ -140,24 +140,30 @@ class AttributeFamilyController extends Controller $attributeFamily = $this->attributeFamilyRepository->findOrFail($id); if ($this->attributeFamilyRepository->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Family'])); - - } elseif ($attributeFamily->products()->count()) { - session()->flash('error', trans('admin::app.response.attribute-product-error', ['name' => 'Attribute family'])); - } else { - try { - $this->attributeFamilyRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Family'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - report($e); - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Family'])); - } + return response()->json([ + 'message' => trans('admin::app.response.last-delete-error', ['name' => 'Family']), + ], 400); } - return response()->json(['message' => false], 400); + if ($attributeFamily->products()->count()) { + return response()->json([ + 'message' => trans('admin::app.response.attribute-product-error', ['name' => 'Attribute family']), + ], 400); + } + + try { + $this->attributeFamilyRepository->delete($id); + + return response()->json([ + 'message' => trans('admin::app.response.delete-success', ['name' => 'Family']), + ]); + } catch (\Exception $e) { + report($e); + } + + return response()->json([ + 'message' => trans('admin::app.response.delete-failed', ['name' => 'Family']), + ], 500); } /** diff --git a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php index f67048194..c0014c34b 100644 --- a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php +++ b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php @@ -136,14 +136,10 @@ class PageController extends Controller $page = $this->cmsRepository->findOrFail($id); if ($page->delete()) { - session()->flash('success', trans('admin::app.cms.pages.delete-success')); - - return response()->json(['message' => true], 200); + return response()->json(['message' => trans('admin::app.cms.pages.delete-success')]); } - session()->flash('success', trans('admin::app.cms.pages.delete-failure')); - - return response()->json(['message' => false], 200); + return response()->json(['message' => trans('admin::app.cms.pages.delete-failure')], 500); } /** diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php index 24d02af74..8ddc3052c 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php @@ -212,13 +212,9 @@ class CartRuleController extends Controller try { $this->cartRuleRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Cart Rule'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Cart Rule'])]); + } catch (Exception $e) {} - return response()->json(['message' => true], 200); - } catch (Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Cart Rule'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Cart Rule'])], 400); } } diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php index f420240c1..68a9bc5cc 100644 --- a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php @@ -156,13 +156,9 @@ class CatalogRuleController extends Controller try { $this->catalogRuleRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Catalog Rule'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Catalog Rule'])]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Catalog Rule'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Catalog Rule'])], 400); } } diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 33964491a..0c1b68f84 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -136,20 +136,16 @@ class CategoryController extends Controller $category = $this->categoryRepository->findOrFail($id); if ($this->isCategoryDeletable($category)) { - session()->flash('warning', trans('admin::app.response.delete-category-root', ['name' => 'Category'])); - } else { - try { - $this->categoryRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Category'])); - } + return response()->json(['message' => trans('admin::app.response.delete-category-root', ['name' => 'Category'])], 400); } - return response()->json(['message' => false], 400); + try { + $this->categoryRepository->delete($id); + + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Category'])]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Category'])], 500); } /** @@ -204,7 +200,7 @@ class CategoryController extends Controller $product_count += $category->products->count(); } - return response()->json(['product_count' => $product_count], 200); + return response()->json(['product_count' => $product_count]); } /** diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index bc14dfd0f..1739684f2 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -187,20 +187,16 @@ class ChannelController extends Controller $channel = $this->channelRepository->findOrFail($id); if ($channel->code == config('app.channel')) { - session()->flash('error', trans('admin::app.settings.channels.last-delete-error')); - } else { - try { - $this->channelRepository->delete($id); - - session()->flash('success', trans('admin::app.settings.channels.delete-success')); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Channel'])); - } + return response()->json(['message' => trans('admin::app.settings.channels.last-delete-error')], 400); } - return response()->json(['message' => false], 400); + try { + $this->channelRepository->delete($id); + + return response()->json(['message' => trans('admin::app.settings.channels.delete-success')]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Channel'])], 400); } /** diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php index c6d289986..f820ad1ea 100755 --- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php +++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php @@ -121,21 +121,18 @@ class CurrencyController extends Controller $this->currencyRepository->findOrFail($id); if ($this->currencyRepository->count() == 1) { - session()->flash('warning', trans('admin::app.settings.currencies.last-delete-error')); - } else { - try { - $this->currencyRepository->delete($id); - - session()->flash('success', trans('admin::app.settings.currencies.delete-success')); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - report($e); - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Currency'])); - } + return response()->json(['message' => trans('admin::app.settings.currencies.last-delete-error')], 400); } - return response()->json(['message' => false], 400); + try { + $this->currencyRepository->delete($id); + + return response()->json(['message' => trans('admin::app.settings.currencies.delete-success')]); + } catch (\Exception $e) { + report($e); + } + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Currency'])], 500); } /** diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index 96d22aad4..0829ae730 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -158,15 +158,11 @@ class ExchangeRateController extends Controller try { $this->exchangeRateRepository->delete($id); - session()->flash('success', trans('admin::app.settings.exchange_rates.delete-success')); - - return response()->json(['message' => true], 200); + return response()->json(['message' => trans('admin::app.settings.exchange_rates.delete-success')]); } catch (\Exception $e) { report($e); - - session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate'])); } - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-error', ['name' => 'Exchange rate'])], 500); } } diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php index 6f6c49733..d3a28bfda 100755 --- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php +++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php @@ -123,19 +123,15 @@ class LocaleController extends Controller $this->localeRepository->findOrFail($id); if ($this->localeRepository->count() == 1) { - session()->flash('warning', trans('admin::app.settings.locales.last-delete-error')); - } else { - try { - $this->localeRepository->delete($id); - - session()->flash('success', trans('admin::app.settings.locales.delete-success')); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Locale'])); - } + return response()->json(['message' => trans('admin::app.settings.locales.last-delete-error')], 400); } - return response()->json(['message' => false], 400); + try { + $this->localeRepository->delete($id); + + return response()->json(['message' => trans('admin::app.settings.locales.delete-success')]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Locale'])], 500); } } diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php index 58075382f..1c3dc574e 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php @@ -165,15 +165,11 @@ class SliderController extends Controller try { $this->sliderRepository->delete($id); - return response()->json([ - 'message' => trans('admin::app.response.delete-success', ['name' => 'Slider']), - ], 200); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Slider'])]); } catch (\Exception $e) { report($e); } - return response()->json([ - 'message' => trans('admin::app.response.delete-failed', ['name' => 'Slider']), - ], 500); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Slider'])], 500); } } diff --git a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php index 3c4a7861b..c97bb0785 100755 --- a/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php @@ -104,15 +104,11 @@ class SubscriptionController extends Controller try { $this->subscribersListRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Subscriber'])); - - return response()->json(['message' => true], 200); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Subscriber'])]); } catch (\Exception $e) { report($e); - - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Subscriber'])); } - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Subscriber'])], 500); } } diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php index 9aa8a324d..8e8759f88 100755 --- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php +++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php @@ -120,21 +120,17 @@ class InventorySourceController extends Controller $this->inventorySourceRepository->findOrFail($id); if ($this->inventorySourceRepository->count() == 1) { - session()->flash('error', trans('admin::app.settings.inventory_sources.last-delete-error')); - } else { - try { - $this->inventorySourceRepository->delete($id); - - session()->flash('success', trans('admin::app.settings.inventory_sources.delete-success')); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - report($e); - - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Inventory source'])); - } + return response()->json(['message' => trans('admin::app.settings.inventory_sources.last-delete-error')], 400); } - return response()->json(['message' => false], 400); + try { + $this->inventorySourceRepository->delete($id); + + return response()->json(['message' => trans('admin::app.settings.inventory_sources.delete-success')]); + } catch (\Exception $e) { + report($e); + } + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Inventory source'])], 500); } } diff --git a/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php b/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php index bfcfef91d..fe9279b2b 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/CampaignController.php @@ -129,13 +129,9 @@ class CampaignController extends Controller try { $this->campaignRepository->delete($id); - session()->flash('success', trans('admin::app.marketing.campaigns.delete-success')); + return response()->json(['message' => trans('admin::app.marketing.campaigns.delete-success')]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Email Campaign'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Email Campaign'])], 500); } } diff --git a/packages/Webkul/Marketing/src/Http/Controllers/EventController.php b/packages/Webkul/Marketing/src/Http/Controllers/EventController.php index a169c263e..fcd2f704f 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/EventController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/EventController.php @@ -131,13 +131,9 @@ class EventController extends Controller try { $this->eventRepository->delete($id); - session()->flash('success', trans('admin::app.marketing.events.delete-success')); + return response()->json(['message' => trans('admin::app.marketing.events.delete-success')]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Event'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Event'])], 500); } } diff --git a/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php b/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php index 74c4c06f1..7d38a4e25 100644 --- a/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php +++ b/packages/Webkul/Marketing/src/Http/Controllers/TemplateController.php @@ -125,13 +125,9 @@ class TemplateController extends Controller try { $this->templateRepository->delete($id); - session()->flash('success', trans('admin::app.marketing.templates.delete-success')); + return response()->json(['message' => trans('admin::app.marketing.templates.delete-success')]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Email Template'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Email Template'])], 400); } } diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 8a02e30b0..2d5709329 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -354,7 +354,7 @@ class ProductController extends Controller return response()->json([ 'message' => trans('admin::app.response.delete-success', ['name' => 'Product']), - ], 200); + ]); } catch (Exception $e) { report($e); } diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php index d27621f5d..c119c6529 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php @@ -90,16 +90,12 @@ class ReviewController extends Controller try { $this->productReviewRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Review'])); - - return response()->json(['message' => true], 200); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Review'])]); } catch (\Exception $e) { report($e); - - session()->flash('success', trans('admin::app.response.delete-failed', ['name' => 'Review'])); } - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Review'])], 500); } /** diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 91e6cca75..c2935c6d4 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -328,7 +328,7 @@ class OnepageController extends Controller 'success' => true, 'message' => trans('shop::app.checkout.total.coupon-applied'), 'result' => $result, - ], 200); + ]); } return response()->json([ @@ -356,7 +356,7 @@ class OnepageController extends Controller 'data' => [ 'grand_total' => core()->currency(Cart::getCart()->grand_total), ], - ], 200); + ]); } return response()->json([ diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index c6d0ad0ca..ba1f26a79 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -139,13 +139,9 @@ class TaxCategoryController extends Controller try { $this->taxCategoryRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Tax Category'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Tax Category'])]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Tax Category'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Tax Category'])], 500); } } diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 3d91d2d1e..42959b5d0 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -144,14 +144,10 @@ class TaxRateController extends Controller try { $this->taxRateRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Tax Rate'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Tax Rate'])]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Tax Rate'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Tax Rate'])], 500); } /** diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php index 5296f6dab..6d1de97df 100755 --- a/packages/Webkul/User/src/Http/Controllers/RoleController.php +++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php @@ -149,21 +149,19 @@ class RoleController extends Controller $role = $this->roleRepository->findOrFail($id); if ($role->admins->count() >= 1) { - session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User'])); - } else if ($this->roleRepository->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role'])); - } else { - try { - $this->roleRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Role'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Role'])); - } + return response()->json(['message' => trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User'])], 400); } - return response()->json(['message' => false], 400); + if ($this->roleRepository->count() == 1) { + return response()->json(['message' => trans('admin::app.response.last-delete-error', ['name' => 'Role'])], 400); + } + + try { + $this->roleRepository->delete($id); + + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Role'])]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Role'])], 500); } } diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index 4f930808b..b6d5e1af0 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -149,26 +149,22 @@ class UserController extends Controller $this->adminRepository->findOrFail($id); if ($this->adminRepository->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin'])); - } else { - if (auth()->guard('admin')->user()->id == $id) { - return response()->json([ - 'redirect' => route('super.users.confirm', ['id' => $id]), - ]); - } - - try { - $this->adminRepository->delete($id); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Admin'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Admin'])); - } + return response()->json(['message' => trans('admin::app.response.last-delete-error', ['name' => 'Admin'])], 400); } - return response()->json(['message' => false], 400); + if (auth()->guard('admin')->user()->id == $id) { + return response()->json([ + 'redirect' => route('super.users.confirm', ['id' => $id]), + ]); + } + + try { + $this->adminRepository->delete($id); + + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Admin'])]); + } catch (\Exception $e) {} + + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Admin'])], 500); } /** diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php index 90b5cc3d5..d4bc5c044 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/CategoryController.php @@ -12,14 +12,14 @@ class CategoryController extends Controller * Category Repository object * * @var \Webkul\Category\Repositories\CategoryRepository - */ + */ protected $categoryRepository; /** * VelocityCategory Repository object * * @var \Webkul\Velocity\Repositories\CategoryRepository - */ + */ protected $velocityCategoryRepository; /** @@ -32,8 +32,7 @@ class CategoryController extends Controller public function __construct( CategoryRepository $categoryRepository, VelocityCategoryRepository $velocityCategoryRepository - ) - { + ) { $this->categoryRepository = $categoryRepository; $this->velocityCategoryRepository = $velocityCategoryRepository; @@ -125,14 +124,10 @@ class CategoryController extends Controller try { $this->velocityCategoryRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category Menu'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Category Menu'])]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Category Menu'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Category Menu'])], 500); } /** @@ -156,4 +151,4 @@ class CategoryController extends Controller return redirect()->route($this->_config['redirect']); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php index 0bb9528b3..b744f723f 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ContentController.php @@ -154,14 +154,10 @@ class ContentController extends Controller try { $this->contentRepository->delete($id); - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Content'])); + return response()->json(['message' => trans('admin::app.response.delete-success', ['name' => 'Content'])]); + } catch (\Exception $e) {} - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Content'])); - } - - return response()->json(['message' => false], 400); + return response()->json(['message' => trans('admin::app.response.delete-failed', ['name' => 'Content'])], 400); } /** diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php index 9fff3219a..ca3a0d0aa 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/CartController.php @@ -52,7 +52,7 @@ class CartController extends Controller ]; } - return response()->json($response, 200); + return response()->json($response); } /** @@ -140,6 +140,6 @@ class CartController extends Controller 'status' => 'danger', 'label' => trans('velocity::app.shop.general.alert.error'), 'message' => trans('velocity::app.error.something_went_wrong'), - ], 200); + ]); } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ComparisonController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ComparisonController.php index d1639f303..8a2a51025 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ComparisonController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ComparisonController.php @@ -94,13 +94,13 @@ class ComparisonController extends Controller 'status' => 'success', 'message' => trans('velocity::app.customer.compare.added'), 'label' => trans('velocity::app.shop.general.alert.success'), - ], 201); + ]); } else { return response()->json([ 'status' => 'success', 'label' => trans('velocity::app.shop.general.alert.success'), 'message' => trans('velocity::app.customer.compare.already_added'), - ], 200); + ]); } }