wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复游客结账地址丢失国家

This commit is contained in:
Edward Yang 2023-03-01 09:48:22 +08:00
parent 532057689b
commit 575469ca3d
10 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
beike/Repositories/OrderRepo.php
View File

@ -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,

2
resources/lang/de/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'Kategoriename',
'name' => 'Kategoriename',
'children' => 'Subcategory',
];

2
resources/lang/en/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'Name',
'name' => 'Name',
'children' => 'Subcategory',
];

2
resources/lang/es/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'nombre de la categoría',
'name' => 'nombre de la categoría',
'children' => 'Subcategory',
];

2
resources/lang/fr/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'Nom de catégorie',
'name' => 'Nom de catégorie',
'children' => 'Subcategory',
];

2
resources/lang/it/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'Nome della categoria',
'name' => 'Nome della categoria',
'children' => 'Subcategory',
];

2
resources/lang/ja/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => '種別名',
'name' => '種別名',
'children' => 'サブカテゴリ',
];

2
resources/lang/ru/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => 'Название категории',
'name' => 'Название категории',
'children' => 'Subcategory',
];

2
resources/lang/zh_cn/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => '分类名称',
'name' => '分类名称',
'children' => '子分类',
];

2
resources/lang/zh_hk/category.php
View File

@ -10,6 +10,6 @@
*/
return [
'name' => '分類名稱',
'name' => '分類名稱',
'children' => '子分類',
];