From e7734e02d1a9a07c103a2028b4af946fdfc0a32a Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:51:08 +0800
Subject: [PATCH] fixed account orders filter by status

---
 beike/Repositories/OrderRepo.php                        | 6 ++++++
 beike/Shop/Http/Controllers/Account/OrderController.php | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php
index 066cfb88..60bc1916 100644
--- a/beike/Repositories/OrderRepo.php
+++ b/beike/Repositories/OrderRepo.php
@@ -93,6 +93,12 @@ class OrderRepo
             $builder->where('created_at', '<', $end);
         }
 
+        $status = $filters['status'] ?? '';
+        if ($status) {
+            $builder->where('status', $status);
+        }
+
+
         return $builder;
     }
 
diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php
index 3969c274..5451b4b5 100644
--- a/beike/Shop/Http/Controllers/Account/OrderController.php
+++ b/beike/Shop/Http/Controllers/Account/OrderController.php
@@ -30,7 +30,11 @@ class OrderController extends Controller
      */
     public function index(Request $request): View
     {
-        $orders = OrderRepo::getListByCustomer(current_customer());
+        $filters = [
+            'customer' => current_customer(),
+            'status' => $request->get('status')
+        ];
+        $orders = OrderRepo::filterOrders($filters);
         $data = [
             'orders' => OrderList::collection($orders),
         ];