@mivis/petmart-api 1.2.77 → 1.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mivis/petmart-api",
-  "version": "1.2.77",
+  "version": "1.2.79",
   "main": "index.js",
   "types": "type.d.ts",
   "license": "ISC",

package/type.d.ts

@@ -303,7 +303,7 @@ declare namespace Components {
         _id: string;
         name: string;
       };
-      seller_id: {
+      seller_id?: {
         _id: string;
         shop_details: IShopDetails;
         delivery_ways: IDeliveryWays;
@@ -641,7 +641,8 @@ declare namespace Components {
 
     export interface IAdminChangeOrderStatus {
       orderId: string;
-      status: EOrderStatus.CONFIRMED_BY_SELLER | EOrderStatus.CANCELED;
+      status: EOrderStatus;
+      reason_of_cancel?: string;
     }
 
     export interface IAdminOrdersQueryRequest extends FilterBaseQuery {
@@ -649,9 +650,20 @@ declare namespace Components {
       from?: string;
       to?: string;
       number?: string;
+      sum?: 'asc' | 'desc';
+      status?: EOrderStatus;
+      full_name?: string;
       seller_id?: string;
     }
 
+    export interface IPopulatedOrderSeller {
+      seller_id: Pick<ISeller, '_id' | 'shop_details'>;
+    }
+
+    export interface IPopulatedOrderUser {
+      user_id: Pick<IUser, '_id' | 'name'>;
+    }
+
     export interface IPopulatedOrderItem
       extends Omit<IOrderItem, 'product_id'> {
       product_id: Pick<
@@ -660,8 +672,13 @@ declare namespace Components {
       >;
     }
 
-    export type IPopulatedOrder = Omit<IOrder, 'items'> & {
+    export type IPopulatedOrder = Omit<
+      IOrder,
+      'items' | 'seller_id' | 'user_id'
+    > & {
       items: IPopulatedOrderItem[];
+      seller_id: IPopulatedOrderSeller;
+      user_id: IPopulatedOrderUser;
     };
 
     export interface IAdminGetOrderResponse {
@@ -680,14 +697,11 @@ declare namespace Components {
     >;
 
     export enum EOrderStatus {
-      DELIVERED = 'DELIVERED',
-      IN_DELIVERY = 'IN_DELIVERY',
       ON_CONFIRMATION = 'ON_CONFIRMATION',
       CONFIRMED_BY_SELLER = 'CONFIRMED_BY_SELLER',
-      PAID = 'PAID',
+      IN_DELIVERY = 'IN_DELIVERY',
+      FINISHED = 'FINISHED',
       CANCELED = 'CANCELED',
-      REFUSING = 'REFUSING',
-      DELETED = 'DELETED',
     }
 
     export interface IDeliveryAddress extends OrderAddress {
@@ -848,11 +862,12 @@ declare namespace Components {
     }
 
     export interface IOrder {
+      _id: string;
       sum: number;
       weight: number;
-      user_id: string;
+      user_id?: string;
       items: IOrderItem[];
-      seller_id: string;
+      seller_id?: string;
       receive_method: ERecieveMethod;
       delivery_info?: Partial<IDeliveryFullInfo>;
       shop_id?: string;
@@ -860,6 +875,7 @@ declare namespace Components {
       status?: EOrderStatus;
       preparation_date?: Date;
       note?: string;
+      reason_of_cancel?: string;
       number?: number;
       createdAt: Date;
       updatedAt: Date;