From e92dfd8784fdc0f7d58a304878ec238d99032b55 Mon Sep 17 00:00:00 2001
From: morteza-mortezai <mrtz.mrtzi.1989@gmail.com-at-003669155861>
Date: Wed, 29 Oct 2025 12:03:44 +0330
Subject: [PATCH] fix : returned and cancelled status

---
 src/modules/order/order.repository.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/order/order.repository.ts b/src/modules/order/order.repository.ts
index 4e09c42..8bc577c 100644
--- a/src/modules/order/order.repository.ts
+++ b/src/modules/order/order.repository.ts
@@ -122,11 +122,11 @@ class OrderRepository extends BaseRepository<IOrder> {
 
     switch (statusQuery) {
       case "Cancelled":
-        matchQuery.orderStatus = OrdersStatus.cancelled_system;
+        matchQuery.$or = [{ status: OrdersStatus.cancelled_system }, { status: OrdersStatus.Cancelled }];
         orderItemsMatchQuery.$or = [
           { "orderItems.status": OrderItemsStatus.cancelled_system },
-          { "orderItems.status": OrderItemsStatus.cancelled_user },
           { "orderItems.status": OrderItemsStatus.cancelled_shop },
+          { "orderItems.status": OrderItemsStatus.cancelled_user },
         ];
         break;
       case "Processing":