wip

kristi11 · Nov 16, 2024 · cd313c6 · cd313c6
1 parent b177fe5
commit cd313c6
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 171 deletions.
diff --git a/README.md b/README.md
@@ -465,6 +465,7 @@ The following are the known issues that need addressing and i hope that the comm
 * Cart items don't get sent from `session id` to `user_id` if the user was logged out when placing the order but after filling out the cart logs in/registers for an account to continue with the order.
 
 * I've to fix the route to redirect to filament login page instead of a default laravel page when user is not logged in.
+* There's a bug where `panel_user` role is not assigned to customers in production server. Everything works as intended in local server
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -161,23 +161,33 @@ public function orders(): HasMany
     /**
      * @throws Exception
      */
+//    public function canAccessPanel(Panel $panel): bool
+//    {
+//        // Check the panel ID to determine access rules
+//        if ($panel->getId() === 'admin') {
+//            // Only super admins can access the 'admin' panel
+//            return $this->hasRole('super_admin');
+//        } elseif ($panel->getId() === 'team') {
+//            // Allow access to the 'customer' panel for customers
+//            return $this->hasRole('team_user');
+//        } elseif // Check the panel ID to determine access rules
+//        ($panel->getId() === 'customer') {
+//            // Allow access to the 'customer' panel for customers
+//            return $this->hasRole('panel_user');
+//        } else {
+//            // Deny access to all other panels
+//            return false;
+//        }
+//    }
+
     public function canAccessPanel(Panel $panel): bool
     {
-        // Check the panel ID to determine access rules
-        if ($panel->getId() === 'admin') {
-            // Only super admins can access the 'admin' panel
-            return $this->hasRole('super_admin');
-        } elseif ($panel->getId() === 'team') {
-            // Allow access to the 'customer' panel for customers
-            return $this->hasRole('team_user');
-        } elseif // Check the panel ID to determine access rules
-        ($panel->getId() === 'customer') {
-            // Allow access to the 'customer' panel for customers
-            return $this->hasRole('panel_user');
-        } else {
-            // Deny access to all other panels
-            return false;
-        }
+        return match ($panel->getId()) {
+            'admin' => $this->hasRole('super_admin'),
+            'team' => $this->hasRole('team_user'),
+//            'customer' => $this->hasRole('panel_user'),
+            default => true,
+        };
     }
 
     public function canComment(): bool

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -54,14 +54,14 @@ public function boot(): void
         Model::unguard();
 
         Cashier::calculateTaxes();
-        Fortify::authenticateUsing(function (Request $request) {
-            $user = User::where('email', $request->email)->first();
-
-            if ($user && Hash::check($request->password, $user->password)) {
-                (new MigrateSessionCart)->migrate(CartFactory::make(), $user?->cart ?: $user->cart()->create());
-                return $user;
-            }
-        });
+//        Fortify::authenticateUsing(function (Request $request) {
+//            $user = User::where('email', $request->email)->first();
+//
+//            if ($user && Hash::check($request->password, $user->password)) {
+//                (new MigrateSessionCart)->migrate(CartFactory::make(), $user?->cart ?: $user->cart()->create());
+//                return $user;
+//            }
+//        });
 
         Gallery::observe(GalleryObserver::class);
         Appointment::observe(AppointmentObserver::class);