From a559e283723881053d9d87d606c290cd15f79fd0 Mon Sep 17 00:00:00 2001
From: morteza-mortezai <mrtz.mrtzi.1989@gmail.com-at-003669155861>
Date: Wed, 29 Oct 2025 10:16:54 +0330
Subject: [PATCH] fix : sale report data

---
 src/modules/order/order.repository.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/modules/order/order.repository.ts b/src/modules/order/order.repository.ts
index d2e9f9b..f2d9239 100644
--- a/src/modules/order/order.repository.ts
+++ b/src/modules/order/order.repository.ts
@@ -557,7 +557,7 @@ class OrderRepository extends BaseRepository<IOrder> {
           as: "orderItems",
         },
       },
-       {
+      {
         $addFields: {
           orderItems: {
             $filter: {
@@ -595,7 +595,7 @@ class OrderRepository extends BaseRepository<IOrder> {
 
     const aggResults: Array<{ _id: { period: Date }; periodTotal: number }> = await this.model.aggregate(pipeline).exec();
 
-     const map = new Map<string, number>();
+    const map = new Map<string, number>();
     for (const r of aggResults) {
       const d: Date = r._id.period;
       const key = unit === "month" ? d.toISOString().slice(0, 7) : d.toISOString().slice(0, 10);
@@ -2077,7 +2077,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lte: endOfDay,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },
@@ -2115,7 +2115,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lte: endOfWeek,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },
@@ -2151,7 +2151,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lte: endOfMonth,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },
@@ -2187,7 +2187,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lte: endOfYear,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },
@@ -2303,7 +2303,12 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lt: new Date(today.getTime() + 24 * 60 * 60 * 1000), // Include today
           },
           status: {
-            $nin: [OrderItemsStatus.cancelled_shop, OrderItemsStatus.cancelled_system, OrderItemsStatus.Returned],
+            $nin: [
+              OrderItemsStatus.cancelled_shop,
+              OrderItemsStatus.cancelled_system,
+              OrderItemsStatus.Returned,
+              OrdersStatus.wait_payment,
+            ],
           },
         },
       },
@@ -2413,7 +2418,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lt: endOfMonth,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },
@@ -2452,7 +2457,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
             $lt: endOfYear,
           },
           status: {
-            $nin: ["cancelled_shop", "cancelled_system", "Returned"],
+            $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
           },
         },
       },