From 106471ea2e1eb83fa2494730d73d0e84cea5e958 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 25 Aug 2022 16:51:18 +0800
Subject: [PATCH] fixed customer guard
 https://guangdagit.com/beike/beikeshop/issues/195

---
 beike/Models/Product.php                     | 4 +++-
 beike/Shop/Providers/ShopServiceProvider.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/beike/Models/Product.php b/beike/Models/Product.php
index 5cdc4201..146abd34 100644
--- a/beike/Models/Product.php
+++ b/beike/Models/Product.php
@@ -56,7 +56,9 @@ class Product extends Base
 
     public function inCurrentWishlist()
     {
-        return $this->hasOne(CustomerWishlist::class)->where('customer_id', current_customer() ? current_customer()->id : 0);
+        $customer = current_customer();
+        $customerId = $customer ? $customer->id : 0;
+        return $this->hasOne(CustomerWishlist::class)->where('customer_id', $customerId);
     }
 
     public function getUrlAttribute()
diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index fe94a284..8ede2fc1 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -39,6 +39,7 @@ class ShopServiceProvider extends ServiceProvider
         $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php');
 
         load_settings();
+        $this->registerGuard();
 
         if (Str::startsWith($uri, '/admin')) {
             return;
@@ -50,7 +51,6 @@ class ShopServiceProvider extends ServiceProvider
         ]);
 
         $this->mergeConfigFrom(__DIR__ . '/../../Config/beike.php', 'beike');
-        $this->registerGuard();
         $this->loadThemeViewPath();
         $this->loadComponents();
     }