From 15f69a283f2f0f065957b411216267d33d3ea573 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Wed, 29 Jun 2022 16:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=A7=BB=E5=8A=A8=E5=88=B0ac?=
 =?UTF-8?q?count=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/account/AccountController.php    |  2 +-
 .../Controllers/account/AddressController.php    | 16 ++++++++--------
 .../Http/Controllers/account/LoginController.php |  2 +-
 themes/default/{ => account}/account.blade.php   |  0
 themes/default/{ => account}/login.blade.php     |  0
 themes/default/{ => account}/register.blade.php  |  0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename themes/default/{ => account}/account.blade.php (100%)
 rename themes/default/{ => account}/login.blade.php (100%)
 rename themes/default/{ => account}/register.blade.php (100%)

diff --git a/beike/Shop/Http/Controllers/account/AccountController.php b/beike/Shop/Http/Controllers/account/AccountController.php
index 7d9ab751..e47506bb 100644
--- a/beike/Shop/Http/Controllers/account/AccountController.php
+++ b/beike/Shop/Http/Controllers/account/AccountController.php
@@ -21,7 +21,7 @@ class AccountController extends Controller
     public function index()
     {
         $data = auth(Customer::AUTH_GUARD)->user()->toArray();
-        return view('account', $data);
+        return view('account/account', $data);
     }
 
 }
diff --git a/beike/Shop/Http/Controllers/account/AddressController.php b/beike/Shop/Http/Controllers/account/AddressController.php
index 5770d442..b9c7772e 100644
--- a/beike/Shop/Http/Controllers/account/AddressController.php
+++ b/beike/Shop/Http/Controllers/account/AddressController.php
@@ -11,6 +11,7 @@
 
 namespace Beike\Shop\Http\Controllers\Account;
 
+use Beike\Shop\Http\Controllers\Controller;
 use Beike\Shop\Http\Resources\CustomerResource;
 use Beike\Repositories\AddressRepo;
 use Beike\Repositories\CustomerRepo;
@@ -18,10 +19,9 @@ use Illuminate\Http\Request;
 
 class AddressController extends Controller
 {
-    protected string $defaultRoute = 'addresses.index';
-    public function index(Request $request, int $customerId)
+    public function index(Request $request)
     {
-        $addresses = AddressRepo::listByCustomer($customerId);
+        $addresses = AddressRepo::listByCustomer(current_customer());
         $data = [
             'addresses' => CustomerResource::collection($addresses),
         ];
@@ -29,21 +29,21 @@ class AddressController extends Controller
         return $data;
     }
 
-    public function store(Request $request, int $customerId)
+    public function store(Request $request)
     {
         $data = $request->only(['name', 'phone', 'country_id', 'state_id', 'state', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']);
-        $data['customer_id'] = $customerId;
+        $data['customer_id'] = current_customer()->customer_id;
         return AddressRepo::create($data);
     }
 
-    public function update(Request $request, int $customerId, int $addressId)
+    public function update(Request $request, int $addressId)
     {
         return AddressRepo::update($addressId, $request->only(['name', 'phone', 'country_id', 'state_id', 'state', 'city_id', 'city', 'zipcode', 'address_1', 'address_2']));
     }
 
-    public function destroy(Request $request, int $customerId)
+    public function destroy(Request $request, int $addressId)
     {
-        CustomerRepo::delete($customerId);
+        AddressRepo::delete($addressId);
 
         return ['success' => true];
     }
diff --git a/beike/Shop/Http/Controllers/account/LoginController.php b/beike/Shop/Http/Controllers/account/LoginController.php
index e0ab353b..39513b11 100644
--- a/beike/Shop/Http/Controllers/account/LoginController.php
+++ b/beike/Shop/Http/Controllers/account/LoginController.php
@@ -24,7 +24,7 @@ class LoginController extends Controller
 {
     public function index()
     {
-        return view('login');
+        return view('account/login');
     }
 
     public function store(LoginRequest $request)
diff --git a/themes/default/account.blade.php b/themes/default/account/account.blade.php
similarity index 100%
rename from themes/default/account.blade.php
rename to themes/default/account/account.blade.php
diff --git a/themes/default/login.blade.php b/themes/default/account/login.blade.php
similarity index 100%
rename from themes/default/login.blade.php
rename to themes/default/account/login.blade.php
diff --git a/themes/default/register.blade.php b/themes/default/account/register.blade.php
similarity index 100%
rename from themes/default/register.blade.php
rename to themes/default/account/register.blade.php