From 9ee28acf64068bfd7896643f593ce3419a172b78 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Fri, 24 Mar 2023 12:59:35 +0800 Subject: [PATCH] fixed country list --- beike/Shop/Http/Controllers/Account/AddressController.php | 2 +- beike/Shop/Services/CheckoutService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/beike/Shop/Http/Controllers/Account/AddressController.php b/beike/Shop/Http/Controllers/Account/AddressController.php index f9236420..2a9e22a1 100644 --- a/beike/Shop/Http/Controllers/Account/AddressController.php +++ b/beike/Shop/Http/Controllers/Account/AddressController.php @@ -25,7 +25,7 @@ class AddressController extends Controller { $addresses = AddressRepo::listByCustomer(current_customer()); $data = [ - 'countries' => CountryRepo::all(), + 'countries' => CountryRepo::listEnabled(), 'addresses' => AddressResource::collection($addresses), ]; diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php index 24ef1047..71ccfdd1 100644 --- a/beike/Shop/Services/CheckoutService.php +++ b/beike/Shop/Services/CheckoutService.php @@ -248,7 +248,7 @@ class CheckoutService ], 'country_id' => (int) system_setting('base.country_id'), 'customer_id' => $customer->id ?? null, - 'countries' => CountryRepo::all(), + 'countries' => CountryRepo::listEnabled(), 'addresses' => AddressResource::collection($addresses), 'shipping_methods' => $shipments, 'payment_methods' => $payments,