From 60122b82bc9d81566f236de731cc890ffd57a5df Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 29 Aug 2022 17:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/build/beike/shop/default/css/app.css    |  1 +
 .../admin/views/pages/orders/form.blade.php    | 18 ++++++++++--------
 .../admin/views/pages/orders/index.blade.php   |  2 +-
 resources/beike/shop/default/css/header.scss   |  1 +
 resources/lang/en/order.php                    |  1 +
 resources/lang/zh_cn/order.php                 |  1 +
 themes/default/account/account.blade.php       |  2 +-
 themes/default/account/order.blade.php         |  2 +-
 themes/default/account/order_info.blade.php    | 12 ++++++++----
 9 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css
index efad016d..792ca1dd 100644
--- a/public/build/beike/shop/default/css/app.css
+++ b/public/build/beike/shop/default/css/app.css
@@ -606,6 +606,7 @@ header .header-content .right-btn .cart-badge-quantity {
   top: -3px;
   text-align: center;
   font-size: 12px;
+  display: none;
   width: 23px;
   zoom: 0.9;
   height: 23px;
diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 1249d007..75d806fe 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -20,7 +20,7 @@
               </tr>
               <tr>
                 <td>{{ __('order.total') }}：</td>
-                <td>{{ $order->total_format }}</td>
+                <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
               </tr>
             </tbody>
           </table>
@@ -120,9 +120,10 @@
           <tr>
             <th>ID</th>
             <th>{{ __('order.product_name') }}</th>
+            <th class="">{{ __('order.product_sku') }}</th>
             <th>{{ __('order.product_price') }}</th>
-            <th class="text-end">{{ __('order.product_quantity') }}</th>
-            <th class="text-end">{{ __('order.product_sku') }}</th>
+            <th class="">{{ __('order.product_quantity') }}</th>
+            <th class="text-end">{{ __('order.product_sub_price') }}</th>
           </tr>
         </thead>
         <tbody>
@@ -134,17 +135,18 @@
                 <div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid"></div>{{ $product->name }}
               </div>
             </td>
-            <td>{{ $product->price_format }}</td>
-            <td class="text-end">{{ $product->quantity }}</td>
-            <td class="text-end">{{ $product->product_sku }}</td>
+            <td class="">{{ $product->product_sku }}</td>
+            <td>{{ currency_format($product->price, $order->currency_code, $order->currency_value) }}</td>
+            <td class="">{{ $product->quantity }}</td>
+            <td class="text-end">{{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}</td>
           </tr>
           @endforeach
         </tbody>
         <tfoot>
           @foreach ($order->orderTotals as $orderTotal)
             <tr>
-              <td colspan="4" class="text-end">{{ $orderTotal->title }}</td>
-              <td class="text-end"><span class="fw-bold">{{ $orderTotal->value_format }}</span></td>
+              <td colspan="5" class="text-end">{{ $orderTotal->title }}</td>
+              <td class="text-end"><span class="fw-bold">{{ currency_format($orderTotal->value, $order->currency_code, $order->currency_value) }}</span></td>
             </tr>
           @endforeach
         </tfoot>
diff --git a/resources/beike/admin/views/pages/orders/index.blade.php b/resources/beike/admin/views/pages/orders/index.blade.php
index b7c5d347..e0ac9074 100644
--- a/resources/beike/admin/views/pages/orders/index.blade.php
+++ b/resources/beike/admin/views/pages/orders/index.blade.php
@@ -73,7 +73,7 @@
                 <td>{{ sub_string($order->customer_name, 14) }}</td>
                 <td>{{ $order->payment_method_name }}</td>
                 <td>{{ $order->status_format }}</td>
-                <td>{{ $order->total_format }}</td>
+                <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
                 <td>{{ $order->created_at }}</td>
                 <td>{{ $order->updated_at }}</td>
                 <td><a href="{{ admin_route('orders.show', [$order->id]) }}"
diff --git a/resources/beike/shop/default/css/header.scss b/resources/beike/shop/default/css/header.scss
index a6d99179..f0dda6cf 100644
--- a/resources/beike/shop/default/css/header.scss
+++ b/resources/beike/shop/default/css/header.scss
@@ -159,6 +159,7 @@ header {
         top: -3px;
         text-align: center;
         font-size: 12px;
+        display: none;
         width: 23px;
         zoom: 0.9;
         height: 23px;
diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php
index 681c83c0..7ae3b6b6 100644
--- a/resources/lang/en/order.php
+++ b/resources/lang/en/order.php
@@ -26,6 +26,7 @@ return [
     'shipping_address' => 'Shipping Address',
     'payment_address' => 'Payment Address',
     'order_status' => 'Order Status',
+    'product_sub_price' => 'Subtotal',
     'current_status' => 'Current',
     'change_to_status' => 'Change To',
     'comment' => 'Comment',
diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php
index a851bd81..1c003c1b 100644
--- a/resources/lang/zh_cn/order.php
+++ b/resources/lang/zh_cn/order.php
@@ -34,6 +34,7 @@ return [
     'product_info' => '商品信息',
     'product_name' => '名称',
     'product_price' => '价格',
+    'product_sub_price' => '小计',
     'product_quantity' => '数量',
     'product_sku' => 'SKU',
 
diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index 5b36b898..67627c84 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -79,7 +79,7 @@
                           <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>
+                          <span class="ms-3 d-inline-block">{{ __('shop/account.amount') }}：{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</span>
                         </td>
 
                         <td>
diff --git a/themes/default/account/order.blade.php b/themes/default/account/order.blade.php
index 392b350d..f8e708dd 100644
--- a/themes/default/account/order.blade.php
+++ b/themes/default/account/order.blade.php
@@ -49,7 +49,7 @@
                       </div>
                     </td>
                     @if ($loop->first)
-                      <td rowspan="{{ $loop->count }}">{{ currency_format($order->total) }}</td>
+                      <td rowspan="{{ $loop->count }}">{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
                       <td rowspan="{{ $loop->count }}">{{ __("common.order.{$order->status}") }}</td>
                       <td rowspan="{{ $loop->count }}" class="text-end">
                         <a href="{{ shop_route('account.order.show', ['number' => $order->number]) }}" class="btn btn-outline-secondary btn-sm">{{ __('shop/account.order.check') }}</a>
diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index c1423503..ed951d08 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -43,7 +43,7 @@
                     <td>
                       {{ __("common.order.{$order->status}") }}
                     </td>
-                    <td>{{ $order->total_format }}</td>
+                    <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
                   </tr>
                 </tbody>
               </table>
@@ -62,9 +62,13 @@
                   <div class="left"><img src="{{ $product->image }}" class="img-fluid"></div>
                   <div class="right">
                     <div class="name">
-                    <a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a><br>   x {{ $product->quantity }}
+                    <a class="text-dark" href="{{ shop_route('products.show', ['product' => $product->product_id]) }}">{{ $product->name }}</a>
+                    </div>
+                    <div class="price">
+                      {{ currency_format($product->price, $order->currency_code, $order->currency_value) }}
+                      x {{ $product->quantity }}
+                      = {{ currency_format($product->price * $product->quantity, $order->currency_code, $order->currency_value) }}
                     </div>
-                    <div class="price">{{ $product->price_format }}</div>
                   </div>
                 </div>
                 @if ($order->status == 'completed')
@@ -87,7 +91,7 @@
                   <tr>
                     @foreach ($totals as $total)
                       <td class="bg-light wp-200">{{ $total->title }}</td>
-                      <td><strong>{{ $total->value_format }}</strong></td>
+                      <td><strong>{{ currency_format($total->value, $order->currency_code, $order->currency_value) }}</strong></td>
                     @endforeach
                   </tr>
                 @endforeach