Merge pull request #38 from Danakcorp/mrtz

fix : returned and cancelled status orders

src/common/types/query.type.ts

@@ -99,4 +99,4 @@ export type NotificationQuery = {
   since: number;
 };
 
-export type OrderStatusQuery = "Delivered" | "Processing" | "Cancelled";
+export type OrderStatusQuery = "Delivered" | "Processing" | "Cancelled" | "Returned";

src/modules/order/order.repository.ts

@@ -123,7 +123,11 @@ class OrderRepository extends BaseRepository<IOrder> {
     switch (statusQuery) {
       case "Cancelled":
         matchQuery.orderStatus = OrdersStatus.cancelled_system;
-        orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.cancelled_system;
+        orderItemsMatchQuery.$or = [
+          { "orderItems.status": OrderItemsStatus.cancelled_system },
+          { "orderItems.status": OrderItemsStatus.cancelled_user },
+          { "orderItems.status": OrderItemsStatus.cancelled_shop },
+        ];
         break;
       case "Processing":
         matchQuery.$or = [{ orderStatus: OrdersStatus.process_by_seller }, { orderStatus: OrdersStatus.wait_payment }];
@@ -136,6 +140,10 @@ class OrderRepository extends BaseRepository<IOrder> {
         matchQuery.orderStatus = OrdersStatus.process_by_seller;
         orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Delivered;
         break;
+      case "Returned":
+        matchQuery.orderStatus = OrdersStatus.process_by_seller;
+        orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Returned;
+        break;
       default:
         break;
     }