Changed responses for all backend destroy functions and removed dead commented code

app/Providers/RouteServiceProvider.php

@@ -23,8 +23,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // dd(Route::pattern('*', '[a-z]+'));
-
         parent::boot();
     }
 

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/admin.js": "/js/admin.js?id=9156ebc933814e4694f0",
+    "/js/admin.js": "/js/admin.js?id=8924cabe48e17f2a3ba3",
     "/css/admin.css": "/css/admin.css?id=a71a72c31d6ac0fe375f"
 }

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php

@@ -175,15 +175,15 @@ class CustomerController extends Controller
         $customer = $this->customer->findorFail($id);
 
         try {
-            $customer->delete();
+            $this->customer->delete($id);
 
             session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch(\Exception $e) {
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php

@@ -135,16 +135,16 @@ class CustomerGroupController extends Controller
             session()->flash('warning', trans('admin::app.response.customer-associate', ['name' => 'Customer Group']));
         } else {
             try {
-                $customerGroup->delete($id);
+                $this->customerGroup->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Customer Group']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Admin/webpack.mix.js

@@ -12,7 +12,7 @@ mix.disableNotifications();
 
 mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/admin.js")
     .copyDirectory( __dirname + '/src/Resources/assets/images', publicPath + '/images')
-    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/admin.css")
+    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/admin.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php

@@ -139,13 +139,13 @@ class AttributeController extends Controller
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Attribute']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Attribute']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php

@@ -141,17 +141,17 @@ class AttributeFamilyController extends Controller
             session()->flash('error', trans('admin::app.response.attribute-product-error', ['name' => 'Attribute family']));
         } else {
             try {
-                $attributeFamily->delete($id);
+                $this->attributeFamily->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Family']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch (\Exception $e) {
                 session()->flash('error', trans( 'admin::app.response.delete-failed', ['name' => 'Family']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Category/src/Http/Controllers/CategoryController.php

@@ -157,19 +157,19 @@ class CategoryController extends Controller
             try {
                 Event:: fire('catalog.category.delete.before', $id);
 
-                $category->delete($id);
+                $this->category->delete($id);
 
                 Event::fire('catalog.category.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Category']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Core/src/Http/Controllers/ChannelController.php

@@ -154,19 +154,19 @@ class ChannelController extends Controller
             try {
                 Event::fire('core.channel.delete.before', $id);
 
-                $channel->delete($id);
+                $this->channel->delete($id);
 
                 Event::fire('core.channel.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Channel']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 // session()->flash('warning', trans($e->getMessage()));
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Channel']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Core/src/Http/Controllers/CurrencyController.php

@@ -140,19 +140,19 @@ class CurrencyController extends Controller
             try {
                 Event::fire('core.currency.delete.before', $id);
 
-                $currency->delete();
+                $this->currency->delete($id);
 
                 Event::fire('core.currency.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Currency']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch (\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Currency']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php

@@ -155,18 +155,18 @@ class ExchangeRateController extends Controller
             try {
                 Event::fire('core.exchange_rate.delete.before', $id);
 
-                $exchangeRate->delete();
+                $this->exchangeRate->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Exchange rate']));
 
                 Event::fire('core.exchange_rate.delete.after', $id);
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch (\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-error', ['name' => 'Exchange rate']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Core/src/Http/Controllers/LocaleController.php

@@ -140,18 +140,18 @@ class LocaleController extends Controller
             try {
                 Event::fire('core.locale.delete.before', $id);
 
-                $locale->delete();
+                $this->locale->delete($id);
 
                 Event::fire('core.locale.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Locale']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Locale']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Core/src/Http/Controllers/SliderController.php

@@ -139,16 +139,16 @@ class SliderController extends Controller
             session()->flash('warning', trans('admin::app.settings.sliders.delete-success'));
         } else {
             try {
-                $slider->delete();
+                $this->slider->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Slider']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Slider']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Core/src/Http/Controllers/SubscriptionController.php

@@ -91,15 +91,15 @@ class SubscriptionController extends Controller
         $subscriber = $this->subscribers->findOrFail($id);
 
         try {
-            $subscriber->delete();
+            $this->subscriber->delete($id);
 
             session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Subscriber']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch (\Exception $e) {
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Subscriber']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php

@@ -163,18 +163,18 @@ class InventorySourceController extends Controller
             try {
                 Event::fire('inventory.inventory_source.delete.before', $id);
 
-                $inventorySource->delete();
+                $this->inventorySource->delete($id);
 
                 Event::fire('inventory.inventory_source.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Inventory source']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch (\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Inventory source']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Product/src/Http/Controllers/ProductController.php

@@ -205,16 +205,16 @@ class ProductController extends Controller
         $product = $this->product->findOrFail($id);
 
         try {
-            $product->delete();
+            $this->product->delete($id);
 
             session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Product']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch (\Exception $e) {
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Product']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Product/src/Http/Controllers/ReviewController.php

@@ -110,18 +110,18 @@ class ReviewController extends Controller
         try {
             Event::fire('customer.review.delete.before', $id);
 
-            $productReview->delete();
+            $this->productReview->delete($id);
 
             Event::fire('customer.review.delete.after', $id);
 
             session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Review']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch (\Exception $e) {
             session()->flash('success', trans('admin::app.response.delete-failed', ['name' => 'Review']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Shop/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/shop.js": "/js/shop.js?id=7019dbe8734e305c1885",
+    "/js/shop.js": "/js/shop.js?id=5ade52a585b66593b58a",
-    "/css/shop.css": "/css/shop.css?id=068329de73da5012af0d"
+    "/css/shop.css": "/css/shop.css?id=cfe2988431c8f8841d4b"
 }

packages/Webkul/Shop/webpack.mix.js

@@ -12,7 +12,7 @@ mix.disableNotifications();
 
 mix.js([__dirname + "/src/Resources/assets/js/app.js"], "js/shop.js")
     .copyDirectory(__dirname + "/src/Resources/assets/images", publicPath + "/images")
-    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/shop.css")
+    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/shop.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php

@@ -178,17 +178,17 @@ class TaxCategoryController extends Controller
         try {
             Event::fire('tax.tax_category.delete.before', $id);
 
-            $taxCategory->delete($id);
+            $this->taxCategory->delete($id);
 
             Event::fire('tax.tax_category.delete.after', $id);
 
             session()->flash('success', trans('admin::app.response.delete-failed', ['name' => 'Tax Category']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch(Exception $e) {
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Tax Category']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php

@@ -161,18 +161,18 @@ class TaxRateController extends Controller
         try {
             Event::fire('tax.tax_rate.delete.before', $id);
 
-            $taxRate->delete($id);
+            $this->taxRate->delete($id);
 
             Event::fire('tax.tax_rate.delete.after', $id);
 
             session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Tax Rate']));
 
-            return 'true';
+            return response()->json(['message' => true], 200);
         } catch(\Exception $e) {
             session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Tax Rate']));
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**

packages/Webkul/Ui/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/ui.js": "/js/ui.js?id=15e57b2241e111fc53cf",
+    "/js/ui.js": "/js/ui.js?id=b85ae4fe9fe1f4e140fd",
-    "/css/ui.css": "/css/ui.css?id=4182d1885ef5a460a94d"
+    "/css/ui.css": "/css/ui.css?id=ebd8e367e702a3376353"
 }

packages/Webkul/Ui/webpack.mix.js

@@ -20,7 +20,7 @@ mix.js(
     "js/ui.js"
 )
     .copy(__dirname + "/src/Resources/assets/images", publicPath + "/images")
-    .sass(__dirname + "/src/Resources/assets/scss/app.scss", "css/ui.css")
+    .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/ui.css")
     .options({
         processCssUrls: false
     });

packages/Webkul/User/src/Http/Controllers/RoleController.php

@@ -144,18 +144,18 @@ class RoleController extends Controller
             try {
                 Event::fire('user.role.delete.before', $id);
 
-                $role->delete($id);
+                $this->role->delete($id);
 
                 Event::fire('user.role.delete.after', $id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Role']));
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Role']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 }

packages/Webkul/User/src/Http/Controllers/UserController.php

@@ -171,19 +171,19 @@ class UserController extends Controller
             }
 
             try {
-                $user->delete();
+                $this->user->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Admin']));
 
                 Event::fire('user.admin.delete.after', $id);
 
-                return 'true';
+                return response()->json(['message' => true], 200);
             } catch (\Exception $e) {
                 session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Admin']));
             }
         }
 
-        return 'false';
+        return response()->json(['message' => false], 400);
     }
 
     /**