@things-factory/marketplace-base 3.6.34 → 3.6.39

package/dist-server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoInitialiseLogisticsByBatch = void 0;
+const typeorm_1 = require("typeorm");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const shell_1 = require("@things-factory/shell");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+const get_logistics_param_1 = require("../marketplace-order/get-logistics-param");
+exports.autoInitialiseLogisticsByBatch = {
+    async autoInitialiseLogisticsByBatch(_, { companyDomainId }, context) {
+        const { user } = context.state;
+        const companyDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(companyDomainId);
+        // Step 1: get all available marketplace-store
+        const marketplaceStores = await integration_marketplace_1.StoreAPI.getMarketplaceStores(companyDomain);
+        // Step 2: only get marketplace stores with own transport
+        const ownTransportMarketplaceStores = marketplaceStores.filter(store => store.isOwnTransport);
+        for (var i = 0; i < (ownTransportMarketplaceStores === null || ownTransportMarketplaceStores === void 0 ? void 0 : ownTransportMarketplaceStores.length); i++) {
+            const marketplaceStore = ownTransportMarketplaceStores[i];
+            const marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).find({
+                where: {
+                    marketplaceStore,
+                    trackingNo: (0, typeorm_1.IsNull)(),
+                    ownTrackingNo: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
+                    status: (0, typeorm_1.In)([constants_1.ORDER_STATUS.READY_TO_SHIP])
+                }
+            });
+            for (var j = 0; j < (marketplaceOrders === null || marketplaceOrders === void 0 ? void 0 : marketplaceOrders.length); j++) {
+                const marketplaceOrder = marketplaceOrders[j];
+                if (marketplaceStore.platform == 'shopee' && marketplaceOrder.status === 'ready_to_ship') {
+                    let fullLogisticsDetail = await get_logistics_param_1.getLogisticsParam.getLogisticsParam(_, { storeId: marketplaceStore.id, orderNo: marketplaceOrder.orderNo }, context);
+                    if (fullLogisticsDetail.non_integrated) {
+                        let deliveryType = {
+                            non_integration: {
+                                trackingNo: marketplaceOrder.ownTrackingNo
+                            }
+                        };
+                        await integration_marketplace_1.StoreAPI.initLogistics(marketplaceStore, { deliveryType, orderNo: marketplaceOrder.orderNo });
+                    }
+                }
+            }
+        }
+        return true;
+    }
+};
+//# sourceMappingURL=auto-initialise-logistics-by-batch.js.map

package/dist-server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-initialise-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.ts"],"names":[],"mappings":";;;AAAA,qCAAwD;AAGxD,qFAAoF;AACpF,iDAA8C;AAE9C,kDAAiD;AACjD,gDAAoD;AACpD,kFAA4E;AAE/D,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,EAAE,OAAY;QAC5E,MAAM,EAAE,IAAI,EAAE,GAAmB,OAAO,CAAC,KAAK,CAAA;QAE9C,MAAM,aAAa,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElF,8CAA8C;QAC9C,MAAM,iBAAiB,GAAuB,MAAM,kCAAQ,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAA;QAEhG,yDAAyD;QACzD,MAAM,6BAA6B,GAAuB,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAEjH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,6BAA6B,aAA7B,6BAA6B,uBAA7B,6BAA6B,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;YAC9D,MAAM,gBAAgB,GAAqB,6BAA6B,CAAC,CAAC,CAAC,CAAA;YAE3E,MAAM,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC;gBACvF,KAAK,EAAE;oBACL,gBAAgB;oBAChB,UAAU,EAAE,IAAA,gBAAM,GAAE;oBACpB,aAAa,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC;oBAC5B,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,wBAAY,CAAC,aAAa,CAAC,CAAC;iBACzC;aACF,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,CAAA,EAAE,CAAC,EAAE,EAAE;gBAClD,MAAM,gBAAgB,GAAqB,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAC/D,IAAI,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,IAAI,gBAAgB,CAAC,MAAM,KAAK,eAAe,EAAE;oBACxF,IAAI,mBAAmB,GAAG,MAAM,uCAAiB,CAAC,iBAAiB,CACjE,CAAC,EACD,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,EACnE,OAAO,CACR,CAAA;oBAED,IAAI,mBAAmB,CAAC,cAAc,EAAE;wBACtC,IAAI,YAAY,GAAG;4BACjB,eAAe,EAAE;gCACf,UAAU,EAAE,gBAAgB,CAAC,aAAa;6BAC3C;yBACF,CAAA;wBAED,MAAM,kCAAQ,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAA;qBACpG;iBACF;aACF;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getETraxOrderDocumentFunction = exports.MarketplaceOrderResolver = void 0;
+const auto_initialise_logistics_by_batch_1 = require("./auto-initialise-logistics-by-batch");
 const cancel_marketplace_order_1 = require("./cancel-marketplace-order");
 const dashboard_marketplace_orders_1 = require("./dashboard-marketplace-orders");
 const dashboard_marketplace_sales_1 = require("./dashboard-marketplace-sales");
@@ -33,6 +34,6 @@ const update_marketplace_order_1 = require("./update-marketplace-order");
 const update_order_ready_to_ship_1 = require("./update-order-ready-to-ship");
 exports.MarketplaceOrderResolver = {
     Query: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, marketplace_orders_1.marketplaceOrdersResolver), marketplace_order_1.marketplaceOrderResolver), get_order_document_1.getOrderDocumentResolver), get_etrax_order_document_1.getETraxOrderDocumentResolver), get_store_logistics_1.getStoreLogistics), get_logistics_param_1.getLogisticsParam), get_branch_list_1.getBranchList), get_address_list_1.getAddressList), get_time_slot_1.getTimeSlot), marketplace_orders_for_export_1.marketplaceOrdersForExport), marketplace_orders_for_batch_init_1.marketplaceOrdersForBatchInitResolver), dashboard_marketplace_orders_1.dashboardMarketplaceOrdersResolver), dashboard_marketplace_sales_1.dashboardMarketplaceSalesResolver), dashboard_marketplace_sales_average_1.dashboardMarketplaceSalesAverageResolver),
-    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_marketplace_order_1.generateMarketplaceOrderResolver), initialise_logistics_1.initialiseLogistics), initialise_logistics_by_batch_1.initialiseLogisticsByBatch), set_marketplace_order_delivered_1.setMarketplaceOrderDelivered), set_marketplace_order_failed_delivery_1.setMarketplaceOrderFailedDelivery), sync_marketplace_order_1.syncMarketplaceOrder), sync_all_marketplace_order_1.syncAllMarketplaceOrder), update_order_ready_to_ship_1.updateOrderReadyToShip), delete_marketplace_orders_1.deleteMarketplaceOrders), initialise_shopee_logistics_by_batch_1.initialiseShopeeLogisticsByBatch), initialise_lazada_logistics_by_batch_1.initialiseLazadaLogisticsByBatch), cancel_marketplace_order_1.cancelMarketplaceOrderResolver), split_orders_by_batch_1.splitOrdersByBatch), update_marketplace_order_1.updateMarketplaceOrder), set_own_shipping_provider_by_orders_1.setOwnShippingProviderByOrdersResolver)
+    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_marketplace_order_1.generateMarketplaceOrderResolver), initialise_logistics_1.initialiseLogistics), initialise_logistics_by_batch_1.initialiseLogisticsByBatch), set_marketplace_order_delivered_1.setMarketplaceOrderDelivered), set_marketplace_order_failed_delivery_1.setMarketplaceOrderFailedDelivery), sync_marketplace_order_1.syncMarketplaceOrder), sync_all_marketplace_order_1.syncAllMarketplaceOrder), update_order_ready_to_ship_1.updateOrderReadyToShip), delete_marketplace_orders_1.deleteMarketplaceOrders), initialise_shopee_logistics_by_batch_1.initialiseShopeeLogisticsByBatch), initialise_lazada_logistics_by_batch_1.initialiseLazadaLogisticsByBatch), cancel_marketplace_order_1.cancelMarketplaceOrderResolver), split_orders_by_batch_1.splitOrdersByBatch), update_marketplace_order_1.updateMarketplaceOrder), set_own_shipping_provider_by_orders_1.setOwnShippingProviderByOrdersResolver), auto_initialise_logistics_by_batch_1.autoInitialiseLogisticsByBatch)
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/marketplace-order/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAC3E,iFAAmF;AACnF,+EAAiF;AACjF,+FAAgG;AAChG,2EAAqE;AACrE,6EAA+E;AAC/E,yDAAmD;AACnD,uDAAiD;AACjD,yEAAyG;AA0DhG,8GA1DA,wDAA6B,OA0DA;AAzDtC,+DAAyD;AACzD,6DAA+D;AAC/D,+DAAyD;AACzD,mDAA6C;AAC7C,iGAAyF;AACzF,iEAA4D;AAC5D,mFAA4E;AAC5E,iGAAyF;AACzF,2DAA8D;AAC9D,6DAAgE;AAChE,2FAA2F;AAC3F,mFAA4E;AAC5E,uFAAgF;AAChF,mGAA2F;AAC3F,+FAA8F;AAC9F,mEAA4D;AAC5D,6EAAsE;AACtE,qEAA+D;AAC/D,yEAAmE;AACnE,6EAAqE;AAExD,QAAA,wBAAwB,GAAG;IACtC,KAAK,0MACA,8CAAyB,GACzB,4CAAwB,GACxB,6CAAwB,GACxB,wDAA6B,GAC7B,uCAAiB,GACjB,uCAAiB,GACjB,+BAAa,GACb,iCAAc,GACd,2BAAW,GACX,0DAA0B,GAC1B,yEAAqC,GACrC,iEAAkC,GAClC,+DAAiC,GACjC,8EAAwC,CAC5C;IACD,QAAQ,wNACH,6DAAgC,GAChC,0CAAmB,GACnB,0DAA0B,GAC1B,8DAA4B,GAC5B,yEAAiC,GACjC,6CAAoB,GACpB,oDAAuB,GACvB,mDAAsB,GACtB,mDAAuB,GACvB,uEAAgC,GAChC,uEAAgC,GAChC,yDAA8B,GAC9B,0CAAkB,GAClB,iDAAsB,GACtB,4EAAsC,CAC1C;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/index.ts"],"names":[],"mappings":";;;AAAA,6FAAqF;AACrF,yEAA2E;AAC3E,iFAAmF;AACnF,+EAAiF;AACjF,+FAAgG;AAChG,2EAAqE;AACrE,6EAA+E;AAC/E,yDAAmD;AACnD,uDAAiD;AACjD,yEAAyG;AA2DhG,8GA3DA,wDAA6B,OA2DA;AA1DtC,+DAAyD;AACzD,6DAA+D;AAC/D,+DAAyD;AACzD,mDAA6C;AAC7C,iGAAyF;AACzF,iEAA4D;AAC5D,mFAA4E;AAC5E,iGAAyF;AACzF,2DAA8D;AAC9D,6DAAgE;AAChE,2FAA2F;AAC3F,mFAA4E;AAC5E,uFAAgF;AAChF,mGAA2F;AAC3F,+FAA8F;AAC9F,mEAA4D;AAC5D,6EAAsE;AACtE,qEAA+D;AAC/D,yEAAmE;AACnE,6EAAqE;AAExD,QAAA,wBAAwB,GAAG;IACtC,KAAK,0MACA,8CAAyB,GACzB,4CAAwB,GACxB,6CAAwB,GACxB,wDAA6B,GAC7B,uCAAiB,GACjB,uCAAiB,GACjB,+BAAa,GACb,iCAAc,GACd,2BAAW,GACX,0DAA0B,GAC1B,yEAAqC,GACrC,iEAAkC,GAClC,+DAAiC,GACjC,8EAAwC,CAC5C;IACD,QAAQ,sOACH,6DAAgC,GAChC,0CAAmB,GACnB,0DAA0B,GAC1B,8DAA4B,GAC5B,yEAAiC,GACjC,6CAAoB,GACpB,oDAAuB,GACvB,mDAAsB,GACtB,mDAAuB,GACvB,uEAAgC,GAChC,uEAAgC,GAChC,yDAA8B,GAC9B,0CAAkB,GAClB,iDAAsB,GACtB,4EAAsC,GACtC,mEAA8B,CAClC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.js

@@ -42,7 +42,7 @@ exports.initialiseShopeeLogisticsByBatch = {
                         [patch.deliveryType]: {}
                     };
                     if (patch.trackingNo)
-                        deliveryType[patch.deliveryType] = Object.assign(Object.assign({}, deliveryType[patch.deliveryType]), { trackingNo: patch.trackingNo });
+                        deliveryType[patch.deliveryType] = Object.assign(Object.assign({}, deliveryType[patch.deliveryType]), { trackingNo: patch.trackingNo ? patch.trackingNo : patch.ownTrackingNo });
                 }
                 else {
                     return false;

package/dist-server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialise-shopee-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"initialise-shopee-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/marketplace-order/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./logistics-time"), exports);
 __exportStar(require("./logistics"), exports);
 exports.MarketplaceOrderResolver = (0, graphql_tag_1.default) `
   extend type Mutation {
+    autoInitialiseLogisticsByBatch(companyDomainId: String): Boolean
     generateMarketplaceOrder(marketplaceOrder: NewMarketplaceOrder!): MarketplaceOrder @transaction
     cancelMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
     syncMarketplaceOrder(storeId: String!, fromDate: String, toDate: String): Boolean @transaction

package/dist-server/graphql/types/marketplace-order/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,mDAAgC;AAChC,oDAAiC;AACjC,0DAAuC;AACvC,0DAAuC;AACvC,sDAAmC;AACnC,4DAAyC;AACzC,2DAAwC;AACxC,6DAA0C;AAC1C,kDAA+B;AAC/B,0DAAuC;AACvC,qDAAkC;AAClC,mDAAgC;AAChC,mDAAgC;AAChC,mDAAgC;AAChC,8CAA2B;AAEd,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwC1C,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,mDAAgC;AAChC,oDAAiC;AACjC,0DAAuC;AACvC,0DAAuC;AACvC,sDAAmC;AACnC,4DAAyC;AACzC,2DAAwC;AACxC,6DAA0C;AAC1C,kDAA+B;AAC/B,0DAAuC;AACvC,qDAAkC;AAClC,mDAAgC;AAChC,mDAAgC;AAChC,mDAAgC;AAChC,8CAA2B;AAEd,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC1C,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "3.6.34",
+  "version": "3.6.39",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/integration-fulfillment": "^3.6.33",
-    "@things-factory/integration-marketplace": "^3.6.33",
-    "@things-factory/shell": "^3.6.33"
+    "@things-factory/integration-fulfillment": "^3.6.39",
+    "@things-factory/integration-marketplace": "^3.6.39",
+    "@things-factory/shell": "^3.6.38"
   },
-  "gitHead": "026c859918f474fae1c3d5c2e5604627afe8a95b"
+  "gitHead": "0c0d02d7247a05196bf21879cc899931de55d2ef"
 }

package/server/graphql/resolvers/marketplace-order/auto-initialise-logistics-by-batch.ts

@@ -0,0 +1,58 @@
+import { getRepository, In, IsNull, Not } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
+import { Domain } from '@things-factory/shell'
+
+import { ORDER_STATUS } from '../../../constants'
+import { MarketplaceOrder } from '../../../entities'
+import { getLogisticsParam } from '../marketplace-order/get-logistics-param'
+
+export const autoInitialiseLogisticsByBatch = {
+  async autoInitialiseLogisticsByBatch(_: any, { companyDomainId }, context: any) {
+    const { user }: { user: User } = context.state
+
+    const companyDomain: Domain = await getRepository(Domain).findOne(companyDomainId)
+
+    // Step 1: get all available marketplace-store
+    const marketplaceStores: MarketplaceStore[] = await StoreAPI.getMarketplaceStores(companyDomain)
+
+    // Step 2: only get marketplace stores with own transport
+    const ownTransportMarketplaceStores: MarketplaceStore[] = marketplaceStores.filter(store => store.isOwnTransport)
+
+    for (var i = 0; i < ownTransportMarketplaceStores?.length; i++) {
+      const marketplaceStore: MarketplaceStore = ownTransportMarketplaceStores[i]
+
+      const marketplaceOrders: MarketplaceOrder[] = await getRepository(MarketplaceOrder).find({
+        where: {
+          marketplaceStore,
+          trackingNo: IsNull(),
+          ownTrackingNo: Not(IsNull()),
+          status: In([ORDER_STATUS.READY_TO_SHIP])
+        }
+      })
+
+      for (var j = 0; j < marketplaceOrders?.length; j++) {
+        const marketplaceOrder: MarketplaceOrder = marketplaceOrders[j]
+        if (marketplaceStore.platform == 'shopee' && marketplaceOrder.status === 'ready_to_ship') {
+          let fullLogisticsDetail = await getLogisticsParam.getLogisticsParam(
+            _,
+            { storeId: marketplaceStore.id, orderNo: marketplaceOrder.orderNo },
+            context
+          )
+
+          if (fullLogisticsDetail.non_integrated) {
+            let deliveryType = {
+              non_integration: {
+                trackingNo: marketplaceOrder.ownTrackingNo
+              }
+            }
+
+            await StoreAPI.initLogistics(marketplaceStore, { deliveryType, orderNo: marketplaceOrder.orderNo })
+          }
+        }
+      }
+    }
+    return true
+  }
+}

package/server/graphql/resolvers/marketplace-order/index.ts

@@ -1,3 +1,4 @@
+import { autoInitialiseLogisticsByBatch } from './auto-initialise-logistics-by-batch'
 import { cancelMarketplaceOrderResolver } from './cancel-marketplace-order'
 import { dashboardMarketplaceOrdersResolver } from './dashboard-marketplace-orders'
 import { dashboardMarketplaceSalesResolver } from './dashboard-marketplace-sales'
@@ -60,7 +61,8 @@ export const MarketplaceOrderResolver = {
     ...cancelMarketplaceOrderResolver,
     ...splitOrdersByBatch,
     ...updateMarketplaceOrder,
-    ...setOwnShippingProviderByOrdersResolver
+    ...setOwnShippingProviderByOrdersResolver,
+    ...autoInitialiseLogisticsByBatch
   }
 }
 

package/server/graphql/resolvers/marketplace-order/initialise-shopee-logistics-by-batch.ts

@@ -47,7 +47,10 @@ export const initialiseShopeeLogisticsByBatch = {
             }
 
             if (patch.trackingNo)
-              deliveryType[patch.deliveryType] = { ...deliveryType[patch.deliveryType], trackingNo: patch.trackingNo }
+              deliveryType[patch.deliveryType] = {
+                ...deliveryType[patch.deliveryType],
+                trackingNo: patch.trackingNo ? patch.trackingNo : patch.ownTrackingNo
+              }
           } else {
             return false
           }

package/server/graphql/types/marketplace-order/index.ts

@@ -18,6 +18,7 @@ export * from './logistics'
 
 export const MarketplaceOrderResolver = gql`
   extend type Mutation {
+    autoInitialiseLogisticsByBatch(companyDomainId: String): Boolean
     generateMarketplaceOrder(marketplaceOrder: NewMarketplaceOrder!): MarketplaceOrder @transaction
     cancelMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
     syncMarketplaceOrder(storeId: String!, fromDate: String, toDate: String): Boolean @transaction