From 1127186f7fa95735a16aa226ed6946b3b621ede6 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 2 Nov 2022 10:57:44 +0800
Subject: [PATCH] filter by order status

---
 beike/Admin/Http/Controllers/OrderController.php | 2 ++
 beike/Services/StateMachineService.php           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php
index cc63de43..29754b6d 100644
--- a/beike/Admin/Http/Controllers/OrderController.php
+++ b/beike/Admin/Http/Controllers/OrderController.php
@@ -25,12 +25,14 @@ class OrderController extends Controller
      *
      * @param Request $request
      * @return mixed
+     * @throws \Exception
      */
     public function index(Request $request)
     {
         $orders = OrderRepo::filterOrders($request->all());
         $data = [
             'orders' => OrderList::collection($orders),
+            'statuses' => StateMachineService::getAllStatuses(),
         ];
         return view('admin::pages.orders.index', $data);
     }
diff --git a/beike/Services/StateMachineService.php b/beike/Services/StateMachineService.php
index 9ea89e7e..ca9bccb0 100644
--- a/beike/Services/StateMachineService.php
+++ b/beike/Services/StateMachineService.php
@@ -106,7 +106,7 @@ class StateMachineService
             }
             $result[] = [
                 'status' => $status,
-                'name' => trans($status)
+                'name' => trans("order.{$status}")
             ];
         }
         return $result;