From 2b7b0a901169eb7130bdae4d42d607b57a442365 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Wed, 7 Jun 2023 02:57:07 +0000
Subject: [PATCH] =?UTF-8?q?!119=20add=20ms=20hook=20*=20wip=20*=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20*=20wip=20*=20=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=99=A8=20*=20add=20ms=20hook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Services/FileManagerService.php |  2 +-
 beike/Models/Order.php                      |  6 ++----
 beike/Models/OrderHistory.php               |  5 ++++-
 beike/Repositories/OrderRepo.php            |  2 +-
 themes/default/layout/header.blade.php      | 14 +++++++++-----
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php
index 3270db7c..d93fecf8 100644
--- a/beike/Admin/Services/FileManagerService.php
+++ b/beike/Admin/Services/FileManagerService.php
@@ -87,7 +87,7 @@ class FileManagerService
             if ($baseName == 'index.html') {
                 continue;
             }
-            $fileName = str_replace($this->fileBasePath, '', $file);
+            $fileName = str_replace(public_path('catalog'), '', $file);
             if (is_file($file)) {
                 $images[] = $this->handleImage($fileName, $baseName);
             }
diff --git a/beike/Models/Order.php b/beike/Models/Order.php
index b636a042..7910b577 100644
--- a/beike/Models/Order.php
+++ b/beike/Models/Order.php
@@ -73,10 +73,8 @@ class Order extends Base
 
     public function getStatusFormatAttribute()
     {
-        $status_format     = trans('order.' . $this->status);
-        $status_format     = hook_filter('order.status_format', $status_format);
-
-        return $status_format;
+        $statusMap = array_column(StateMachineService::getAllStatuses(), 'name', 'status');
+        return $statusMap[$this->status];
     }
 
     public function getTotalFormatAttribute()
diff --git a/beike/Models/OrderHistory.php b/beike/Models/OrderHistory.php
index 1fdb976f..323ee1d6 100644
--- a/beike/Models/OrderHistory.php
+++ b/beike/Models/OrderHistory.php
@@ -11,6 +11,8 @@
 
 namespace Beike\Models;
 
+use Beike\Services\StateMachineService;
+
 class OrderHistory extends Base
 {
     protected $fillable = [
@@ -21,6 +23,7 @@ class OrderHistory extends Base
 
     public function getStatusFormatAttribute()
     {
-        return trans("order.{$this->status}");
+        $statusMap = array_column(StateMachineService::getAllStatuses(), 'name', 'status');
+        return $statusMap[$this->status];
     }
 }
diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php
index a26dc7b0..0f8d4961 100644
--- a/beike/Repositories/OrderRepo.php
+++ b/beike/Repositories/OrderRepo.php
@@ -79,7 +79,7 @@ class OrderRepo
      */
     public static function getListBuilder(array $filters = []): Builder
     {
-        $builder = Order::query()->with(['orderProducts']);
+        $builder = Order::query()->with(['orderProducts'])->where('status', '<>', StateMachineService::CREATED);
 
         $number = $filters['number'] ?? 0;
         if ($number) {
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index 921187ba..0e4b88c2 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -56,17 +56,21 @@
           </div>
         @endif
         @endhookwrapper
+
+        @hook('header.top.left')
       </div>
 
       @hook('header.top.language.after')
 
-      @if (system_setting('base.telephone', ''))
       <div class="right nav">
-        @hookwrapper('header.top.telephone')
-        <span class="px-2"><i class="bi bi-telephone-forward me-2"></i> {{ system_setting('base.telephone') }}</span>
-        @endhookwrapper
+        @if (system_setting('base.telephone', ''))
+          @hookwrapper('header.top.telephone')
+          <div class="px-2 my-auto"><i class="bi bi-telephone-forward me-2"></i> {{ system_setting('base.telephone') }}</div>
+          @endhookwrapper
+        @endif
+
+        @hook('header.top.right')
       </div>
-      @endif
     </div>
   </div>