!84 调整代码

* Merge branch 'dev' of https://gitee.com/what520/beikeshop into dev
* 增加hook,实现插件中要求的其他订单状态显示
* 调整状态字段的显示字段，与后端的一致
* 增加

beike/Models/Order.php

@@ -68,7 +68,9 @@ class Order extends Base
 
     public function getStatusFormatAttribute()
     {
-        return trans('order.' . $this->status);
+        $status_format = trans('order.' . $this->status);
+        $status_format     = hook_filter('order.status_format', $status_format);
+        return $status_format;
     }
 
     public function getTotalFormatAttribute()

themes/default/account/order.blade.php

@@ -53,7 +53,7 @@
                           @if ($loop->first)
                             <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 }}">{{$order->status_format}}</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>

themes/default/account/order_info.blade.php

@@ -46,7 +46,7 @@
                     <td>{{ $order->number }}</td>
                     <td>{{ $order->created_at }}</td>
                     <td>
-                      {{ __("common.order.{$order->status}") }}
+                      {{$order->status_format}}
                     </td>
                     <td>{{ currency_format($order->total, $order->currency_code, $order->currency_value) }}</td>
                   </tr>