npm - @things-factory/worksheet-base - Versions diffs - 4.3.462 → 4.3.464 - Mend

@things-factory/worksheet-base 4.3.462 → 4.3.464

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/dist-server/graphql/resolvers/worksheet/cancel-arrival-notice.js ADDED Viewed

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelArrivalNoticeResolver = void 0;
+const typeorm_1 = require("typeorm");
+const sales_base_1 = require("@things-factory/sales-base");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+exports.cancelArrivalNoticeResolver = {
+    async cancelArrivalNotice(_, { name }, context) {
+        const { user, domain } = context.state;
+        const arrivalNotice = await (0, typeorm_1.getRepository)(sales_base_1.ArrivalNotice).findOne({
+            where: { domain: domain, name },
+            relations: ['bizplace', 'orderProducts']
+        });
+        if (!arrivalNotice)
+            throw new Error(`Arrival notice doesn't exists.`);
+        await (0, typeorm_1.getRepository)(sales_base_1.ArrivalNotice).update({ id: arrivalNotice.id }, {
+            status: sales_base_1.ORDER_STATUS.CANCELLED,
+            updater: user,
+            updatedAt: new Date().toISOString()
+        });
+        let foundOPs = arrivalNotice.orderProducts;
+        await Promise.all(foundOPs.map((op) => (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).update({ id: op.id }, {
+            status: sales_base_1.ORDER_PRODUCT_STATUS.TERMINATED,
+            updater: user,
+            updatedAt: new Date().toISOString()
+        })));
+        let foundWorksheet = await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
+            where: {
+                domain,
+                arrivalNotice: arrivalNotice
+            }
+        });
+        if (foundWorksheet) {
+            await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: foundWorksheet.id }, {
+                status: constants_1.WORKSHEET_STATUS.CANCELLED,
+                updater: user,
+                updatedAt: new Date().toISOString()
+            });
+            let foundWorksheetDetails = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).findOne({
+                where: {
+                    domain,
+                    worksheet: foundWorksheet
+                }
+            });
+            await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).update({ id: foundWorksheetDetails.id }, {
+                status: constants_1.WORKSHEET_STATUS.CANCELLED,
+                updater: user,
+                updatedAt: new Date().toISOString()
+            });
+        }
+        return true;
+    }
+};
+//# sourceMappingURL=cancel-arrival-notice.js.map

package/dist-server/graphql/resolvers/worksheet/cancel-arrival-notice.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"cancel-arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cancel-arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,2DAKmC;AAGnC,kDAAqD;AACrD,gDAG0B;AAEb,QAAA,2BAA2B,GAAG;IAC1C,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAC/B,EAAE,IAAI,EAAE,EACR,OAAY;QAEZ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,aAAa,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YAC/E,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE;YAC/B,SAAS,EAAE,CAAC,UAAU,EAAE,eAAe,CAAE;SACzC,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAErE,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,EAAE;YACnE,MAAM,EAAG,yBAAY,CAAC,SAAS;YAC/B,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACnC,CAAC,CAAA;QAEF,IAAI,QAAQ,GAAmB,aAAa,CAAC,aAAa,CAAA;QAE1D,MAAM,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE,CACjC,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;YACjD,MAAM,EAAE,iCAAoB,CAAC,UAAU;YACvC,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACnC,CAAC,CACF,CACD,CAAC;QAEF,IAAI,cAAc,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE;gBACN,MAAM;gBACN,aAAa,EAAE,aAAa;aAC5B;SACD,CAAC,CAAA;QAEF,IAAI,cAAc,EAAE;YACnB,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,EAAE;gBAChE,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAA;YAEF,IAAI,qBAAqB,GAAoB,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;gBACzF,KAAK,EAAE;oBACN,MAAM;oBACN,SAAS,EAAE,cAAc;iBACzB;aACD,CAAC,CAAA;YAEF,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,qBAAqB,CAAC,EAAE,EAAE,EAAE;gBAC7E,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACnC,CAAC,CAAA;SACF;QAED,OAAO,IAAI,CAAA;IACZ,CAAC;CACD,CAAA"}

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js CHANGED Viewed

@@ -1,15 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePickingWorksheetDetail = exports.generatePickingWorksheet = exports.generateReleaseGoodWorksheetResolver = void 0;
+exports.mmsRTSMarketplaceOrder = exports.mmsPackMarketplaceOrder = exports.mmsProcessOrder = exports.generatePickingWorksheetDetail = exports.generatePickingWorksheet = exports.generateReleaseGoodWorksheetResolver = void 0;
+const typeorm_1 = require("typeorm");
+const env_1 = require("@things-factory/env");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const setting_base_1 = require("@things-factory/setting-base");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const controllers_1 = require("../../../../controllers/");
 const entities_1 = require("../../../../entities");
-const warehouse_base_1 = require("@things-factory/warehouse-base");
+const utils_1 = require("../../../../utils");
 exports.generateReleaseGoodWorksheetResolver = {
     async generateReleaseGoodWorksheet(_, { releaseGoodNo, currentStatus = null }, context) {
         const { tx, domain, user } = context.state;
-        let worksheet = await generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus);
+        let worksheet = await generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus, context);
         if (worksheet) {
             return true;
         }
@@ -18,7 +23,7 @@ exports.generateReleaseGoodWorksheetResolver = {
         }
     }
 };
-async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus = null) {
+async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, currentStatus = null, context) {
     try {
         const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
         let releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, {
@@ -32,6 +37,7 @@ async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, current
         });
         if (releaseGood.type == 'b2c' && directReleaseOrder && directReleaseOrder.value.toLowerCase() == 'true') {
             const inventoryUtil = new warehouse_base_1.InventoryUtil(tx, domain, user);
+            await mmsProcessOrder(tx, domain, user, releaseGood, context);
             let orderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
                 where: { domain, releaseGood },
                 relations: ['inventory']
@@ -64,7 +70,8 @@ async function generatePickingWorksheet(tx, domain, user, releaseGoodNo, current
         return worksheet;
     }
     catch (error) {
-        return new entities_1.Worksheet();
+        throw new Error(error.message);
+        //return new Worksheet()
     }
 }
 exports.generatePickingWorksheet = generatePickingWorksheet;
@@ -85,4 +92,354 @@ async function generatePickingWorksheetDetail(tx, domain, user, worksheet, targe
     return await worksheetController.generatePickingWorksheetDetail(worksheet, targetInventory);
 }
 exports.generatePickingWorksheetDetail = generatePickingWorksheetDetail;
+async function mmsProcessOrder(tx, domain, user, foundReleaseGood, context) {
+    var _a, _b, _c;
+    try {
+        let marketplaceOrder;
+        let marketplaceOrderPackages;
+        let marketplaceOrderItems;
+        let marketplaceStore;
+        marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+            where: {
+                orderNo: foundReleaseGood.refNo
+            },
+            relations: [
+                'marketplaceStore',
+                'marketplaceOrderPackages',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems.marketplaceOrderItem',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems.marketplaceOrderItem.marketplaceProductVariation',
+                'marketplaceOrderItems',
+                'marketplaceOrderItems.marketplaceProductVariation'
+            ]
+        });
+        let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+            where: { id: foundReleaseGood.id, domain: domain },
+            relations: [
+                'orderPackages',
+                'orderPackages.orderPackageItems',
+                'orderProducts',
+                'orderProducts.product',
+                'orderProducts.productDetail',
+                'domain',
+                'bizplace',
+                'creator',
+                'updater',
+                'lastMileDelivery'
+            ]
+        });
+        if (!releaseGood)
+            throw new Error('unable to find release good');
+        marketplaceStore = marketplaceOrder.marketplaceStore;
+        marketplaceOrderItems = (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderItems) ? marketplaceOrder.marketplaceOrderItems : [];
+        marketplaceOrderPackages = (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderPackages)
+            ? marketplaceOrder.marketplaceOrderPackages
+            : [];
+        if ((marketplaceOrderPackages === null || marketplaceOrderPackages === void 0 ? void 0 : marketplaceOrderPackages.length) <= 0) {
+            let platform = marketplaceOrder.marketplaceStore.platform;
+            if (platform == 'shopee') {
+                let orderList = marketplaceOrder.id;
+                let result = await integration_marketplace_1.StoreAPI.getStoreOrderByBatch(marketplaceStore, { orderIdList: orderList });
+                if (result.packageList && result.packageList.length > 0) {
+                    releaseGood = await mmsPackMarketplaceOrder(releaseGood, marketplaceOrder, marketplaceOrderItems, result, domain, tx);
+                }
+            }
+            else if (platform == 'lazada') {
+                try {
+                    let fullOrderItemList = marketplaceOrderItems.map(moi => moi.name);
+                    const logisticByPackage = await integration_marketplace_1.StoreAPI.getStoreLogisticsByPackage(marketplaceStore, {
+                        orderId: marketplaceOrder.orderNo,
+                        orderItemIds: fullOrderItemList
+                    });
+                    if (!logisticByPackage)
+                        throw new Error('Shipment provider not found');
+                    //panggil packOrder Lazada utk dapatkan packageId utk create op dan opi
+                    let result = await integration_marketplace_1.StoreAPI.setStoreOrderStatusPackedByMarketplace(marketplaceStore, {
+                        packOrderList: [{ orderId: marketplaceOrder.orderNo, orderItemList: fullOrderItemList }],
+                        deliveryType: 'dropship',
+                        shippingAllocateType: logisticByPackage.shippingAllocateType
+                    });
+                    //massage data frst one package
+                    const data = result.packOrderList.map(pol => {
+                        const groupedItems = {};
+                        pol.orderItemList.forEach(item => {
+                            const { packageId, shipmentProvider, trackingNumber, orderItemId } = item;
+                            if (!groupedItems[packageId]) {
+                                groupedItems[packageId] = { packageId, packageItem: [] };
+                            }
+                            groupedItems[packageId].packageItem.push({ shipmentProvider, trackingNumber, orderItemId });
+                        });
+                        const massagedData = Object.values(groupedItems);
+                        result = { packOrderList: massagedData };
+                    });
+                    //create mop , mopi , op & opi
+                    if (result.packOrderList && result.packOrderList.length) {
+                        releaseGood = await mmsPackMarketplaceOrder(releaseGood, marketplaceOrder, marketplaceOrderItems, result, domain, tx);
+                    }
+                }
+                catch (e) {
+                    env_1.logger.error(`packOrder[lazada]: ${e}`);
+                    throw e;
+                }
+            }
+        }
+        else {
+            try {
+                releaseGood = await mmsPackMarketplaceOrder(releaseGood, marketplaceOrder, marketplaceOrderItems, [], domain, tx, marketplaceOrderPackages);
+            }
+            catch (e) {
+                env_1.logger.error(`packOrder[shopee]: ${e}`);
+                throw e;
+            }
+        }
+        if (((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) > 0 &&
+            releaseGood.lmdOption &&
+            releaseGood.lastMileDelivery &&
+            ((_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
+            try {
+                await (0, utils_1.createLmdParcel)([releaseGood], tx, domain, user, marketplaceOrder);
+                let updatedReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+                    where: { id: releaseGood.id },
+                    relations: ['domain', 'bizplace', 'orderPackages', 'orderPackages.orderPackageItems']
+                });
+                let updatedMarketplaceOrderPackages = await tx
+                    .getRepository(marketplace_base_1.MarketplaceOrderPackage)
+                    .find({
+                    where: { marketplaceOrder: marketplaceOrder.id },
+                    relations: ['marketplaceOrder', 'marketplaceOrderPackageItems']
+                });
+                let updatedOrderPackage = updatedReleaseGood.orderPackages;
+                const hasNullAirwaybill = updatedOrderPackage.some(orderPackage => orderPackage.airwaybill === null);
+                // if the user had call the awb more than 5 times
+                if (updatedReleaseGood.countParcel > 5 && hasNullAirwaybill) {
+                    throw new Error('It appears that we are unable to retrieve the AWB from the platform. Please reach out to support for assistance');
+                }
+                if (hasNullAirwaybill)
+                    throw new Error('We are in the process to get the AWB. Please retry by clicking the GENERATE PICKING WORKSHEET');
+                for (let updatePackage of updatedOrderPackage) {
+                    for (let mop of updatedMarketplaceOrderPackages) {
+                        // Find match order package based on packageId and releaseGood refOrderId
+                        if (updatePackage.packageId === mop.packageId && updatedReleaseGood.refOrderId === marketplaceOrder.id) {
+                            await tx.getRepository(marketplace_base_1.MarketplaceOrderPackage).update({ id: mop.id }, {
+                                airwayBill: updatePackage.airwayBill,
+                                trackingNo: updatePackage.trackingNo,
+                                transporter: updatePackage === null || updatePackage === void 0 ? void 0 : updatePackage.transporter
+                            });
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                env_1.logger.error(`mms-create-parcel-error: ${e}`);
+                throw e;
+            }
+        }
+        //ini belum test fr shopee && lazada
+        try {
+            if (((_c = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderPackages) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+                await mmsRTSMarketplaceOrder(marketplaceOrder, tx, domain);
+            }
+        }
+        catch (e) {
+            env_1.logger.error(`rts-mms-orders:${e}`);
+            throw e;
+        }
+    }
+    catch (e) {
+        console.log(e);
+        throw e;
+    }
+}
+exports.mmsProcessOrder = mmsProcessOrder;
+async function mmsPackMarketplaceOrder(releaseGood, marketplaceOrder, marketplaceOrderItems, result, domain, tx, existingMarketplaceOrderPackage) {
+    try {
+        let newMarketplaceOrderPackage = new marketplace_base_1.MarketplaceOrderPackage();
+        let newMarketplaceOrderPackageItem = new marketplace_base_1.MarketplaceOrderPackageItem();
+        let orderPackage = new sales_base_1.OrderPackage();
+        let orderPackageItem = new sales_base_1.OrderPackageItem();
+        let newMarketplaceOrderPackages = [];
+        let newOrderPackages = [];
+        if (!existingMarketplaceOrderPackage) {
+            let packagePack = (result === null || result === void 0 ? void 0 : result.packageList) ? result.packageList : result.packOrderList;
+            for (let j = 0; j < packagePack.length; j++) {
+                let marketplacePackage = packagePack[j];
+                let packageItems = (marketplacePackage === null || marketplacePackage === void 0 ? void 0 : marketplacePackage.packageItem) || (marketplacePackage === null || marketplacePackage === void 0 ? void 0 : marketplacePackage.orderItemList);
+                let marketplaceOrderItem;
+                newMarketplaceOrderPackage.name = result.name || marketplaceOrder.name;
+                newMarketplaceOrderPackage.packageId = marketplacePackage.packageId;
+                newMarketplaceOrderPackage.transporter = marketplacePackage.transporter;
+                newMarketplaceOrderPackage.marketplaceOrder = marketplaceOrder;
+                newMarketplaceOrderPackage.domain = domain;
+                newMarketplaceOrderPackage.marketplaceOrderPackageItems = [];
+                await tx.getRepository(marketplace_base_1.MarketplaceOrderPackage).insert(newMarketplaceOrderPackage);
+                newMarketplaceOrderPackages.push(newMarketplaceOrderPackage);
+                for (let i = 0; i < packageItems.length; i++) {
+                    let packageItem = packageItems[i];
+                    marketplaceOrderItem = marketplaceOrderItems.find(itm => {
+                        return itm.orderId == packageItem.orderItemId;
+                    });
+                    newMarketplaceOrderPackageItem.name = marketplaceOrderItem.name;
+                    newMarketplaceOrderPackageItem.qty = marketplaceOrderItem.qty;
+                    newMarketplaceOrderPackageItem.domain = domain;
+                    newMarketplaceOrderPackageItem.marketplaceOrderPackage = newMarketplaceOrderPackage;
+                    newMarketplaceOrderPackageItem.marketplaceOrderItem = marketplaceOrderItem;
+                    await tx.getRepository(marketplace_base_1.MarketplaceOrderPackageItem).insert(newMarketplaceOrderPackageItem);
+                    newMarketplaceOrderPackage.marketplaceOrderPackageItems.push(newMarketplaceOrderPackageItem);
+                }
+            }
+            marketplaceOrder.marketplaceOrderPackages = newMarketplaceOrderPackages;
+            existingMarketplaceOrderPackage = (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderPackages)
+                ? marketplaceOrder.marketplaceOrderPackages
+                : [];
+        }
+        if (releaseGood.orderPackages.length <= 0) {
+            for (let i = 0; i < existingMarketplaceOrderPackage.length; i++) {
+                let mop = existingMarketplaceOrderPackage[i];
+                let mopi = mop.marketplaceOrderPackageItems;
+                orderPackage.name = sales_base_1.OrderNoGenerator.orderPackage();
+                orderPackage.packageId = mop === null || mop === void 0 ? void 0 : mop.packageId;
+                orderPackage.transporter = null;
+                orderPackage.airwaybill = null;
+                orderPackage.status = sales_base_1.ORDER_STATUS.PROCESSING;
+                orderPackage.releaseGood = releaseGood;
+                orderPackage.domain = releaseGood.domain;
+                orderPackage.bizplace = releaseGood.bizplace;
+                orderPackage.creator = releaseGood.creator;
+                orderPackage.updater = releaseGood.updater;
+                orderPackage.orderPackageItems = [];
+                await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
+                newOrderPackages.push(orderPackage);
+                for (let j = 0; j < (mopi === null || mopi === void 0 ? void 0 : mopi.length); j++) {
+                    let productVariation = mopi[j].marketplaceOrderItem.marketplaceProductVariation;
+                    let matchedOrderProduct = releaseGood.orderProducts.find(op => op.product.sku == productVariation.sku);
+                    orderPackageItem.name = sales_base_1.OrderNoGenerator.orderPackageItem();
+                    orderPackageItem.orderProduct = matchedOrderProduct;
+                    orderPackageItem.status = sales_base_1.ORDER_STATUS.PROCESSING;
+                    orderPackageItem.orderPackage = orderPackage;
+                    orderPackageItem.releaseQty = matchedOrderProduct.releaseQty;
+                    orderPackageItem.domain = releaseGood.domain;
+                    orderPackageItem.bizplace = releaseGood.bizplace;
+                    orderPackageItem.creator = releaseGood.creator;
+                    orderPackageItem.updater = releaseGood.updater;
+                    orderPackageItem.productDetail = matchedOrderProduct === null || matchedOrderProduct === void 0 ? void 0 : matchedOrderProduct.productDetail;
+                    await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItem);
+                    orderPackage.orderPackageItems.push(orderPackageItem);
+                }
+                releaseGood.orderPackages = newOrderPackages;
+            }
+        }
+        return releaseGood;
+    }
+    catch (e) {
+        env_1.logger.error(`mmsPackMarketplaceOrder: ${e}`);
+        throw e;
+    }
+}
+exports.mmsPackMarketplaceOrder = mmsPackMarketplaceOrder;
+async function mmsRTSMarketplaceOrder(mop, tx, domain) {
+    try {
+        // const { tx } = context.state
+        let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+            where: {
+                id: mop.id
+            },
+            relations: [
+                'marketplaceStore',
+                'marketplaceOrderPackages',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems.marketplaceOrderItem',
+                'marketplaceOrderPackages.marketplaceOrderPackageItems.marketplaceOrderItem.marketplaceProductVariation',
+                'marketplaceOrderItems',
+                'marketplaceOrderItems.marketplaceProductVariation'
+            ]
+        });
+        let marketplaceStore = marketplaceOrder.marketplaceStore;
+        let marketplaceOrderPackages = marketplaceOrder.marketplaceOrderPackages;
+        let platform = marketplaceStore.platform;
+        if ((marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceOrderPackages.length) > 0) {
+            switch (platform) {
+                case 'shopee':
+                    await rtsShopeeOrder(marketplaceOrder, marketplaceOrderPackages, tx, domain);
+                    break;
+                case 'lazada':
+                    await rtsLazadaOrder(marketplaceOrder, marketplaceOrderPackages, tx, domain);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return true;
+    }
+    catch (e) {
+        env_1.logger.error(`mmsRTSMarketplaceOrder[main]: ${e}`);
+        throw e;
+    }
+}
+exports.mmsRTSMarketplaceOrder = mmsRTSMarketplaceOrder;
+async function rtsShopeeOrder(marketplaceOrder, marketplaceOrderPackages, tx, domain) {
+    await Promise.all(marketplaceOrderPackages.map(async (marketplaceOrderPackage) => {
+        try {
+            let deliveryType = {};
+            let store = marketplaceOrder.marketplaceStore;
+            let isMultipackage = marketplaceOrderPackages.length > 1 ? true : false;
+            // call api to know delivery type
+            let shippingParams = await integration_marketplace_1.StoreAPI.getLogisticsParam(store, { orderNo: marketplaceOrder.name, packageId: marketplaceOrderPackage.packageId, isMultipackage }, tx);
+            //let shippingType = shippingParams?.infoNeeded
+            let shippingDetail = shippingParams === null || shippingParams === void 0 ? void 0 : shippingParams.logisticsDetail;
+            if (shippingParams === null || shippingParams === void 0 ? void 0 : shippingParams.pickup) {
+                deliveryType = {
+                    pickup: {
+                        addressId: shippingDetail.addressId,
+                        branchId: shippingDetail.branchId
+                    }
+                };
+            }
+            else if (shippingParams === null || shippingParams === void 0 ? void 0 : shippingParams.non_integrated) {
+                deliveryType = {
+                    non_integrated: {
+                        trackingNo: marketplaceOrderPackage.trackingNo
+                    }
+                };
+            }
+            else if (shippingParams === null || shippingParams === void 0 ? void 0 : shippingParams.dropoff) {
+                deliveryType = {
+                    dropoff: (shippingDetail === null || shippingDetail === void 0 ? void 0 : shippingDetail.branchId)
+                        ? {
+                            branchId: shippingDetail.branchId
+                        }
+                        : {}
+                };
+            }
+            await integration_marketplace_1.StoreAPI.initLogistics(marketplaceOrder.marketplaceStore, {
+                deliveryType,
+                orderNo: marketplaceOrder.orderNo,
+                packageId: marketplaceOrderPackage.packageId,
+                isMultipackage
+            });
+            await tx
+                .getRepository(sales_base_1.OrderPackage)
+                .update({ packageId: marketplaceOrderPackage.packageId, domain: { id: domain.id } }, { marketRtsCallSuccess: new Date() });
+        }
+        catch (e) {
+            env_1.logger.error(`mmsRTSMarketplaceOrder[shopee]: ${e}`);
+            throw e;
+        }
+    }));
+}
+async function rtsLazadaOrder(marketplaceOrder, marketplaceOrderPackages, tx, domain) {
+    const packages = marketplaceOrderPackages.map(item => {
+        return { packageId: item.packageId };
+    });
+    const packageIds = marketplaceOrderPackages.map(item => item.packageId);
+    try {
+        await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceOrder.marketplaceStore, { packages });
+        await tx
+            .getRepository(sales_base_1.OrderPackage)
+            .update({ packageId: (0, typeorm_1.In)(packageIds), domain: { id: domain.id } }, { marketRtsCallSuccess: new Date() });
+    }
+    catch (e) {
+        env_1.logger.error(`mmsRTSMarketplaceOrder[lazada]: ${e}`);
+        throw e;
+    }
+}
 //# sourceMappingURL=generate-release-good-worksheet.js.map

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/index.js CHANGED Viewed

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mutation = exports.Query = void 0;
 const batch_picking_worksheet_1 = require("./batch-picking-worksheet");
+const cancel_arrival_notice_1 = require("./cancel-arrival-notice");
 const cancel_draft_release_order_1 = require("./cancel-draft-release-order");
 const cancel_replenishment_1 = require("./cancel-replenishment");
 const check_inventory_release_1 = require("./check-inventory-release");
@@ -10,8 +11,8 @@ const confirm_cancellation_release_order_1 = require("./confirm-cancellation-rel
 const create_worksheet_1 = require("./create-worksheet");
 const cross_dock_picking_1 = require("./cross-dock-picking");
 const cycle_count_adjustment_1 = require("./cycle-count-adjustment");
-const cycle_count_worksheet_for_pallet_1 = require("./cycle-count-worksheet-for-pallet");
 const cycle_count_worksheet_for_carton_1 = require("./cycle-count-worksheet-for-carton");
+const cycle_count_worksheet_for_pallet_1 = require("./cycle-count-worksheet-for-pallet");
 const delete_worksheet_1 = require("./delete-worksheet");
 const delivery_order_by_worksheet_1 = require("./delivery-order-by-worksheet");
 const fetch_delivery_order_ro_1 = require("./fetch-delivery-order-ro");
@@ -43,6 +44,7 @@ const putaway_return_1 = require("./putaway-return");
 const putaway_returning_worksheet_1 = require("./putaway-returning-worksheet");
 const putaway_worksheet_1 = require("./putaway-worksheet");
 const recommend_putway_location_1 = require("./recommend-putway-location");
+const refresh_active_worksheet_picking_views_1 = require("./refresh-active-worksheet-picking-views");
 const reject_cancellation_release_order_1 = require("./reject-cancellation-release-order");
 const replace_picking_pallets_1 = require("./replace-picking-pallets");
 const replenishment_1 = require("./replenishment");
@@ -67,7 +69,6 @@ const worksheet_1 = require("./worksheet");
 const worksheet_by_order_no_1 = require("./worksheet-by-order-no");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
 const worksheets_1 = require("./worksheets");
-const refresh_active_worksheet_picking_views_1 = require("./refresh-active-worksheet-picking-views");
 exports.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(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(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, refresh_active_worksheet_picking_views_1.refreshActiveWorksheetPickingViews), worksheets_1.worksheetsResolver), worksheet_1.worksheetResolver), unloading_worksheet_1.unloadingWorksheetResolver), unloading_return_worksheet_1.unloadingReturnWorksheetResolver), delivery_order_by_worksheet_1.deliveryOrderByWorksheetResolver), packing_worksheet_1.packingWorksheetResolver), get_packing_list_1.packingListResolver), putaway_worksheet_1.putawayWorksheetResolver), putaway_returning_worksheet_1.putawayReturningWorksheetResolver), return_worksheet_1.returnWorksheetResolver), picking_worksheet_1.pickingWorksheetResolver), cycle_count_worksheet_for_pallet_1.cycleCountWorksheetForPalletResolver), cycle_count_worksheet_for_carton_1.cycleCountWorksheetForCartonResolver), vas_worksheet_1.vasWorksheetResolver), loading_worksheet_1.loadingWorksheetResolver), unloaded_inventories_1.unloadedInventories), unloaded_inventories_by_reusable_pallet_1.unloadedInventoriesByReusablePallet), loaded_inventories_1.loadedInventories), vas_candidates_1.vasCandidatesResolver), inventories_by_pallet_1.inventoriesByPalletResolver), batch_picking_worksheet_1.batchPickingWorksheetResolver), check_stock_take_current_location_1.checkStockTakeCurrentLocationResolver), check_inventory_release_1.checkInventoryReleaseResolver), vas_transactions_1.checkRelabelableResolver), having_vas_1.havingVasResolver), worksheet_by_order_no_1.worksheetByOrderNoResolver), worksheet_with_pagination_1.worksheetWithPaginationResolver), not_tally_target_inventories_1.notTallyTargetInventoriesResolver), vas_inventories_1.vasInventories), picking_assignment_status_by_user_1.pickingAssignmentStatusByUsersResolver), my_picking_assignment_status_1.myPickingAssignmentStatusResolver), recommend_putway_location_1.recommendPutawayLocationResolver), sorting_worksheet_1.sortingWorksheetResolver), find_sorting_release_orders_by_task_no_1.findSortingReleaseOrdersByTaskNoResolver), find_release_orders_by_task_no_1.findReleaseOrdersByTaskNoResolver), fetch_delivery_order_ro_1.fetchDeliveryOrderROResolver), putaway_replenishment_worksheet_1.putawayReplenishmentWorksheetResolver);
-exports.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(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(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_worksheet_1.Mutations), unloading_1.Mutations), sorting_1.Mutations), putaway_1.Mutations), putaway_return_1.Mutations), vas_1.Mutations), picking_1.Mutations), packing_1.Mutations), loading_1.Mutations), returning_1.Mutations), unloading_return_1.Mutations), inspecting_1.Mutations), update_worksheet_1.updateWorksheet), create_worksheet_1.createWorksheet), cycle_count_adjustment_1.cycleCountAdjustmentResolver), delete_worksheet_1.deleteWorksheet), transfer_1.transfer), proceed_extra_products_1.proceedExtraProductsResolver), replace_picking_pallets_1.replacePickingPalletsResolver), pending_cancellation_release_order_1.pendingCancellationReleaseOrder), confirm_cancellation_release_order_1.confirmCancellationReleaseOrder), reject_cancellation_release_order_1.rejectCancellationReleaseOrder), vas_transactions_1.repalletizingResolver), vas_transactions_1.undoRepalletizingResolver), vas_transactions_1.repackagingResolver), vas_transactions_1.undoRepackagingResolver), vas_transactions_1.relabelingResolver), vas_transactions_1.undoRelabelingResolver), cross_dock_picking_1.crossDockPickingResolver), vas_transactions_1.unpackingResolver), palletizing_pallets_1.palletizingPallets), fetch_sellercraft_document_1.fetchSellercraftDocumentResolver), fetch_powrup_document_1.fetchPowrupDocumentResolver), cancel_draft_release_order_1.cancelDraftReleaseOrder), cancel_replenishment_1.cancelReplenishment), replenishment_1.Mutations);
+exports.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(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(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_worksheet_1.Mutations), unloading_1.Mutations), sorting_1.Mutations), putaway_1.Mutations), putaway_return_1.Mutations), vas_1.Mutations), picking_1.Mutations), packing_1.Mutations), loading_1.Mutations), returning_1.Mutations), unloading_return_1.Mutations), inspecting_1.Mutations), update_worksheet_1.updateWorksheet), create_worksheet_1.createWorksheet), cycle_count_adjustment_1.cycleCountAdjustmentResolver), delete_worksheet_1.deleteWorksheet), transfer_1.transfer), proceed_extra_products_1.proceedExtraProductsResolver), replace_picking_pallets_1.replacePickingPalletsResolver), pending_cancellation_release_order_1.pendingCancellationReleaseOrder), confirm_cancellation_release_order_1.confirmCancellationReleaseOrder), reject_cancellation_release_order_1.rejectCancellationReleaseOrder), vas_transactions_1.repalletizingResolver), vas_transactions_1.undoRepalletizingResolver), vas_transactions_1.repackagingResolver), vas_transactions_1.undoRepackagingResolver), vas_transactions_1.relabelingResolver), vas_transactions_1.undoRelabelingResolver), cross_dock_picking_1.crossDockPickingResolver), vas_transactions_1.unpackingResolver), palletizing_pallets_1.palletizingPallets), fetch_sellercraft_document_1.fetchSellercraftDocumentResolver), fetch_powrup_document_1.fetchPowrupDocumentResolver), cancel_draft_release_order_1.cancelDraftReleaseOrder), cancel_replenishment_1.cancelReplenishment), replenishment_1.Mutations), cancel_arrival_notice_1.cancelArrivalNoticeResolver);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/worksheet/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,6EAAsE;AACtE,iEAA4D;AAC5D,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,yFAAyF;AACzF,yFAAyF;AACzF,yDAAoD;AACpD,+EAAgF;AAChF,uEAAwE;AACxE,mEAAqE;AACrE,6EAA+E;AAC/E,qFAAoF;AACpF,qGAAmG;AACnG,6DAA8E;AAC9E,yDAAwD;AACxD,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,uFAAyF;AACzF,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,2FAAoF;AACpF,uEAAyE;AACzE,mDAAqE;AACrE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;~~AACjD~~,~~qGAA6F;AAEhF,~~QAAA,KAAK,2hBACb,2EAAkC,GAClC,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,sCAAmB,GACnB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,uEAAoC,GACpC,uEAAoC,GACpC,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,iFAAwC,GACxC,kEAAiC,GACjC,sDAA4B,GAC5B,uEAAqC,EACzC;AAEY,QAAA,QAAQ~~,+fAChB~~,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,6DAAgC,GAChC,mDAA2B,GAC3B,oDAAuB,GACvB,0CAAmB,GACnB,yBAAsB,~~EAC1B~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,mEAAqE;AACrE,6EAAsE;AACtE,iEAA4D;AAC5D,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,yFAAyF;AACzF,yFAAyF;AACzF,yDAAoD;AACpD,+EAAgF;AAChF,uEAAwE;AACxE,mEAAqE;AACrE,6EAA+E;AAC/E,qFAAoF;AACpF,qGAAmG;AACnG,6DAA8E;AAC9E,yDAAwD;AACxD,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,uFAAyF;AACzF,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,qGAA6F;AAC7F,2FAAoF;AACpF,uEAAyE;AACzE,mDAAqE;AACrE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;AAEpC,QAAA,KAAK,2hBACb,2EAAkC,GAClC,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,sCAAmB,GACnB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,uEAAoC,GACpC,uEAAoC,GACpC,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,iFAAwC,GACxC,kEAAiC,GACjC,sDAA4B,GAC5B,uEAAqC,EACzC;AAEY,QAAA,QAAQ,6gBAChB,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,6DAAgC,GAChC,mDAA2B,GAC3B,oDAAuB,GACvB,0CAAmB,GACnB,yBAAsB,GACtB,mDAA2B,EAC/B"}

package/dist-server/graphql/types/worksheet/index.js CHANGED Viewed

@@ -681,7 +681,11 @@ exports.Mutation = `
   cancelReplenishment (
     name: String!
   ): Boolean @transaction
-`;
+  cancelArrivalNotice (
+    name: String!
+  ): Boolean @transaction
+  `;
 exports.Query = `
   worksheets (
     filters: [Filter],

package/dist-server/graphql/types/worksheet/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,iDAA4C;AAC5C,2EAAqE;AACrE,uDAAkD;AAClD,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0oBrC,CAAA;~~AAEY~~,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwKlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,0BAAW;IACX,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,iDAA4C;AAC5C,2EAAqE;AACrE,uDAAkD;AAClD,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8oBnC,CAAA;AAEU,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwKlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,0BAAW;IACX,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}

package/dist-server/utils/lmd-util.js CHANGED Viewed

@@ -86,7 +86,9 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
                 if ((lmd === null || lmd === void 0 ? void 0 : lmd.platform) == 'CITYLINK') {
                     const currentDate = new Date();
                     let expiredDate = new Date(lmd === null || lmd === void 0 ? void 0 : lmd.expiresIn);
-                    if (currentDate > expiredDate) {
+                    // Calculate the renewal date as 2 days before the expiry date
+                    const renewalDate = new Date(expiredDate.getTime() - 2 * 24 * 60 * 60 * 1000);
+                    if (currentDate >= renewalDate) {
                         let lastMileDelivery = await (0, integration_lmd_1.getAccessTokenCityLink)(lmd === null || lmd === void 0 ? void 0 : lmd.id, { state: { tx } });
                         lmd.accessToken = lastMileDelivery.accessToken;
                     }
@@ -94,7 +96,7 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
                 }
                 if ((lmd === null || lmd === void 0 ? void 0 : lmd.platform) == 'NINJA_VAN') {
                     const currentTimestamp = Math.floor(Date.now() / 1000);
-                    const renewalTimestamp = (lmd === null || lmd === void 0 ? void 0 : lmd.expiresIn) - 2 * 60 * 60;
+                    const renewalTimestamp = (lmd === null || lmd === void 0 ? void 0 : lmd.expiresIn) - 12 * 60 * 60; // Renew 12 hr before expiry
                     if (currentTimestamp >= renewalTimestamp) {
                         const lastMileDelivery = await (0, integration_lmd_1.refreshAccessTokenNinjavan)(lmd === null || lmd === void 0 ? void 0 : lmd.id, { state: { tx } });
                         lmd.accessToken = lastMileDelivery.accessToken;
@@ -137,7 +139,7 @@ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder)
                     address2: releaseGood.deliveryAddress2,
                     address3: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3,
                     ward: (_c = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.ward) === null || _c === void 0 ? void 0 : _c.toUpperCase(),
-                    city: (_d = releaseGood.city) === null || _d === void 0 ? void 0 : _d.toUpperCase(),
+                    city: lmd.platform == 'CITYLINK' ? ' ' : (_d = releaseGood.city) === null || _d === void 0 ? void 0 : _d.toUpperCase(),
                     postcode: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.postalCode,
                     district: ((_e = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.district) === null || _e === void 0 ? void 0 : _e.toUpperCase()) || ((_f = releaseGood.city) === null || _f === void 0 ? void 0 : _f.toUpperCase()),
                     state: ((_g = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) === null || _g === void 0 ? void 0 : _g.toUpperCase()) ||