From 575469ca3db9fa2cce4583cc1801d87c589da2b1 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Wed, 1 Mar 2023 09:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E5=AE=A2=E7=BB=93?= =?UTF-8?q?=E8=B4=A6=E5=9C=B0=E5=9D=80=E4=B8=A2=E5=A4=B1=E5=9B=BD=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- beike/Repositories/OrderRepo.php | 13 +++++++++---- resources/lang/de/category.php | 2 +- resources/lang/en/category.php | 2 +- resources/lang/es/category.php | 2 +- resources/lang/fr/category.php | 2 +- resources/lang/it/category.php | 2 +- resources/lang/ja/category.php | 2 +- resources/lang/ru/category.php | 2 +- resources/lang/zh_cn/category.php | 2 +- resources/lang/zh_hk/category.php | 2 +- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index def7097c..ef0dcb8c 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -181,6 +181,11 @@ class OrderRepo $shippingAddress = Address::query()->findOrFail($shippingAddressId); $paymentAddress = Address::query()->findOrFail($paymentAddressId); + + $shippingAddress->country = $shippingAddress->country->name ?? ''; + $shippingAddress->country_id = $shippingAddress->country->id ?? 0; + $paymentAddress->country = $paymentAddress->country->name ?? ''; + $paymentAddress->country_id = $paymentAddress->country->id ?? 0; } else { $shippingAddress = (Object) ($current['guest_shipping_address'] ?? []); $paymentAddress = (Object) ($current['guest_payment_address'] ?? []); @@ -215,8 +220,8 @@ class OrderRepo 'shipping_customer_name' => $shippingAddress->name, 'shipping_calling_code' => $shippingAddress->calling_code ?? 0, 'shipping_telephone' => $shippingAddress->phone ?? '', - 'shipping_country' => $shippingAddress->country->name ?? '', - 'shipping_country_id' => $shippingAddress->country->id ?? 0, + 'shipping_country' => $shippingAddress->country ?? '', + 'shipping_country_id' => $shippingAddress->country_id ?? 0, 'shipping_zone' => $shippingAddress->zone, 'shipping_zone_id' => $shippingAddress->zone_id ?? 0, 'shipping_city' => $shippingAddress->city, @@ -228,8 +233,8 @@ class OrderRepo 'payment_customer_name' => $paymentAddress->name, 'payment_calling_code' => $paymentAddress->calling_code ?? 0, 'payment_telephone' => $paymentAddress->phone ?? '', - 'payment_country' => $paymentAddress->country->name ?? '', - 'payment_country_id' => $paymentAddress->country->id ?? 0, + 'payment_country' => $paymentAddress->country ?? '', + 'payment_country_id' => $paymentAddress->country_id ?? 0, 'payment_zone' => $paymentAddress->zone, 'payment_zone_id' => $paymentAddress->zone_id ?? 0, 'payment_city' => $paymentAddress->city, diff --git a/resources/lang/de/category.php b/resources/lang/de/category.php index fdad2183..ebcd9a37 100644 --- a/resources/lang/de/category.php +++ b/resources/lang/de/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'Kategoriename', + 'name' => 'Kategoriename', 'children' => 'Subcategory', ]; diff --git a/resources/lang/en/category.php b/resources/lang/en/category.php index e74ae5a0..cf56dfcf 100644 --- a/resources/lang/en/category.php +++ b/resources/lang/en/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'Name', + 'name' => 'Name', 'children' => 'Subcategory', ]; diff --git a/resources/lang/es/category.php b/resources/lang/es/category.php index 61f55dda..c0a49fe3 100644 --- a/resources/lang/es/category.php +++ b/resources/lang/es/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'nombre de la categoría', + 'name' => 'nombre de la categoría', 'children' => 'Subcategory', ]; diff --git a/resources/lang/fr/category.php b/resources/lang/fr/category.php index 463ab1cb..198ff3ca 100644 --- a/resources/lang/fr/category.php +++ b/resources/lang/fr/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'Nom de catégorie', + 'name' => 'Nom de catégorie', 'children' => 'Subcategory', ]; diff --git a/resources/lang/it/category.php b/resources/lang/it/category.php index 5207b37a..229f0535 100644 --- a/resources/lang/it/category.php +++ b/resources/lang/it/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'Nome della categoria', + 'name' => 'Nome della categoria', 'children' => 'Subcategory', ]; diff --git a/resources/lang/ja/category.php b/resources/lang/ja/category.php index 11d2c558..d770fc27 100644 --- a/resources/lang/ja/category.php +++ b/resources/lang/ja/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => '種別名', + 'name' => '種別名', 'children' => 'サブカテゴリ', ]; diff --git a/resources/lang/ru/category.php b/resources/lang/ru/category.php index e9031872..85a9ddbd 100644 --- a/resources/lang/ru/category.php +++ b/resources/lang/ru/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => 'Название категории', + 'name' => 'Название категории', 'children' => 'Subcategory', ]; diff --git a/resources/lang/zh_cn/category.php b/resources/lang/zh_cn/category.php index ea6ca806..04a10da7 100644 --- a/resources/lang/zh_cn/category.php +++ b/resources/lang/zh_cn/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => '分类名称', + 'name' => '分类名称', 'children' => '子分类', ]; diff --git a/resources/lang/zh_hk/category.php b/resources/lang/zh_hk/category.php index e77515fd..77c36fcd 100644 --- a/resources/lang/zh_hk/category.php +++ b/resources/lang/zh_hk/category.php @@ -10,6 +10,6 @@ */ return [ - 'name' => '分類名稱', + 'name' => '分類名稱', 'children' => '子分類', ];