npm - @things-factory/sales-base - Versions diffs - 3.6.13 → 3.6.21 - Mend

@things-factory/sales-base 3.6.13 → 3.6.21

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 (25) hide show

package/dist-server/controllers/ecommerce/sellercraft-controller.js CHANGED Viewed

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SellercraftController = void 0;
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
+const entities_1 = require("../../entities");
 const order_controller_1 = require("../order-controller");
 class SellercraftController extends order_controller_1.OrderController {
     async packOrder(sellercraft, releaseGood) {
@@ -25,6 +26,14 @@ class SellercraftController extends order_controller_1.OrderController {
         releaseGood.updater = this.user;
         return releaseGood;
     }
+    async checkExistingReleaseGood(sellercraft, releaseGood) {
+        const { refNo, collectionOrderNo } = releaseGood;
+        const foundReleaseGood = await this.trxMgr.getRepository(entities_1.ReleaseGood).findOne({
+            where: { domain: sellercraft.domain, refNo, collectionOrderNo }
+        });
+        if (foundReleaseGood)
+            throw new Error('Existing release order found, kindly use update release order API if you tend to update the order information');
+    }
 }
 exports.SellercraftController = SellercraftController;
 //# sourceMappingURL=sellercraft-controller.js.map

package/dist-server/controllers/ecommerce/sellercraft-controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;~~AAIrF~~,0DAAqD;AAErD,MAAa,qBAAsB,SAAQ,kCAAe;IACxD,KAAK,CAAC,SAAS,CAAC,WAAwB,EAAE,WAAwB;QAChE,MAAM,aAAa,GAAmB,WAAW,CAAC,aAAa,CAAA;QAC/D,IAAI,cAAc,GAAU,EAAE,CAAA;QAE9B,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAChD,MAAM,OAAO,GAAY,YAAY,CAAC,OAAO,CAAA;YAE7C,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,GAAG,EAAE,IAAI;aACV,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,iBAAiB;YACtC,cAAc;SACf,CAAA;QACD,MAAM,SAAS,GAAW,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,oBAAO,gBAAgB,EAAG,CAAA;QAEzG,WAAW,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,OAAO,WAAW,CAAA;IACpB,CAAC;CACF;~~AA1BD~~,~~sDA0BC~~"}
1	+ {"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;AAGrF,6CAA0D;AAC1D,0DAAqD;AAErD,MAAa,qBAAsB,SAAQ,kCAAe;IACxD,KAAK,CAAC,SAAS,CAAC,WAAwB,EAAE,WAAwB;QAChE,MAAM,aAAa,GAAmB,WAAW,CAAC,aAAa,CAAA;QAC/D,IAAI,cAAc,GAAU,EAAE,CAAA;QAE9B,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YAChD,MAAM,OAAO,GAAY,YAAY,CAAC,OAAO,CAAA;YAE7C,OAAO;gBACL,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,GAAG,EAAE,IAAI;aACV,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAQ;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,iBAAiB;YACtC,cAAc;SACf,CAAA;QACD,MAAM,SAAS,GAAW,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,oBAAO,gBAAgB,EAAG,CAAA;QAEzG,WAAW,CAAC,SAAS,GAAG,SAAS,CAAA;QACjC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QAC/B,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,WAAwB,EAAE,WAAwB;QAC/E,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAA;QAChD,MAAM,gBAAgB,GAAgB,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;YACzF,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,gBAAgB;YAClB,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAA;IACL,CAAC;CACF;AAtCD,sDAsCC"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js CHANGED Viewed

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticeRequestsResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeRequestsResolver = {
@@ -28,23 +28,46 @@ exports.arrivalNoticeRequestsResolver = {
                     relation: false
                 });
             }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
+                    relation: false
+                });
+            }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    relation: false
+                });
+            }
             const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
             (0, shell_1.buildQuery)(qb, params, context);
-            qb.addSelect(subQuery => {
-                return subQuery
-                    .select('COALESCE("ccd".rank, 99999)', 'rank')
-                    .from('common_code_details', 'ccd')
-                    .innerJoin('ccd.commonCode', 'cc')
-                    .where('"ccd"."name" = "an"."status"')
-                    .andWhere('"ccd"."domain_id" = "an"."domain_id"')
-                    .andWhere('"cc"."name" = \'ORDER_STATUS\'');
-            }, 'rank');
+            qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
             qb.leftJoinAndSelect('an.domain', 'domain');
             qb.leftJoinAndSelect('an.bizplace', 'bizplace');
-            qb.leftJoinAndSelect('an.releaseGood', 'rg');
+            qb.leftJoinAndSelect('an.releaseGood', 'ro');
             qb.leftJoinAndSelect('an.creator', 'creator');
             qb.leftJoinAndSelect('an.updater', 'updater');
-            qb.leftJoinAndSelect('an.acceptedBy', 'acceptedBy');
+            qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'ORDER_STATUS'`);
+            }, 'cc', 'cc.status = an.status');
             const arrChildSortData = ['bizplace'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc
                     ? 'DESC'

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":";;;~~AACA~~,uDAAkE;AAClE,iDAAqE;~~AACrE~~,~~qCAA2D;AAC3D,~~kDAAiD;AACjD,gDAAiD;AAEpC,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACjE,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;YACtE,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAClE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;YAEhF,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,OAAO;oBACjB,KAAK,EAAE,CAAC,wBAAY,CAAC,OAAO,EAAE,wBAAY,CAAC,OAAO,CAAC;oBACnD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;oBAClD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,~~EAAE~~,~~GAAsC~~,~~IAAA~~,~~uBAAa~~,~~EAAC~~,~~wBAAa~~,CAAC,CAAC,~~kBAAkB~~,CAAC,IAAI,CAAC,CAAA;~~YACnG~~,~~IAAA~~,~~kBAAU~~,~~EAAC~~,~~EAAE~~,EAAE,MAAM,~~EAAE~~,OAAO,CAAC,CAAA;~~YAC/B~~,~~EAAE~~,CAAC,~~SAAS~~,CAAC,~~QAAQ~~,CAAC,EAAE~~;gBACtB~~,~~OAAO~~,~~QAAQ~~;~~qBACZ~~,MAAM,CAAC,~~6BAA6B~~,~~EAAE~~,~~MAAM~~,CAAC;~~qBAC7C~~,IAAI,CAAC,~~qBAAqB~~,EAAE,KAAK,CAAC;~~qBAClC~~,SAAS,CAAC,~~gBAAgB~~,EAAE,IAAI,CAAC;~~qBACjC~~,KAAK,CAAC,~~8BAA8B~~,CAAC;~~qBACrC~~,QAAQ,CAAC,~~sCAAsC~~,CAAC;~~qBAChD~~,QAAQ,CAAC,~~gCAAgC~~,CAAC,CAAA;YAC/C,CAAC,EAAE,MAAM,CAAC,CAAA;~~YACV~~,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAC/C,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;YAC5C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,eAAe,EAAE,~~YAAY~~,CAAC,CAAA;~~YAEnD~~,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,iCACV,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI;oBAC7F,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,KAAK,IACT,EACF,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACvE,CAAA;YAED,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEhB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YAEjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js CHANGED Viewed

@@ -1,19 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticesResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticesResolver = {
     async arrivalNotices(_, params, context) {
         const { domain, user } = context.state;
-        const convertedParams = (0, shell_1.convertListParams)(params);
         if (!params.filters.find((filter) => filter.name === 'bizplace')) {
-            convertedParams.where.bizplace = (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user));
-            convertedParams.where.domain = domain;
+            params.filters.push({
+                name: 'bizplaceId',
+                operator: 'in',
+                value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                relation: false
+            });
+        }
+        const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+        if (fromDateParamIdx >= 0) {
+            let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+            params.filters.splice(fromDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'gte',
+                value: fromDateVal.toISOString(),
+                relation: false
+            });
+        }
+        const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+        if (toDateParamIdx >= 0) {
+            let toDateVal = new Date(params.filters[toDateParamIdx].value);
+            params.filters.splice(toDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'lt',
+                value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                relation: false
+            });
         }
-        const [items, total] = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'creator', 'updater', 'acceptedBy'] }));
+        const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
+        (0, shell_1.buildQuery)(qb, params, context);
+        qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
+        qb.leftJoinAndSelect('an.domain', 'domain');
+        qb.leftJoinAndSelect('an.bizplace', 'bizplace');
+        qb.leftJoinAndSelect('an.releaseGood', 'ro');
+        qb.leftJoinAndSelect('an.creator', 'creator');
+        qb.leftJoinAndSelect('an.updater', 'updater');
+        qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+        qb.leftJoin(subQuery => {
+            return subQuery
+                .select(`ccd.rank`, 'rank')
+                .addSelect(`ccd.name`, 'status')
+                .from(`common_code_details`, 'ccd')
+                .innerJoin(`ccd.commonCode`, 'cc')
+                .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                .andWhere(`cc.name = 'ORDER_STATUS'`);
+        }, 'cc', 'cc.status = an.status');
+        const arrChildSortData = ['bizplace'];
+        const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
+        qb.orderBy(sort);
+        const [items, total] = await qb.getManyAndCount();
         return { items, total };
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":";;;~~AACA~~,uDAAkE;AAClE,~~iDAA4E~~;~~AAC5E~~,~~qCAA2C;AAC3C,~~gDAAiD;AAEpC,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC1D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,~~eAAe~~,~~GAAG~~,IAAA,~~yBAAiB~~,EAAC,MAAM,CAAC,CAAA;~~QAEjD~~,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,~~MAAW~~,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,~~UAAU~~,CAAC,EAAE;~~YACrE~~,~~eAAe~~,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAA,~~YAAE~~,EAAC,~~MAAM~~,IAAA,~~kCAAuB~~,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;~~YAChF~~,eAAe,CAAC,~~KAAK~~,CAAC,MAAM,~~GAAG~~,MAAM,~~CAAA~~;~~SACtC~~;~~QAED~~,~~MAAM~~,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,~~IAAA~~,~~uBAAa~~,~~EAAC~~,~~wBAAa~~,CAAC,CAAC,~~YAAY~~,~~iCACjE~~,~~eAAe~~,~~KAClB~~,~~SAAS~~,EAAE,CAAC,QAAQ,EAAE,~~UAAU~~,EAAE,~~aAAa~~,EAAE,~~eAAe~~,EAAE,~~WAAW~~,EAAE,~~SAAS~~,EAAE,~~SAAS~~,EAAE,~~YAAY~~,CAAC,~~IAClH~~,CAAA;~~QAEF~~,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js CHANGED Viewed

@@ -34,23 +34,31 @@ exports.deliveryOrdersResolver = {
                     });
                 }
             }
-            const fromDateParam = params.filters.find(param => param.name === 'fromDate');
-            if (fromDateParam) {
-                params.filters.splice(params.filters.findIndex(item => item.name == 'fromDate'), 1);
+            const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset');
+            let tzOffset = 0;
+            if (tzOffsetIdx >= 0) {
+                tzOffset = params.filters[tzOffsetIdx].value;
+                params.filters.splice(tzOffsetIdx, 1);
+            }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
                 params.filters.push({
-                    name: 'deliveryDate',
+                    name: 'createdAt',
                     operator: 'gte',
-                    value: fromDateParam.value,
+                    value: fromDateVal.toISOString(),
                     relation: false
                 });
             }
-            const toDateParam = params.filters.find(param => param.name === 'toDate');
-            if (toDateParam) {
-                params.filters.splice(params.filters.findIndex(item => item.name == 'toDate'), 1);
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
                 params.filters.push({
-                    name: 'deliveryDate',
-                    operator: 'lte',
-                    value: toDateParam.value,
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
                     relation: false
                 });
             }

package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,uDAAkE;AAClE,iDAAwF;AAExF,gDAA8D;AAE9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,2CAA2C,CAAC,CAAA;AAE9D,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC1D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;YAEtE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;YAChF,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;oBAClD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;YACrF,IAAI,gBAAgB,EAAE;gBACpB,IAAI,UAAU,GAAG,EAAE,CAAA;gBACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CACnB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,EAC9D,CAAC,CACF,CAAA;gBACD,UAAU,CAAC,IAAI,iCAAM,gBAAgB,KAAE,IAAI,EAAE,MAAM,IAAG,CAAA;gBAEtD,MAAM,iBAAiB,GAAkB,MAAM,IAAA,uBAAa,EAAC,sBAAW,CAAC,CAAC,IAAI,mBACzE,IAAA,yBAAiB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAC7C,CAAA;gBAEF,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,EAAE;oBACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClB,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE,IAAI;wBACd,KAAK,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC1E,QAAQ,EAAE,KAAK;qBAChB,CAAC,CAAA;iBACH;aACF;YAED,MAAM,~~aAAa~~,GAAG,MAAM,CAAC,OAAO,CAAC,~~IAAI~~,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;~~YAC7E~~,IAAI,~~aAAa~~,EAAE;~~gBACjB~~,MAAM,CAAC,OAAO,CAAC,MAAM,~~CACnB~~,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,~~IAAI~~,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,~~UAAU~~,CAAC,~~EACzD~~,CAAC,~~CACF~~,CAAA;~~gBACD~~,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,~~cAAc~~;~~oBACpB~~,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE,~~aAAa~~,CAAC,~~KAAK~~;~~oBAC1B~~,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YACD,MAAM,~~WAAW~~,GAAG,MAAM,CAAC,OAAO,CAAC,~~IAAI~~,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;~~YACzE~~,IAAI,~~WAAW~~,EAAE;~~gBACf~~,~~MAAM~~,~~CAAC~~,~~OAAO~~,~~CAAC~~,~~MAAM~~,~~CACnB~~,MAAM,CAAC,OAAO,CAAC,~~SAAS~~,CAAC,~~IAAI,~~CAAC,~~EAAE~~,CAAC,~~IAAI~~,CAAC,~~IAAI~~,~~IAAI~~,~~QAAQ~~,CAAC,~~EACvD~~,CAAC,~~CACF~~,CAAA;~~gBACD~~,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,~~cAAc~~;~~oBACpB~~,QAAQ,EAAE,~~KAAK~~;~~oBACf~~,KAAK,EAAE,~~WAAW~~,CAAC,~~KAAK~~;~~oBACxB~~,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,EAAE,GAAQ,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;YACrE,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC/B,EAAE,CAAC,SAAS,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAA;YAClD,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAC/C,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;YAC5C,EAAE,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAA;YAChD,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;YACjD,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,QAAQ,CACT,QAAQ,CAAC,EAAE;gBACT,OAAO,QAAQ;qBACZ,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;qBAC1B,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC;qBAC/B,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC;qBAClC,SAAS,CAAC,gBAAgB,EAAE,IAAI,CAAC;qBACjC,KAAK,CAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;qBAC3D,QAAQ,CAAC,6BAA6B,CAAC,CAAA;YAC5C,CAAC,EACD,IAAI,EACJ,uBAAuB,CACxB,CAAA;YAED,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;YACpD,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,iCACV,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI;oBAC7F,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,KAAK,IACT,EACF,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACvE,CAAA;YAED,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAChB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YAEjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;YACzC,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}

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

@@ -34,6 +34,7 @@ async function confirmReleaseGood(name, context, tx) {
         relations: [
             'domain',
             'bizplace',
+            'bizplace.domain',
             'bizplace.company',
             'bizplace.company.domain',
             'orderProducts',
@@ -52,7 +53,7 @@ async function confirmReleaseGood(name, context, tx) {
     if (foundReleaseGood.type == 'b2c') {
         const sellercraft = await tx
             .getRepository(integration_sellercraft_1.Sellercraft)
-            .findOne({ domain: foundReleaseGood.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+            .findOne({ domain: foundReleaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
         if (sellercraft) {
             const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
             foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":";;;AAEA,yDAAsD;AAEtD,qFAA0E;AAC1E,qFAAwF;AACxF,+DAA+D;AAG/D,kDAA2F;AAC3F,sDAAiF;AACjF,gDAAyE;AACzE,qFAAuF;AAE1E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACrD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QACnD,MAAM,WAAW,GAAgB,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;QAE5E,kCAAkC;QAClC,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE;gBACpF,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;YAEF,wFAAwF;YACxF,IAAI,aAAa,CAAC,MAAM,KAAK,wBAAY,CAAC,eAAe,EAAE;gBACzD,MAAM,IAAA,qDAA4B,EAAC,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;aACpE;SACF;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CAAC,IAAY,EAAE,OAAY,EAAE,EAAkB;;IACrF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;IAEtE,IAAI,gBAAgB,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;QAC9E,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,wBAAY,CAAC,OAAO,EAAE;QAC7C,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,kBAAkB;YAClB,yBAAyB;YACzB,eAAe;YACf,uBAAuB;YACvB,kBAAkB;YAClB,0BAA0B;YAC1B,WAAW;SACZ;KACF,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IAC5E,IAAI,QAAQ,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;IAClE,IAAI,QAAQ,GAAe,gBAAgB,CAAC,SAAS,CAAA;IACrD,IAAI,gBAAgB,GAAa,gBAAgB,CAAC,QAAQ,CAAA;IAC1D,MAAM,aAAa,GAAW,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,CAAC,MAAM,CAAA;IAE9D,IAAI,gBAAgB,CAAC,IAAI,IAAI,KAAK,EAAE;QAClC,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;~~QAEjF~~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~~AAjHD~~,~~gDAiHC~~"}
1	+ {"version":3,"file":"confirm-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/confirm-release-good.ts"],"names":[],"mappings":"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"}

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

@@ -6,12 +6,14 @@ const attachment_base_1 = require("@things-factory/attachment-base");
 const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
+const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const product_base_1 = require("@things-factory/product-base");
 const setting_base_1 = require("@things-factory/setting-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const attachment_type_1 = require("../../../constants/attachment-type");
 const order_1 = require("../../../constants/order");
+const controllers_1 = require("../../../controllers");
 const entities_1 = require("../../../entities");
 const utils_1 = require("../../../utils");
 const order_no_generator_1 = require("../../../utils/order-no-generator");
@@ -74,6 +76,15 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         /** Validate Release Order Product Quantity */
         await utils_1.InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx);
         /** End Validate Release Order Product Quantity Section */
+        if (releaseGood.type == 'b2c') {
+            const sellercraft = await tx
+                .getRepository(integration_sellercraft_1.Sellercraft)
+                .findOne({ domain: bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+            if (sellercraft) {
+                const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+                await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood);
+            }
+        }
         let newReleaseGood = new entities_1.ReleaseGood();
         /** Generate Shipping Order */
         if (shippingOrder) {
@@ -102,10 +113,10 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
                 throw new Error(`Failed to find GAN (${releaseGood.ganNo}) for cross docking`);
             newReleaseGood.arrivalNotice = crossDockingGAN;
         }
-        let createdReleaseGood = await tx.getRepository(entities_1.ReleaseGood).save(newReleaseGood);
+        newReleaseGood = await tx.getRepository(entities_1.ReleaseGood).save(newReleaseGood);
         // Make relation with RO for cross docking
-        if (createdReleaseGood.crossDocking) {
-            crossDockingGAN.releaseGood = createdReleaseGood;
+        if (newReleaseGood.crossDocking) {
+            crossDockingGAN.releaseGood = newReleaseGood;
             await tx.getRepository(entities_1.ArrivalNotice).save(crossDockingGAN);
         }
         // Check if there is bundle item in orderInventories
@@ -131,10 +142,9 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
             }));
         }
         orderInventories = [...singleProductOIs, ...splitBundleOIs];
-        let orderProducts = [];
         for (let oi of orderInventories) {
             let newOrderInv = Object.assign({}, oi);
-            newOrderInv = Object.assign(Object.assign({}, newOrderInv), { domain: warehouseDomain, bizplace: bizplace, status: order_1.ORDER_INVENTORY_STATUS.PENDING, name: order_no_generator_1.OrderNoGenerator.orderInventory(), releaseGood: createdReleaseGood, product: await tx.getRepository(product_base_1.Product).findOne(oi.product.id), creator: user, updater: user });
+            newOrderInv = Object.assign(Object.assign({}, newOrderInv), { domain: warehouseDomain, bizplace: bizplace, status: order_1.ORDER_INVENTORY_STATUS.PENDING, name: order_no_generator_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, product: await tx.getRepository(product_base_1.Product).findOne(oi.product.id), creator: user, updater: user });
             if ((_a = newOrderInv.inventory) === null || _a === void 0 ? void 0 : _a.id) {
                 const foundInv = await tx.getRepository(warehouse_base_1.Inventory).findOne(newOrderInv.inventory.id);
                 newOrderInv.inventory = foundInv;
@@ -154,7 +164,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
                 if ((_a = orderVas === null || orderVas === void 0 ? void 0 : orderVas.targetProduct) === null || _a === void 0 ? void 0 : _a.id) {
                     orderVas.targetProduct = await tx.getRepository(product_base_1.Product).findOne(orderVas.targetProduct.id);
                 }
-                let newOrderVas = Object.assign(Object.assign({}, orderVas), { domain: warehouseDomain, bizplace, name: order_no_generator_1.OrderNoGenerator.releaseVas(), vas: await tx.getRepository(entities_1.Vas).findOne(orderVas.vas.id), type: order_1.ORDER_TYPES.RELEASE_OF_GOODS, releaseGood: createdReleaseGood, status: order_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
+                let newOrderVas = Object.assign(Object.assign({}, orderVas), { domain: warehouseDomain, bizplace, name: order_no_generator_1.OrderNoGenerator.releaseVas(), vas: await tx.getRepository(entities_1.Vas).findOne(orderVas.vas.id), type: order_1.ORDER_TYPES.RELEASE_OF_GOODS, releaseGood: newReleaseGood, status: order_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
                 if ((_b = orderVas === null || orderVas === void 0 ? void 0 : orderVas.inventory) === null || _b === void 0 ? void 0 : _b.id) {
                     newOrderVas.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(orderVas.inventory.id);
                 }
@@ -166,7 +176,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
             const files = attachments.map(attachment => {
                 return {
                     file: attachment,
-                    refBy: createdReleaseGood.id,
+                    refBy: newReleaseGood.id,
                     category: attachment_type_1.ATTACHMENT_TYPE.DELIVERY_ORDER
                 };
             });
@@ -181,16 +191,16 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         // If status of create RO is PENDING then directly CONFIRM -> RECEIVE
         if (!isNaN(partnerDirectReceiveSetting === null || partnerDirectReceiveSetting === void 0 ? void 0 : partnerDirectReceiveSetting.value) &&
             !isNaN(parseFloat(partnerDirectReceiveSetting === null || partnerDirectReceiveSetting === void 0 ? void 0 : partnerDirectReceiveSetting.value)) &&
-            createdReleaseGood.status === constants_1.ORDER_STATUS.PENDING) {
+            newReleaseGood.status === constants_1.ORDER_STATUS.PENDING) {
             let partnerDirectReceiveSettingValue = parseFloat(partnerDirectReceiveSetting.value);
             // CONFIRM if setting value is > 0
             if (partnerDirectReceiveSettingValue > 0)
-                await (0, confirm_release_good_1.confirmReleaseGood)(createdReleaseGood.name, context, tx);
+                await (0, confirm_release_good_1.confirmReleaseGood)(newReleaseGood.name, context, tx);
             // RECEIVE if setting value is > 1
             if (partnerDirectReceiveSettingValue > 1)
-                await (0, receive_release_good_1.receiveReleaseGood)(createdReleaseGood.name, context, tx);
+                await (0, receive_release_good_1.receiveReleaseGood)(newReleaseGood.name, context, tx);
         }
-        return createdReleaseGood;
+        return newReleaseGood;
     }
     catch (error) {
         throw error;

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

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

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseGoodRequestsResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.releaseGoodRequestsResolver = {
     async releaseGoodRequests(_, params, context) {
         try {
+            const { domain, user } = context.state;
             const statusFilter = params.filters.some(e => e.name === 'status');
             const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
             if (!statusFilter) {
@@ -23,21 +24,35 @@ exports.releaseGoodRequestsResolver = {
                 params.filters.push({
                     name: 'bizplaceId',
                     operator: 'in',
-                    value: await (0, biz_base_1.getPermittedBizplaceIds)(context.state.domain, context.state.user),
+                    value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                    relation: false
+                });
+            }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
+                    relation: false
+                });
+            }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
                     relation: false
                 });
             }
             const qb = (0, typeorm_1.getRepository)(entities_1.ReleaseGood).createQueryBuilder('rg');
             (0, shell_1.buildQuery)(qb, params, context);
-            qb.addSelect(subQuery => {
-                return subQuery
-                    .select('COALESCE("ccd".rank, 99999)', 'rank')
-                    .from('common_code_details', 'ccd')
-                    .innerJoin('ccd.commonCode', 'cc')
-                    .where('"ccd"."name" = "rg"."status"')
-                    .andWhere('"ccd"."domain_id" = "rg"."domain_id"')
-                    .andWhere('"cc"."name" = \'RO_REQUESTS_STATUS\'');
-            }, 'rank');
+            qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
             qb.leftJoinAndSelect('rg.domain', 'domain');
             qb.leftJoinAndSelect('rg.bizplace', 'bizplace');
             qb.leftJoinAndSelect('rg.arrivalNotice', 'an');
@@ -45,6 +60,15 @@ exports.releaseGoodRequestsResolver = {
             qb.leftJoinAndSelect('rg.updater', 'updater');
             qb.leftJoinAndSelect('rg.acceptedBy', 'acceptedBy');
             qb.leftJoinAndSelect('rg.deliverTo', 'deliverTo');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'RO_REQUESTS_STATUS'`);
+            }, 'cc', 'cc.status = rg.status');
             const arrChildSortData = ['bizplace'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
                     ? 'DESC'

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

	@@ -1 +1 @@
1	- {"version":3,"file":"release-good-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-requests.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAClE,~~iDAA6D~~;~~AAC7D~~,~~qCAA2D;AAC3D,~~kDAAiD;AACjD,gDAA+C;AAElC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC/D,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAClE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;YAEhF,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,OAAO;oBACjB,KAAK,EAAE,CAAC,wBAAY,CAAC,OAAO,EAAE,wBAAY,CAAC,OAAO,CAAC;oBACnD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,IAAA,kCAAuB,EAAC,~~OAAO~~,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;~~oBAC9E~~,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,~~EAAE~~,~~GAAoC~~,~~IAAA~~,~~uBAAa~~,~~EAAC~~,~~sBAAW~~,CAAC,CAAC,~~kBAAkB~~,CAAC,IAAI,CAAC,CAAA;~~YAC/F~~,~~IAAA~~,~~kBAAU~~,~~EAAC~~,~~EAAE~~,EAAE,MAAM,~~EAAE~~,OAAO,CAAC,CAAA;~~YAC/B~~,~~EAAE~~,CAAC,~~SAAS~~,CAAC,~~QAAQ~~,CAAC,EAAE~~;gBACtB~~,~~OAAO~~,~~QAAQ~~;~~qBACZ~~,MAAM,CAAC,~~6BAA6B~~,~~EAAE~~,~~MAAM~~,CAAC;~~qBAC7C~~,IAAI,~~CAAC~~,~~qBAAqB~~,EAAE,KAAK,CAAC~~;qBAClC~~,SAAS,CAAC,~~gBAAgB~~,EAAE,~~IAAI~~,CAAC;~~qBACjC~~,KAAK,CAAC,~~8BAA8B~~,CAAC~~;qBACrC~~,~~QAAQ~~,CAAC,~~sCAAsC~~,CAAC;~~qBAChD~~,~~QAAQ~~,~~CAAC~~,~~sCAAsC~~,CAAC,CAAA;~~YACrD~~,CAAC,EAAE,MAAM,CAAC,CAAA;~~YACV~~,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAC/C,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YAC9C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;YACnD,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;~~YAEjD~~,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,iCACV,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI;oBAC7F,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,KAAK,IACT,EACF,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACvE,CAAA;YAED,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEhB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YAEjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"release-good-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-requests.ts"],"names":[],"mappings":"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"}

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

@@ -17,17 +17,31 @@ exports.releaseGoodsResolver = {
                     relation: false
                 });
             }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
+                    relation: false
+                });
+            }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    relation: false
+                });
+            }
             const qb = (0, typeorm_1.getRepository)(entities_1.ReleaseGood).createQueryBuilder('rg');
             (0, shell_1.buildQuery)(qb, params, context);
-            qb.addSelect(subQuery => {
-                return subQuery
-                    .select('COALESCE("ccd".rank, 99999)', 'rank')
-                    .from('common_code_details', 'ccd')
-                    .innerJoin('ccd.commonCode', 'cc')
-                    .where('"ccd"."name" = "rg"."status"')
-                    .andWhere('"ccd"."domain_id" = "rg"."domain_id"')
-                    .andWhere('"cc"."name" = \'RO_LIST_STATUS\'');
-            }, 'rank');
+            qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
             qb.leftJoinAndSelect('rg.domain', 'domain');
             qb.leftJoinAndSelect('rg.bizplace', 'bizplace');
             qb.leftJoinAndSelect('rg.orderInventories', 'oi');
@@ -37,6 +51,15 @@ exports.releaseGoodsResolver = {
             qb.leftJoinAndSelect('rg.arrivalNotice', 'an');
             qb.leftJoinAndSelect('rg.creator', 'creator');
             qb.leftJoinAndSelect('rg.updater', 'updater');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'RO_LIST_STATUS'`);
+            }, 'cc', 'cc.status = rg.status');
             const arrChildSortData = ['bizplace'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
                     ? 'DESC'

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

	@@ -1 +1 @@
1	- {"version":3,"file":"release-goods.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-goods.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAG3D,uDAAkE;AAClE,iDAAqE;AAErE,gDAA+C;AAElC,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACxD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;YAEtE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;gBACrE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC;oBAClD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAA;aACH;YAED,MAAM,~~EAAE~~,~~GAAoC~~,~~IAAA~~,~~uBAAa~~,~~EAAC~~,~~sBAAW~~,CAAC,CAAC,~~kBAAkB~~,CAAC,IAAI,CAAC,CAAA;~~YAC/F~~,~~IAAA~~,~~kBAAU~~,~~EAAC~~,~~EAAE~~,EAAE,MAAM,~~EAAE~~,OAAO,CAAC,CAAA;~~YAC/B~~,~~EAAE~~,CAAC,~~SAAS~~,CAAC,~~QAAQ~~,CAAC,EAAE~~;gBACtB~~,~~OAAO~~,~~QAAQ~~;~~qBACZ~~,MAAM,CAAC,~~6BAA6B~~,~~EAAE~~,~~MAAM~~,CAAC;~~qBAC7C~~,IAAI,CAAC,~~qBAAqB~~,EAAE,KAAK,CAAC;~~qBAClC~~,SAAS,CAAC,~~gBAAgB~~,EAAE,IAAI,CAAC;~~qBACjC~~,KAAK,CAAC,~~8BAA8B~~,CAAC;~~qBACrC~~,QAAQ,CAAC,~~sCAAsC~~,CAAC;~~qBAChD~~,QAAQ,CAAC,~~kCAAkC~~,CAAC,CAAA;~~YACjD~~,CAAC,EAAE,MAAM,CAAC,CAAA;~~YACV~~,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAC/C,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;YACjD,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YAC9C,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YAC3C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YAC1C,EAAE,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAA;YAC9C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;YAC7C,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;~~YAE7C~~,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACzC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,iCACV,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI;oBAC7F,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,KAAK,IACT,EACF,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACvE,CAAA;YAED,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAEhB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YAEjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"release-goods.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-goods.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "3.6.13",
+  "version": "3.6.21",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,16 +24,16 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/attachment-base": "^3.6.13",
-    "@things-factory/auth-base": "^3.6.13",
-    "@things-factory/biz-base": "^3.6.13",
-    "@things-factory/code-base": "^3.6.13",
-    "@things-factory/notification": "^3.6.13",
-    "@things-factory/product-base": "^3.6.13",
-    "@things-factory/setting-base": "^3.6.13",
-    "@things-factory/shell": "^3.6.13",
-    "@things-factory/transport-base": "^3.6.13",
-    "@things-factory/warehouse-base": "^3.6.13"
+    "@things-factory/attachment-base": "^3.6.19",
+    "@things-factory/auth-base": "^3.6.19",
+    "@things-factory/biz-base": "^3.6.19",
+    "@things-factory/code-base": "^3.6.19",
+    "@things-factory/notification": "^3.6.19",
+    "@things-factory/product-base": "^3.6.19",
+    "@things-factory/setting-base": "^3.6.19",
+    "@things-factory/shell": "^3.6.19",
+    "@things-factory/transport-base": "^3.6.19",
+    "@things-factory/warehouse-base": "^3.6.21"
   },
-  "gitHead": "ea358da2f9aa7d1dc27422f863c9ccf4aeb457a8"
+  "gitHead": "93e12888831ceb4304e6267bccaeccbd808c2487"
 }

package/server/controllers/ecommerce/sellercraft-controller.ts CHANGED Viewed

@@ -30,4 +30,16 @@ export class SellercraftController extends OrderController {
     releaseGood.updater = this.user
     return releaseGood
   }
+  async checkExistingReleaseGood(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
+    const { refNo, collectionOrderNo } = releaseGood
+    const foundReleaseGood: ReleaseGood = await this.trxMgr.getRepository(ReleaseGood).findOne({
+      where: { domain: sellercraft.domain, refNo, collectionOrderNo }
+    })
+    if (foundReleaseGood)
+      throw new Error(
+        'Existing release order found, kindly use update release order API if you tend to update the order information'
+      )
+  }
 }

package/server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts CHANGED Viewed

@@ -1,7 +1,9 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { buildQuery, Domain, ListParam } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
 import { ORDER_STATUS } from '../../../constants'
 import { ArrivalNotice } from '../../../entities'
@@ -30,23 +32,54 @@ export const arrivalNoticeRequestsResolver = {
         })
       }
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'gte',
+          value: fromDateVal.toISOString(),
+          relation: false
+        })
+      }
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+          relation: false
+        })
+      }
       const qb: SelectQueryBuilder<ArrivalNotice> = getRepository(ArrivalNotice).createQueryBuilder('an')
       buildQuery(qb, params, context)
-      qb.addSelect(subQuery => {
-        return subQuery
-          .select('COALESCE("ccd".rank, 99999)', 'rank')
-          .from('common_code_details', 'ccd')
-          .innerJoin('ccd.commonCode', 'cc')
-          .where('"ccd"."name" = "an"."status"')
-          .andWhere('"ccd"."domain_id" = "an"."domain_id"')
-          .andWhere('"cc"."name" = \'ORDER_STATUS\'')
-      }, 'rank')
+      qb.addSelect('COALESCE("cc".rank, 9999)', 'rank')
       qb.leftJoinAndSelect('an.domain', 'domain')
       qb.leftJoinAndSelect('an.bizplace', 'bizplace')
-      qb.leftJoinAndSelect('an.releaseGood', 'rg')
+      qb.leftJoinAndSelect('an.releaseGood', 'ro')
       qb.leftJoinAndSelect('an.creator', 'creator')
       qb.leftJoinAndSelect('an.updater', 'updater')
-      qb.leftJoinAndSelect('an.acceptedBy', 'acceptedBy')
+      qb.leftJoinAndSelect('an.acceptedBy', 'accepter')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'ORDER_STATUS'`)
+        },
+        'cc',
+        'cc.status = an.status'
+      )
       const arrChildSortData = ['bizplace']
       const sort = (params.sortings || []).reduce(

package/server/graphql/resolvers/arrival-notice/arrival-notices.ts CHANGED Viewed

@@ -1,24 +1,85 @@
+import { getRepository, SelectQueryBuilder } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
-import { getRepository, In } from 'typeorm'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 import { ArrivalNotice } from '../../../entities'
 export const arrivalNoticesResolver = {
   async arrivalNotices(_: any, params: ListParam, context: any) {
     const { domain, user }: { domain: Domain; user: User } = context.state
-    const convertedParams = convertListParams(params)
     if (!params.filters.find((filter: any) => filter.name === 'bizplace')) {
-      convertedParams.where.bizplace = In(await getPermittedBizplaceIds(domain, user))
-      convertedParams.where.domain = domain
+      params.filters.push({
+        name: 'bizplaceId',
+        operator: 'in',
+        value: await getPermittedBizplaceIds(domain, user),
+        relation: false
+      })
+    }
+    const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+    if (fromDateParamIdx >= 0) {
+      let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+      params.filters.splice(fromDateParamIdx, 1)
+      params.filters.push({
+        name: 'createdAt',
+        operator: 'gte',
+        value: fromDateVal.toISOString(),
+        relation: false
+      })
     }
-    const [items, total] = await getRepository(ArrivalNotice).findAndCount({
-      ...convertedParams,
-      relations: ['domain', 'bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'creator', 'updater', 'acceptedBy']
-    })
+    const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+    if (toDateParamIdx >= 0) {
+      let toDateVal = new Date(params.filters[toDateParamIdx].value)
+      params.filters.splice(toDateParamIdx, 1)
+      params.filters.push({
+        name: 'createdAt',
+        operator: 'lt',
+        value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+        relation: false
+      })
+    }
+    const qb: SelectQueryBuilder<ArrivalNotice> = getRepository(ArrivalNotice).createQueryBuilder('an')
+    buildQuery(qb, params, context)
+    qb.addSelect('COALESCE("cc".rank, 9999)', 'rank')
+    qb.leftJoinAndSelect('an.domain', 'domain')
+    qb.leftJoinAndSelect('an.bizplace', 'bizplace')
+    qb.leftJoinAndSelect('an.releaseGood', 'ro')
+    qb.leftJoinAndSelect('an.creator', 'creator')
+    qb.leftJoinAndSelect('an.updater', 'updater')
+    qb.leftJoinAndSelect('an.acceptedBy', 'accepter')
+    qb.leftJoin(
+      subQuery => {
+        return subQuery
+          .select(`ccd.rank`, 'rank')
+          .addSelect(`ccd.name`, 'status')
+          .from(`common_code_details`, 'ccd')
+          .innerJoin(`ccd.commonCode`, 'cc')
+          .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+          .andWhere(`cc.name = 'ORDER_STATUS'`)
+      },
+      'cc',
+      'cc.status = an.status'
+    )
+    const arrChildSortData = ['bizplace']
+    const sort = (params.sortings || []).reduce(
+      (acc, sort) => ({
+        ...acc,
+        [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
+      }),
+      !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
+    )
+    qb.orderBy(sort)
+    const [items, total] = await qb.getManyAndCount()
     return { items, total }
   }

package/server/graphql/resolvers/delivery-order/delivery-orders.ts CHANGED Viewed

@@ -46,29 +46,34 @@ export const deliveryOrdersResolver = {
         }
       }
-      const fromDateParam = params.filters.find(param => param.name === 'fromDate')
-      if (fromDateParam) {
-        params.filters.splice(
-          params.filters.findIndex(item => item.name == 'fromDate'),
-          1
-        )
+      const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset')
+      let tzOffset = 0
+      if (tzOffsetIdx >= 0) {
+        tzOffset = params.filters[tzOffsetIdx].value
+        params.filters.splice(tzOffsetIdx, 1)
+      }
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
         params.filters.push({
-          name: 'deliveryDate',
+          name: 'createdAt',
           operator: 'gte',
-          value: fromDateParam.value,
+          value: fromDateVal.toISOString(),
           relation: false
         })
       }
-      const toDateParam = params.filters.find(param => param.name === 'toDate')
-      if (toDateParam) {
-        params.filters.splice(
-          params.filters.findIndex(item => item.name == 'toDate'),
-          1
-        )
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
         params.filters.push({
-          name: 'deliveryDate',
-          operator: 'lte',
-          value: toDateParam.value,
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }

package/server/graphql/resolvers/release-good/confirm-release-good.ts CHANGED Viewed

@@ -41,6 +41,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
     relations: [
       'domain',
       'bizplace',
+      'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain',
       'orderProducts',
@@ -60,7 +61,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   if (foundReleaseGood.type == 'b2c') {
     const sellercraft: Sellercraft = await tx
       .getRepository(Sellercraft)
-      .findOne({ domain: foundReleaseGood.domain, status: SellercraftStatus.ACTIVE })
+      .findOne({ domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)

package/server/graphql/resolvers/release-good/generate-release-good.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Partner, User } from '@things-factory/auth-base'
 import { Bizplace, getMyBizplace, getOutletBizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
+import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
@@ -20,6 +21,7 @@ import {
   ORDER_TYPES,
   ORDER_VAS_STATUS
 } from '../../../constants/order'
+import { SellercraftController } from '../../../controllers'
 import {
   ArrivalNotice,
   OrderInventory,
@@ -111,6 +113,17 @@ export async function generateReleaseGoodFunction(
     await InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx)
     /** End Validate Release Order Product Quantity Section */
+    if (releaseGood.type == 'b2c') {
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
+      }
+    }
     let newReleaseGood: ReleaseGood = new ReleaseGood()
     /** Generate Shipping Order */
@@ -192,11 +205,11 @@ export async function generateReleaseGoodFunction(
       newReleaseGood.arrivalNotice = crossDockingGAN
     }
-    let createdReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
+    newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
     // Make relation with RO for cross docking
-    if (createdReleaseGood.crossDocking) {
-      crossDockingGAN.releaseGood = createdReleaseGood
+    if (newReleaseGood.crossDocking) {
+      crossDockingGAN.releaseGood = newReleaseGood
       await tx.getRepository(ArrivalNotice).save(crossDockingGAN)
     }
@@ -243,8 +256,6 @@ export async function generateReleaseGoodFunction(
     orderInventories = [...singleProductOIs, ...splitBundleOIs]
-    let orderProducts: OrderProduct[] = []
     for (let oi of orderInventories) {
       let newOrderInv: OrderInventory = Object.assign({}, oi)
       newOrderInv = {
@@ -253,7 +264,7 @@ export async function generateReleaseGoodFunction(
         bizplace: bizplace,
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
-        releaseGood: createdReleaseGood,
+        releaseGood: newReleaseGood,
         product: await tx.getRepository(Product).findOne(oi.product.id),
         creator: user,
         updater: user
@@ -299,7 +310,7 @@ export async function generateReleaseGoodFunction(
             name: OrderNoGenerator.releaseVas(),
             vas: await tx.getRepository(Vas).findOne(orderVas.vas.id),
             type: ORDER_TYPES.RELEASE_OF_GOODS,
-            releaseGood: createdReleaseGood,
+            releaseGood: newReleaseGood,
             status: ORDER_VAS_STATUS.PENDING,
             creator: user,
             updater: user
@@ -320,7 +331,7 @@ export async function generateReleaseGoodFunction(
       const files: Attachment[] = attachments.map(attachment => {
         return {
           file: attachment,
-          refBy: createdReleaseGood.id,
+          refBy: newReleaseGood.id,
           category: ATTACHMENT_TYPE.DELIVERY_ORDER
         }
       })
@@ -339,18 +350,18 @@ export async function generateReleaseGoodFunction(
     if (
       !isNaN(partnerDirectReceiveSetting?.value) &&
       !isNaN(parseFloat(partnerDirectReceiveSetting?.value)) &&
-      createdReleaseGood.status === ORDER_STATUS.PENDING
+      newReleaseGood.status === ORDER_STATUS.PENDING
     ) {
       let partnerDirectReceiveSettingValue = parseFloat(partnerDirectReceiveSetting.value)
       // CONFIRM if setting value is > 0
-      if (partnerDirectReceiveSettingValue > 0) await confirmReleaseGood(createdReleaseGood.name, context, tx)
+      if (partnerDirectReceiveSettingValue > 0) await confirmReleaseGood(newReleaseGood.name, context, tx)
       // RECEIVE if setting value is > 1
-      if (partnerDirectReceiveSettingValue > 1) await receiveReleaseGood(createdReleaseGood.name, context, tx)
+      if (partnerDirectReceiveSettingValue > 1) await receiveReleaseGood(newReleaseGood.name, context, tx)
     }
-    return createdReleaseGood
+    return newReleaseGood
   } catch (error) {
     throw error
   }

package/server/graphql/resolvers/release-good/release-good-requests.ts CHANGED Viewed

@@ -1,12 +1,17 @@
-import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, ListParam } from '@things-factory/shell'
 import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { User } from '@things-factory/auth-base'
+import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 import { ORDER_STATUS } from '../../../constants'
 import { ReleaseGood } from '../../../entities'
 export const releaseGoodRequestsResolver = {
   async releaseGoodRequests(_: any, params: ListParam, context: any) {
     try {
+      const { domain, user }: { domain: Domain; user: User } = context.state
       const statusFilter = params.filters.some(e => e.name === 'status')
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
@@ -23,22 +28,40 @@ export const releaseGoodRequestsResolver = {
         params.filters.push({
           name: 'bizplaceId',
           operator: 'in',
-          value: await getPermittedBizplaceIds(context.state.domain, context.state.user),
+          value: await getPermittedBizplaceIds(domain, user),
+          relation: false
+        })
+      }
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'gte',
+          value: fromDateVal.toISOString(),
+          relation: false
+        })
+      }
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }
       const qb: SelectQueryBuilder<ReleaseGood> = getRepository(ReleaseGood).createQueryBuilder('rg')
       buildQuery(qb, params, context)
-      qb.addSelect(subQuery => {
-        return subQuery
-          .select('COALESCE("ccd".rank, 99999)', 'rank')
-          .from('common_code_details', 'ccd')
-          .innerJoin('ccd.commonCode', 'cc')
-          .where('"ccd"."name" = "rg"."status"')
-          .andWhere('"ccd"."domain_id" = "rg"."domain_id"')
-          .andWhere('"cc"."name" = \'RO_REQUESTS_STATUS\'')
-      }, 'rank')
+      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
       qb.leftJoinAndSelect('rg.domain', 'domain')
       qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
       qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
@@ -46,6 +69,19 @@ export const releaseGoodRequestsResolver = {
       qb.leftJoinAndSelect('rg.updater', 'updater')
       qb.leftJoinAndSelect('rg.acceptedBy', 'acceptedBy')
       qb.leftJoinAndSelect('rg.deliverTo', 'deliverTo')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'RO_REQUESTS_STATUS'`)
+        },
+        'cc',
+        'cc.status = rg.status'
+      )
       const arrChildSortData = ['bizplace']
       const sort = (params.sortings || []).reduce(

package/server/graphql/resolvers/release-good/release-goods.ts CHANGED Viewed

@@ -20,17 +20,35 @@ export const releaseGoodsResolver = {
         })
       }
+      const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
+      if (fromDateParamIdx >= 0) {
+        let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
+        params.filters.splice(fromDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'gte',
+          value: fromDateVal.toISOString(),
+          relation: false
+        })
+      }
+      const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate')
+      if (toDateParamIdx >= 0) {
+        let toDateVal = new Date(params.filters[toDateParamIdx].value)
+        params.filters.splice(toDateParamIdx, 1)
+        params.filters.push({
+          name: 'createdAt',
+          operator: 'lt',
+          value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+          relation: false
+        })
+      }
       const qb: SelectQueryBuilder<ReleaseGood> = getRepository(ReleaseGood).createQueryBuilder('rg')
       buildQuery(qb, params, context)
-      qb.addSelect(subQuery => {
-        return subQuery
-          .select('COALESCE("ccd".rank, 99999)', 'rank')
-          .from('common_code_details', 'ccd')
-          .innerJoin('ccd.commonCode', 'cc')
-          .where('"ccd"."name" = "rg"."status"')
-          .andWhere('"ccd"."domain_id" = "rg"."domain_id"')
-          .andWhere('"cc"."name" = \'RO_LIST_STATUS\'')
-      }, 'rank')
+      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
       qb.leftJoinAndSelect('rg.domain', 'domain')
       qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
       qb.leftJoinAndSelect('rg.orderInventories', 'oi')
@@ -40,6 +58,19 @@ export const releaseGoodsResolver = {
       qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
       qb.leftJoinAndSelect('rg.creator', 'creator')
       qb.leftJoinAndSelect('rg.updater', 'updater')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'RO_LIST_STATUS'`)
+        },
+        'cc',
+        'cc.status = rg.status'
+      )
       const arrChildSortData = ['bizplace']
       const sort = (params.sortings || []).reduce(