后台会员地址

beike/Admin/Http/Controllers/AddressController.php

@@ -11,18 +11,17 @@
 
 namespace Beike\Admin\Http\Controllers;
 
-use Beike\Admin\Http\Resources\CustomerResource;
+use Beike\Admin\Http\Resources\AddressResource;
 use Beike\Repositories\AddressRepo;
 use Illuminate\Http\Request;
 
 class AddressController extends Controller
 {
-    protected string $defaultRoute = 'addresses.index';
     public function index(Request $request, int $customerId)
     {
         $addresses = AddressRepo::listByCustomer($customerId);
         $data = [
-            'addresses' => CustomerResource::collection($addresses),
+            'addresses' => AddressResource::collection($addresses),
         ];
 
         return $data;

beike/Admin/Http/Controllers/CustomerController.php

@@ -12,6 +12,7 @@
 namespace Beike\Admin\Http\Controllers;
 
 use Beike\Admin\Http\Requests\CustomerRequest;
+use Beike\Admin\Http\Resources\AddressResource;
 use Beike\Admin\Http\Resources\CustomerResource;
 use Beike\Admin\Services\CustomerService;
 use Beike\Models\Customer;
@@ -50,7 +51,7 @@ class CustomerController extends Controller
         $data = [
             'customer' => $customer,
             'customer_groups' => CustomerGroupRepo::list(),
-            'addresses' => CustomerResource::collection($addresses),
+            'addresses' => AddressResource::collection($addresses),
             'countries' => CountryRepo::all(),
             'country_id' => setting('country_id'),
             '_redirect' => $this->getRedirect(),

beike/Admin/Http/Resources/AddressResource.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Beike\Admin\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class AddressResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        $data = [
+            'name' => $this->name,
+            'phone' => $this->phone,
+            'country_id' => $this->country_id,
+            'country' => $this->country->name,
+            'zone_id' => $this->zone_id,
+            'zone' => $this->zone,
+            'city' => $this->city,
+            'zipcode' => $this->zipcode,
+            'address_1' => $this->address_1,
+            'address_2' => $this->address_2,
+        ];
+
+        return $data;
+    }
+}

beike/Models/Address.php

@@ -13,11 +13,22 @@ namespace Beike\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Address extends Model
 {
     use HasFactory;
 
     protected $fillable = ['customer_id', 'name', 'phone', 'country_id', 'state_id', 'state', 'city_id', 'city', 'zipcode', 'address_1', 'address_2'];
+
+    public function country(): BelongsTo
+    {
+        return $this->belongsTo(Country::class);
+    }
+
+    public function zone(): BelongsTo
+    {
+        return $this->belongsTo(Zone::class);
+    }
 }
 

beike/Repositories/AddressRepo.php

@@ -68,7 +68,7 @@ class AddressRepo
             $customer = CustomerRepo::find($customer);
         }
         if ($customer) {
-            return $customer->addresses;
+            return $customer->addresses()->with('country')->get();
         }
     }
 }