Delete & Restore FIXED

Author: mohsin-shaikh

app/Http/Controllers/UsersController.php

@@ -81,9 +81,9 @@ public function edit(User $user)
 
     public function update(User $user)
     {
-        if (App::environment('demo') && $user->isDemoUser()) {
-            return Redirect::back()->with('error', 'Updating the demo user is not allowed.');
-        }
+        // if (App::environment('demo') && $user->isDemoUser()) {
+        //     return Redirect::back()->with('error', 'Updating the demo user is not allowed.');
+        // }
 
         Request::validate([
             // 'first_name' => ['required', 'max:50'],
@@ -110,9 +110,9 @@ public function update(User $user)
 
     public function destroy(User $user)
     {
-        if (App::environment('demo') && $user->isDemoUser()) {
-            return Redirect::back()->with('error', 'Deleting the demo user is not allowed.');
-        }
+        // if (App::environment('demo') && $user->isDemoUser()) {
+        //     return Redirect::back()->with('error', 'Deleting the demo user is not allowed.');
+        // }
 
         $user->delete();
 

app/Models/User.php

@@ -71,6 +71,12 @@ class User extends Authenticatable implements AuthenticatableContract, Authoriza
     ];
 
     // New Code
+    public function resolveRouteBinding($value, $field = null)
+    {
+        return in_array(SoftDeletes::class, class_uses($this))
+            ? $this->where($this->getRouteKeyName(), $value)->withTrashed()->first()
+            : parent::resolveRouteBinding($value);
+    }
 
     public function account()
     {

public/js/app.js

@@ -30983,7 +30983,7 @@ var _hoisted_3 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNod
 
 var _hoisted_4 = /*#__PURE__*/(0,vue__WEBPACK_IMPORTED_MODULE_0__.createElementVNode)("span", {
   "class": "text-indigo-400 font-medium"
-}, "/", -1
+}, " / ", -1
 /* HOISTED */
 );
 

resources/js/Pages/Users/Edit.vue

@@ -7,7 +7,7 @@
                     :href="route('users')"
                     >Users</Link
                 >
-                <span class="text-indigo-400 font-medium">/</span>
+                <span class="text-indigo-400 font-medium"> / </span>
                 {{ form.name }}
             </h1>
             <!-- <img

routes/web.php

@@ -12,6 +12,7 @@
 use App\Http\Controllers\ReportsController;
 use App\Http\Controllers\UsersController;
 
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes