Merge pull request #39 from Danakcorp/mrtz

fix : returned and cancelled status
2025-10-29 12:04:19 +03:30
parent 9c6cfcb8ea e92dfd8784
commit fc2dbc79e3
1 changed files with 2 additions and 2 deletions
@@ -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":