From d0fea5ec2d2954426dde7e0e0eec3c8d8b3a0ba4 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 26 Aug 2022 10:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Http/Resources/OrderSimple.php    |  3 ++-
 beike/Models/Order.php                        |  7 +++++-
 .../admin/views/pages/orders/form.blade.php   |  2 +-
 .../admin/views/pages/orders/index.blade.php  |  2 +-
 resources/lang/en/admin/order.php             |  5 ----
 resources/lang/en/order.php                   |  5 ++++
 resources/lang/zh_cn/admin/order.php          |  5 ----
 resources/lang/zh_cn/order.php                |  5 ++++
 themes/default/account/account.blade.php      | 24 +------------------
 9 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/beike/Admin/Http/Resources/OrderSimple.php b/beike/Admin/Http/Resources/OrderSimple.php
index f83d4fae..e442d4ef 100644
--- a/beike/Admin/Http/Resources/OrderSimple.php
+++ b/beike/Admin/Http/Resources/OrderSimple.php
@@ -25,7 +25,8 @@ class OrderSimple extends JsonResource
             'telephone' => $this->telephone,
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
-            'status' => trans("admin/order.{$this->status}"),
+            'status' => $this->status,
+            'status_format' => $this->status_format,
         ];
 
         return $data;
diff --git a/beike/Models/Order.php b/beike/Models/Order.php
index 075c4dc2..f0ecefc2 100644
--- a/beike/Models/Order.php
+++ b/beike/Models/Order.php
@@ -25,7 +25,7 @@ class Order extends Base
         'payment_address_1', 'payment_address_2',
     ];
 
-    protected $appends = ['total_format'];
+    protected $appends = ['status_format', 'total_format'];
 
     public function orderProducts(): HasMany
     {
@@ -42,6 +42,11 @@ class Order extends Base
         return $this->hasMany(OrderHistory::class);
     }
 
+    public function getStatusFormatAttribute()
+    {
+        return trans('order.' . $this->status);
+    }
+
     public function getTotalFormatAttribute()
     {
         return currency_format($this->total);
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 0a10adfc..4e8eb5e4 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -85,7 +85,7 @@
     <div class="card-body" id="app">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="当前状态">
-          {{ __('admin/order.' . $order->status) }}
+          {{ $order->status_format }}
         </el-form-item>
         <el-form-item label="修改状态" prop="status">
           <el-select size="small" v-model="form.status" placeholder="请选择">
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index 5f120a76..c8b3c5de 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -61,7 +61,7 @@
               <td>{{ $order->number }}</td>
               <td>{{ $order->customer_name }}</td>
               <td>{{ $order->payment_method_name }}</td>
-              <td>{{ $order->status }}</td>
+              <td>{{ $order->status_format }}</td>
               <td>{{ $order->total_format }}</td>
               <td>{{ $order->created_at }}</td>
               <td>{{ $order->updated_at }}</td>
diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php
index b27582f6..92cfbc82 100644
--- a/resources/lang/en/admin/order.php
+++ b/resources/lang/en/admin/order.php
@@ -19,9 +19,4 @@ return [
     'orders_update' => 'Update',
     'orders_delete' => 'Delete',
     'orders_update_status' => 'Update Status',
-
-    'unpaid' => 'Unpaid',
-    'paid' => 'Paid',
-    'shipped' => 'Shipped',
-    'completed' => 'Completed',
 ];
diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php
index 6c43783b..fa97a42f 100644
--- a/resources/lang/en/order.php
+++ b/resources/lang/en/order.php
@@ -20,4 +20,9 @@ return [
     'updated_at' => 'Updated',
     'status' => 'Status',
     'total' => 'Total',
+
+    'unpaid' => 'Unpaid',
+    'paid' => 'Paid',
+    'shipped' => 'Shipped',
+    'completed' => 'Completed',
 ];
diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php
index b2e9fab7..87abb200 100644
--- a/resources/lang/zh_cn/admin/order.php
+++ b/resources/lang/zh_cn/admin/order.php
@@ -19,9 +19,4 @@ return [
     'orders_update' => '更新订单',
     'orders_delete' => '删除订单',
     'orders_update_status' => '更新状态',
-
-    'unpaid' => '待支付',
-    'paid' => '已支付',
-    'shipped' => '已发货',
-    'completed' => '已完成',
 ];
diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php
index 5e88da8b..d8b4ef60 100644
--- a/resources/lang/zh_cn/order.php
+++ b/resources/lang/zh_cn/order.php
@@ -20,4 +20,9 @@ return [
     'updated_at' => '更新时间',
     'status' => '状态',
     'total' => '订单总额',
+
+    'unpaid' => '待支付',
+    'paid' => '已支付',
+    'shipped' => '已发货',
+    'completed' => '已完成',
 ];
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 09b19557..5b36b898 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -76,7 +76,7 @@
                           <div class="text-muted">{{ __('shop/account.order_time') }}：{{ $order->created_at }}</div>
                         </td>
                         <td>
-                          <span class="ms-4 d-inline-block">{{ __('shop/account.state') }}：{{ $order->status }}</span>
+                          <span class="ms-4 d-inline-block">{{ __('shop/account.state') }}：{{ $order->status_format }}</span>
                         </td>
                         <td>
                           <span class="ms-3 d-inline-block">{{ __('shop/account.amount') }}：{{ $order->total_format }}</span>
@@ -90,28 +90,6 @@
                       @endforeach
                     </tbody>
                   </table>
-                  {{-- @foreach ($latest_orders as $order)
-                    <div class="d-flex justify-content-between align-items-center mb-3">
-                      <div class="d-flex align-items-center">
-                        <div class="img me-3 border wh-70">
-                          @foreach ($order->orderProducts as $product)
-                          <img src="{{ $product->image }}" class="img-fluid">
-                          @endforeach
-                        </div>
-                        <div>
-                          <div class="order-number mb-2">
-                            <span class="wp-200 d-inline-block">订单号：{{ $order->number }}</span>
-                            <span class="wp-200 ms-4 d-inline-block">状态：{{ $order->status }}</span>
-                            <span class=" ms-3 d-inline-block">金额：{{ $order->total }}</span>
-                          </div>
-                          <div class="order-created text-muted">下单时间：{{ $order->created_at }}</div>
-                        </div>
-                      </div>
-
-                      <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}"
-                        class="btn btn-outline-secondary btn-sm">查看详情</a>
-                    </div>
-                  @endforeach --}}
                 </ul>
               @endif
             </div>