danak/shop-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from Danakcorp/mrtz

Browse Source 
fix : sale report data
This commit is contained in:
morteza-mortezai
2025-10-29 10:18:05 +03:30
committed by GitHub
parent 56996fcee2 a559e28372
commit 41d06589d5
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/order/order.repository.ts
+14 -9
View File
@@ -557,7 +557,7 @@ class OrderRepository extends BaseRepository<IOrder> {
as: "orderItems", as: "orderItems",
}, },
}, },
{ {
$addFields: { $addFields: {
orderItems: { orderItems: {
$filter: { $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 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) { for (const r of aggResults) {
const d: Date = r._id.period; const d: Date = r._id.period;
const key = unit === "month" ? d.toISOString().slice(0, 7) : d.toISOString().slice(0, 10); 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, $lte: endOfDay,
}, },
status: { 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, $lte: endOfWeek,
}, },
status: { 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, $lte: endOfMonth,
}, },
status: { 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, $lte: endOfYear,
}, },
status: { 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 $lt: new Date(today.getTime() + 24 * 60 * 60 * 1000), // Include today
}, },
status: { 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, $lt: endOfMonth,
}, },
status: { 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, $lt: endOfYear,
}, },
status: { status: {
$nin: ["cancelled_shop", "cancelled_system", "Returned"], $nin: ["cancelled_shop", "cancelled_system", "Returned", OrdersStatus.wait_payment],
}, },
}, },
}, },