From b1393a272075c7cef610f94b2730b170edc70354 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Mon, 22 Aug 2022 17:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/en/common.php                | 7 +++++++
 resources/lang/zh_cn/common.php             | 7 +++++++
 themes/default/account/order_info.blade.php | 4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 1e493077..5f455838 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -28,4 +28,11 @@ return [
     'yes' => 'yes',
     'delete' => 'delete',
     'sign_out' => 'Sign Out',
+
+    'order' => [
+        'unpaid' => 'Unpaid',
+        'paid' => 'Paid',
+        'shipped' => 'Shipped',
+        'completed' => 'Completed',
+    ]
 ];
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index a65e50f2..004df3a8 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -27,6 +27,13 @@ return [
     'yes' => '是',
     'delete' => '删除',
     'sign_out' => '退出登录',
+
+    'order' => [
+        'unpaid' => '待支付',
+        'paid' => '已支付',
+        'shipped' => '已发货',
+        'completed' => '已完成',
+    ]
 ];
 
 
diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index c01817f2..b97111e5 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -40,9 +40,9 @@
                     <td>{{ $order->number }}</td>
                     <td>{{ $order->created_at }}</td>
                     <td>
-                      {{ $order->status }}
+                      {{ __("common.order.{$order->status}") }}
                     </td>
-                    <td>{{ $order->total }}</td>
+                    <td>{{ currency_format($order->total) }}</td>
                   </tr>
                 </tbody>
               </table>