@things-factory/operato-mms 4.0.0-alpha.7 → 4.0.0-beta.1
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.
- package/Dockerfile +2 -1
- package/client/bootstrap.js +32 -16
- package/client/components/marketplace-order-max-weight.js +158 -0
- package/client/components/mms-home-cards.js +1 -1
- package/client/components/stock-allocation-ratio.js +17 -23
- package/client/pages/catalogue/products.js +2 -1
- package/client/pages/catalogue/warehouse-products.js +2 -1
- package/client/pages/catalogue-variation/product-variations.js +72 -15
- package/client/pages/inventory/inventory-by-product.js +3 -2
- package/client/pages/order/logistics/batch-init-popup.js +566 -0
- package/client/pages/order/logistics/lazada-order-init-batch-popup.js +233 -21
- package/client/pages/order/logistics/order-shipping-items.js +47 -16
- package/client/pages/order/logistics/order-shipping.js +7 -4
- package/client/pages/order/logistics/request-ro-popup.js +104 -17
- package/client/pages/order/logistics/shopee-order-init-batch-popup.js +431 -129
- package/client/pages/order/order-by-store.js +176 -149
- package/client/pages/setting/marketplace-setting.js +12 -0
- package/dist-server/graphql/index.js +1 -1
- package/dist-server/graphql/resolvers/index.js +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +74 -13
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +74 -13
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/generate-replenishment-order.js +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/generate-replenishment-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.js +53 -36
- package/dist-server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.js.map +1 -1
- package/dist-server/graphql/resolvers/warehouse-product/auto-link-warehouse-marketplace-product-variations.js +5 -5
- package/dist-server/graphql/resolvers/warehouse-product/auto-link-warehouse-marketplace-product-variations.js.map +1 -1
- package/dist-server/graphql/types/index.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/new-stock-replenishment.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/new-stock-replenishment.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/replenishment-order-product.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/replenishment-order-product.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/stock-replenishment-list.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/stock-replenishment-list.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/stock-replenishment.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/stock-replenishment.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-inventory.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-inventory.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-marketplace-product-list.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-marketplace-product-list.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-marketplace-product.js +1 -1
- package/dist-server/graphql/types/interface-with-hub/warehouse-marketplace-product.js.map +1 -1
- package/dist-server/graphql/types/warehouse-product/warehouse-product.js +1 -1
- package/dist-server/graphql/types/warehouse-product/warehouse-product.js.map +1 -1
- package/dist-server/index.js +1 -1
- package/dist-server/migrations/1599732967233-SeedCommonCode.js +5 -5
- package/dist-server/migrations/1599732967233-SeedCommonCode.js.map +1 -1
- package/dist-server/migrations/1608009991075-SeedUser.js +4 -4
- package/dist-server/migrations/1608009991075-SeedUser.js.map +1 -1
- package/dist-server/routers/etrax-router.js +7 -6
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/dist-server/routers/shopify-pos-public-router.js +10 -10
- package/dist-server/routers/shopify-pos-public-router.js.map +1 -1
- package/dist-server/util/interface-helper.js +2 -2
- package/dist-server/util/interface-helper.js.map +1 -1
- package/dist-server/util/no-generator.js +2 -2
- package/dist-server/util/no-generator.js.map +1 -1
- package/package.json +65 -63
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +83 -14
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +79 -11
- package/server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts +50 -33
- package/server/routers/etrax-router.ts +6 -4
- package/translations/en.json +16 -0
- package/translations/ko.json +14 -0
- package/translations/ms.json +14 -0
- package/translations/zh.json +14 -0
- package/views/auth-page.html +1 -1
- package/views/public/home.html +1 -1
- package/config.development.js +0 -54
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warehouse-marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/interface-with-hub/warehouse-marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,qBAAG,
|
|
1
|
+
{"version":3,"file":"warehouse-marketplace-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/interface-with-hub/warehouse-marketplace-product.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,2BAA2B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;CAW7C,CAAA"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WarehouseProduct = void 0;
|
|
4
4
|
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
5
|
-
exports.WarehouseProduct = apollo_server_koa_1.gql `
|
|
5
|
+
exports.WarehouseProduct = (0, apollo_server_koa_1.gql) `
|
|
6
6
|
input WarehouseProduct {
|
|
7
7
|
id: String
|
|
8
8
|
sku: String
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warehouse-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/warehouse-product/warehouse-product.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,gBAAgB,GAAG,uBAAG,
|
|
1
|
+
{"version":3,"file":"warehouse-product.js","sourceRoot":"","sources":["../../../../server/graphql/types/warehouse-product/warehouse-product.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,gBAAgB,GAAG,IAAA,uBAAG,EAAA;;;;;;CAMlC,CAAA"}
|
package/dist-server/index.js
CHANGED
|
@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
7
7
|
o[k2] = m[k];
|
|
8
8
|
}));
|
|
9
9
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./entities"), exports);
|
|
@@ -30,9 +30,9 @@ const codes = [
|
|
|
30
30
|
];
|
|
31
31
|
class SeedCommonCode1599732967233 {
|
|
32
32
|
async up(queryRunner) {
|
|
33
|
-
const codeRepo = typeorm_1.getRepository(code_base_1.CommonCode);
|
|
34
|
-
const codeDetailRepo = typeorm_1.getRepository(code_base_1.CommonCodeDetail);
|
|
35
|
-
const domain = await typeorm_1.getRepository(shell_1.Domain).findOne({
|
|
33
|
+
const codeRepo = (0, typeorm_1.getRepository)(code_base_1.CommonCode);
|
|
34
|
+
const codeDetailRepo = (0, typeorm_1.getRepository)(code_base_1.CommonCodeDetail);
|
|
35
|
+
const domain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({
|
|
36
36
|
subdomain: 'maybank'
|
|
37
37
|
});
|
|
38
38
|
return await Promise.all(codes.map(async (code) => {
|
|
@@ -44,8 +44,8 @@ class SeedCommonCode1599732967233 {
|
|
|
44
44
|
}));
|
|
45
45
|
}
|
|
46
46
|
async down(queryRunner) {
|
|
47
|
-
const codeRepo = typeorm_1.getRepository(code_base_1.CommonCode);
|
|
48
|
-
const codeDetailRepo = typeorm_1.getRepository(code_base_1.CommonCodeDetail);
|
|
47
|
+
const codeRepo = (0, typeorm_1.getRepository)(code_base_1.CommonCode);
|
|
48
|
+
const codeDetailRepo = (0, typeorm_1.getRepository)(code_base_1.CommonCodeDetail);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
exports.SeedCommonCode1599732967233 = SeedCommonCode1599732967233;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1599732967233-SeedCommonCode.js","sourceRoot":"","sources":["../../server/migrations/1599732967233-SeedCommonCode.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;AACxE,yDAAwE;AACxE,iDAA8C;AAE9C,MAAM,KAAK,GAAG;IACZ;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,cAAc;QAC3B,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;YACvC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;YACxC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;YACvC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;YACxC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE;SAC3C;KACF;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;YACzC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;YACzC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;SAC1C;KACF;CACF,CAAA;AAED,MAAa,2BAA2B;IAC/B,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,QAAQ,GAAG,uBAAa,
|
|
1
|
+
{"version":3,"file":"1599732967233-SeedCommonCode.js","sourceRoot":"","sources":["../../server/migrations/1599732967233-SeedCommonCode.ts"],"names":[],"mappings":";;;AAAA,qCAAwE;AACxE,yDAAwE;AACxE,iDAA8C;AAE9C,MAAM,KAAK,GAAG;IACZ;QACE,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,cAAc;QAC3B,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;YACvC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;YACxC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE;YACvC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE;YACxC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE;SAC3C;KACF;IACD;QACE,IAAI,EAAE,oBAAoB;QAC1B,WAAW,EAAE,oBAAoB;QACjC,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;YACzC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;YACzC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE;SAC1C;KACF;CACF,CAAA;AAED,MAAa,2BAA2B;IAC/B,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,QAAQ,GAAG,IAAA,uBAAa,EAAC,sBAAU,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,IAAA,uBAAa,EAAC,4BAAgB,CAAC,CAAA;QACtD,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC;YACjD,SAAS,EAAE,SAAS;SACrB,CAAC,CAAA;QAEF,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,iCACjC,IAAI,KACP,MAAM,IACN,CAAA;YAEF,MAAM,cAAc,CAAC,IAAI,CACvB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;gBACrC,uCACK,MAAM,KACT,UAAU;oBACV,MAAM,EACN,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,IACrB;YACH,CAAC,CAAC,CACH,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,QAAQ,GAAG,IAAA,uBAAa,EAAC,sBAAU,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,IAAA,uBAAa,EAAC,4BAAgB,CAAC,CAAA;IACxD,CAAC;CACF;AAjCD,kEAiCC"}
|
|
@@ -13,8 +13,8 @@ const ADMIN_USER = {
|
|
|
13
13
|
};
|
|
14
14
|
class SeedUser1608009991075 {
|
|
15
15
|
async up(queryRunner) {
|
|
16
|
-
const userRepository = typeorm_1.getRepository(auth_base_1.User);
|
|
17
|
-
const domainRepository = typeorm_1.getRepository(shell_1.Domain);
|
|
16
|
+
const userRepository = (0, typeorm_1.getRepository)(auth_base_1.User);
|
|
17
|
+
const domainRepository = (0, typeorm_1.getRepository)(shell_1.Domain);
|
|
18
18
|
let adminUser = await userRepository.findOne({ where: { name: ADMIN_USER.name }, relations: ['domains'] });
|
|
19
19
|
let systemDomain = await domainRepository.findOne({ where: { systemFlag: true } });
|
|
20
20
|
if (!adminUser) {
|
|
@@ -39,8 +39,8 @@ class SeedUser1608009991075 {
|
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
41
|
async down(queryRunner) {
|
|
42
|
-
const userRepository = typeorm_1.getRepository(auth_base_1.User);
|
|
43
|
-
const domainRepository = typeorm_1.getRepository(shell_1.Domain);
|
|
42
|
+
const userRepository = (0, typeorm_1.getRepository)(auth_base_1.User);
|
|
43
|
+
const domainRepository = (0, typeorm_1.getRepository)(shell_1.Domain);
|
|
44
44
|
const user = await userRepository.findOne({ where: { name: ADMIN_USER.name } });
|
|
45
45
|
await userRepository.delete(user);
|
|
46
46
|
const systemDomain = await domainRepository.findOne({ where: { systemFlag: true } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"1608009991075-SeedUser.js","sourceRoot":"","sources":["../../server/migrations/1608009991075-SeedUser.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAE5D,iDAA8C;AAC9C,qCAAoF;AAEpF,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,sBAAU,CAAC,SAAS;CAC7B,CAAA;AACD,MAAa,qBAAqB;IACzB,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,cAAc,GAAqB,uBAAa,
|
|
1
|
+
{"version":3,"file":"1608009991075-SeedUser.js","sourceRoot":"","sources":["../../server/migrations/1608009991075-SeedUser.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAE5D,iDAA8C;AAC9C,qCAAoF;AAEpF,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE,OAAO;IACjB,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,sBAAU,CAAC,SAAS;CAC7B,CAAA;AACD,MAAa,qBAAqB;IACzB,KAAK,CAAC,EAAE,CAAC,WAAwB;QACtC,MAAM,cAAc,GAAqB,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAA;QAC5D,MAAM,gBAAgB,GAAuB,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAA;QAElE,IAAI,SAAS,GAAS,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAChH,IAAI,YAAY,GAAW,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAE1F,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,GAAG,gBAAI,CAAC,YAAY,EAAE,CAAA;YAEhC,SAAS,GAAG,MAAM,cAAc,CAAC,IAAI,iCAChC,UAAU,KACb,IAAI,EACJ,QAAQ,EAAE,gBAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,IAChD,CAAA;SACH;aAAM;YACL,SAAS,CAAC,QAAQ,GAAG,MAAM,CAAA;YAC3B,MAAM,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SACrC;QAED,IAAI,YAAY,EAAE;YAChB,YAAY,CAAC,OAAO,GAAG,SAAS,CAAA;YAChC,MAAM,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;SAC1C;QAED,MAAM,YAAY,GAAY;YAC5B,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,WAAW,EAAE,YAAY,CAAC,WAAW,IAAI,IAAI;YAC7C,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,EAAE;SACR,CAAA;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACxC,MAAM,cAAc,GAAG,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAA;QAE9C,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAC/E,MAAM,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEjC,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QACpF,MAAM,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;CACF;AA9CD,sDA8CC"}
|
|
@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.etraxRouter = void 0;
|
|
7
7
|
const koa_router_1 = __importDefault(require("koa-router"));
|
|
8
8
|
const typeorm_1 = require("typeorm");
|
|
9
|
-
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
10
9
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
10
|
+
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
11
11
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
12
12
|
//import { MarketplaceOrder, MarketplaceOrderShipping, MarketplaceOrderItem } from "@things-factory/marketplace-base"
|
|
13
13
|
const debug = require('debug')('things-factory:jest.config');
|
|
14
14
|
exports.etraxRouter = new koa_router_1.default();
|
|
15
15
|
exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
16
16
|
const { domain, user } = context.state;
|
|
17
|
-
const repo = typeorm_1.getRepository(integration_lmd_1.LastMileDelivery);
|
|
17
|
+
const repo = (0, typeorm_1.getRepository)(integration_lmd_1.LastMileDelivery);
|
|
18
18
|
const requestBody = context.request.body;
|
|
19
19
|
debug('etrax_status_update/context: ', context);
|
|
20
20
|
const bodyToken = requestBody.Token;
|
|
@@ -53,9 +53,9 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
53
53
|
//TAS - Transporter Assignment Success
|
|
54
54
|
if (status === 'TAS') {
|
|
55
55
|
//Update DB if Validate Success
|
|
56
|
-
const orderRepo = typeorm_1.getRepository(marketplace_base_1.MarketplaceOrder);
|
|
57
|
-
const orderItemRepo = typeorm_1.getRepository(marketplace_base_1.MarketplaceOrderItem);
|
|
58
|
-
const orderShippingRepo = typeorm_1.getRepository(marketplace_base_1.MarketplaceOrderShipping);
|
|
56
|
+
const orderRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder);
|
|
57
|
+
const orderItemRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderItem);
|
|
58
|
+
const orderShippingRepo = (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping);
|
|
59
59
|
let order = await orderRepo.findOne({
|
|
60
60
|
where: { orderNo: extOrderNo },
|
|
61
61
|
relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
|
|
@@ -70,9 +70,10 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
70
70
|
}
|
|
71
71
|
const storeId = order.marketplaceStore.id;
|
|
72
72
|
const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
|
|
73
|
+
// to-do update tracking no to every marketplaces
|
|
73
74
|
if (marketplaceStore.platform === 'woocommerce') {
|
|
74
75
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
|
|
75
|
-
const orderNote = await integration_marketplace_1.StoreAPI.createOrderNote(marketplaceStore, { orderId: order.
|
|
76
|
+
const orderNote = await integration_marketplace_1.StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note });
|
|
76
77
|
}
|
|
77
78
|
const resp = {
|
|
78
79
|
Status: 'SUCCESS',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAuC;AAEvC,qFAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ exports.shopifyPosPublicRouter.post('/webhook-shopify/orders/create', async (con
|
|
|
21
21
|
const shopDomain = request.get('x-shopify-shop-domain');
|
|
22
22
|
const shop = shopDomain.replace('.myshopify.com', '');
|
|
23
23
|
const shopify = new integration_marketplace_1.Shopify({ apiKey, apiSecret, shop });
|
|
24
|
-
const marketplaceStore = await typeorm_1.getRepository(integration_marketplace_1.MarketplaceStore).findOne({
|
|
24
|
+
const marketplaceStore = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceStore).findOne({
|
|
25
25
|
where: { storeId: shop, status: 'ACTIVE' },
|
|
26
26
|
relations: ['domain']
|
|
27
27
|
});
|
|
@@ -39,10 +39,10 @@ exports.shopifyPosPublicRouter.post('/webhook-shopify/orders/create', async (con
|
|
|
39
39
|
}
|
|
40
40
|
const data = request.body;
|
|
41
41
|
if (data.source_name === 'pos') {
|
|
42
|
-
const domainCompany = await typeorm_1.getRepository(biz_base_1.Company).findOne({
|
|
42
|
+
const domainCompany = await (0, typeorm_1.getRepository)(biz_base_1.Company).findOne({
|
|
43
43
|
where: { domain: marketplaceStore.domain }
|
|
44
44
|
});
|
|
45
|
-
const bizplaces = await typeorm_1.getRepository(biz_base_1.Bizplace).find({
|
|
45
|
+
const bizplaces = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).find({
|
|
46
46
|
where: { company: domainCompany },
|
|
47
47
|
relations: ['domain']
|
|
48
48
|
});
|
|
@@ -54,19 +54,19 @@ exports.shopifyPosPublicRouter.post('/webhook-shopify/orders/create', async (con
|
|
|
54
54
|
const variationId = lineItems[i].variant_id;
|
|
55
55
|
var itemQty = lineItems[i].quantity;
|
|
56
56
|
var itemUomValue = 0;
|
|
57
|
-
const marketplaceProductVariation = await typeorm_1.getRepository(marketplace_base_1.MarketplaceProductVariation).findOne({
|
|
57
|
+
const marketplaceProductVariation = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceProductVariation).findOne({
|
|
58
58
|
where: {
|
|
59
59
|
variationId,
|
|
60
60
|
domain: marketplaceStore.domain
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
|
-
const warehouseProduct = await typeorm_1.getRepository(product_base_1.Product).findOne({
|
|
63
|
+
const warehouseProduct = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
|
|
64
64
|
where: {
|
|
65
65
|
sku: marketplaceProductVariation.sku
|
|
66
66
|
},
|
|
67
67
|
relations: ['bizplace']
|
|
68
68
|
});
|
|
69
|
-
const inventories = await typeorm_1.getRepository(warehouse_base_1.Inventory).find({
|
|
69
|
+
const inventories = await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({
|
|
70
70
|
where: {
|
|
71
71
|
product: warehouseProduct,
|
|
72
72
|
domain: selectedWarehouseDomain[0],
|
|
@@ -80,10 +80,10 @@ exports.shopifyPosPublicRouter.post('/webhook-shopify/orders/create', async (con
|
|
|
80
80
|
itemUomValue = (inventory.uomValue / inventory.qty) * itemQty;
|
|
81
81
|
inventory.qty -= itemQty;
|
|
82
82
|
inventory.uomValue -= itemUomValue;
|
|
83
|
-
await warehouse_base_1.generateInventoryHistory(inventory, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SALES_ADJUSTMENT, -itemQty, -itemUomValue, null);
|
|
83
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SALES_ADJUSTMENT, -itemQty, -itemUomValue, null);
|
|
84
84
|
if (inventory.qty === 0) {
|
|
85
85
|
inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
86
|
-
await warehouse_base_1.generateInventoryHistory(inventory, refOrder, warehouse_base_1.INVENTORY_STATUS.TERMINATED, 0, 0, null);
|
|
86
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, refOrder, warehouse_base_1.INVENTORY_STATUS.TERMINATED, 0, 0, null);
|
|
87
87
|
}
|
|
88
88
|
itemQty = 0;
|
|
89
89
|
}
|
|
@@ -92,10 +92,10 @@ exports.shopifyPosPublicRouter.post('/webhook-shopify/orders/create', async (con
|
|
|
92
92
|
itemUomValue = (inventory.uomValue / inventory.qty) * itemQty;
|
|
93
93
|
inventory.qty -= itemQty;
|
|
94
94
|
inventory.uomValue -= itemUomValue;
|
|
95
|
-
await warehouse_base_1.generateInventoryHistory(inventory, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SALES_ADJUSTMENT, -itemQty, -itemUomValue, null);
|
|
95
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SALES_ADJUSTMENT, -itemQty, -itemUomValue, null);
|
|
96
96
|
if (inventory.qty === 0) {
|
|
97
97
|
inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
98
|
-
await warehouse_base_1.generateInventoryHistory(inventory, refOrder, warehouse_base_1.INVENTORY_STATUS.TERMINATED, 0, 0, null);
|
|
98
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, refOrder, warehouse_base_1.INVENTORY_STATUS.TERMINATED, 0, 0, null);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
if (itemQty == 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify-pos-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-pos-public-router.ts"],"names":[],"mappings":";;;;;;AACA,uDAA4D;AAC5D,6CAA4C;AAC5C,qFAAmF;AACnF,uEAA8E;AAC9E,+DAAsD;AACtD,mEAKuC;AACvC,4DAA+B;AAC/B,qCAAuC;AAEvC,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AACrE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAA;AAE9B,QAAA,sBAAsB,GAAG,IAAI,oBAAM,EAAE,CAAA;AAElD,8BAAsB,CAAC,IAAI,CAAC,gCAAgC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IAE9B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IACvD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,IAAI,iCAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAExD,MAAM,gBAAgB,GAAqB,MAAM,uBAAa,
|
|
1
|
+
{"version":3,"file":"shopify-pos-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-pos-public-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ exports.interfaceHelper = {
|
|
|
31
31
|
};
|
|
32
32
|
if (body)
|
|
33
33
|
requestInit.body = JSON.stringify(body);
|
|
34
|
-
const res = await node_fetch_1.default(endPoint, requestInit);
|
|
34
|
+
const res = await (0, node_fetch_1.default)(endPoint, requestInit);
|
|
35
35
|
if (res.ok) {
|
|
36
36
|
const { result } = await res.json();
|
|
37
37
|
return result;
|
|
@@ -43,7 +43,7 @@ exports.interfaceHelper = {
|
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
45
|
async getAccessToken(domain) {
|
|
46
|
-
const { accessToken } = await typeorm_1.getRepository(oauth2_client_1.Oauth2Client).findOne({
|
|
46
|
+
const { accessToken } = await (0, typeorm_1.getRepository)(oauth2_client_1.Oauth2Client).findOne({
|
|
47
47
|
domain,
|
|
48
48
|
name: 'Operato Hub'
|
|
49
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface-helper.js","sourceRoot":"","sources":["../../server/util/interface-helper.ts"],"names":[],"mappings":";;;;;;;AAAA,6CAA4C;AAC5C,iEAA4D;AAE5D,4DAA+C;AAC/C,qCAAuC;AACvC,6BAAyB;AAIzB,MAAM,SAAS,GAAuC,
|
|
1
|
+
{"version":3,"file":"interface-helper.js","sourceRoot":"","sources":["../../server/util/interface-helper.ts"],"names":[],"mappings":";;;;;;;AAAA,6CAA4C;AAC5C,iEAA4D;AAE5D,4DAA+C;AAC/C,qCAAuC;AACvC,6BAAyB;AAIzB,MAAM,SAAS,GAAuC,CAAA,MAAA,YAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,SAAS,KAAI,EAAE,CAAA;AAC3F,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAEhG,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,KAAK,CACT,QAAsB,EACtB,QAAgB,EAChB,MAAc,EACd,OAAY,EACZ,IAA0B;QAE1B,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,GAAG,GAAQ,IAAI,SAAG,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnD,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,SAAS,GAAG,GAAG,GAAG,GAAG,CAAC,IAAI,CAAA;QAC5C,GAAG,CAAC,QAAQ,IAAI,GAAG,GAAG,QAAQ,CAAA;QAC9B,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QACjC,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACvC,MAAM,WAAW,GAAW,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QAE7D,MAAM,WAAW,GAAgB;YAC/B,MAAM;YACN,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAA;QACD,IAAI,IAAI;YAAE,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACjD,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QAE9C,IAAI,GAAG,CAAC,EAAE,EAAE;YACV,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YACnC,OAAO,MAAM,CAAA;SACd;aAAM;YACL,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAA;YAC5B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YAChC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAA;SAC9B;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc;QACjC,MAAM,EAAE,WAAW,EAAE,GAAiB,MAAM,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,OAAO,CAAC;YAC9E,MAAM;YACN,IAAI,EAAE,aAAa;SACpB,CAAC,CAAA;QAEF,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA"}
|
|
@@ -7,10 +7,10 @@ exports.NoGenerator = void 0;
|
|
|
7
7
|
const v4_1 = __importDefault(require("uuid/v4"));
|
|
8
8
|
class NoGenerator {
|
|
9
9
|
static id() {
|
|
10
|
-
return `${v4_1.default()}`;
|
|
10
|
+
return `${(0, v4_1.default)()}`;
|
|
11
11
|
}
|
|
12
12
|
static sku() {
|
|
13
|
-
return `SKU-${v4_1.default()}`;
|
|
13
|
+
return `SKU-${(0, v4_1.default)()}`;
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
exports.NoGenerator = NoGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-generator.js","sourceRoot":"","sources":["../../server/util/no-generator.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA0B;AAE1B,MAAa,WAAW;IACtB,MAAM,CAAC,EAAE;QACP,OAAO,GAAG,YAAI,
|
|
1
|
+
{"version":3,"file":"no-generator.js","sourceRoot":"","sources":["../../server/util/no-generator.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA0B;AAE1B,MAAa,WAAW;IACtB,MAAM,CAAC,EAAE;QACP,OAAO,GAAG,IAAA,YAAI,GAAE,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO,OAAO,IAAA,YAAI,GAAE,EAAE,CAAA;IACxB,CAAC;CACF;AARD,kCAQC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "4.0.0-
|
|
3
|
+
"version": "4.0.0-beta.1",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -18,15 +18,15 @@
|
|
|
18
18
|
},
|
|
19
19
|
"scripts": {
|
|
20
20
|
"serve": "things-factory operato-mms",
|
|
21
|
-
"serve:dev": "npm run build:server && things-factory-dev
|
|
21
|
+
"serve:dev": "npm run build:server && things-factory-dev operato-mms",
|
|
22
22
|
"build": "tsc --p tsconfig.json",
|
|
23
23
|
"build:client": "npm run clean:client && webpack --config ../builder/webpack.config.js",
|
|
24
24
|
"build:server": "npm run clean:server && tsc",
|
|
25
25
|
"clean:server": "rm -rf dist-server",
|
|
26
26
|
"clean:client": "rm -rf dist-client",
|
|
27
27
|
"clean": "npm run clean:server && npm run clean:client",
|
|
28
|
-
"migration": "
|
|
29
|
-
"migration:privileges": "
|
|
28
|
+
"migration": "things-factory-migration",
|
|
29
|
+
"migration:privileges": "things-factory-migration-privileges",
|
|
30
30
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations",
|
|
31
31
|
"migration:generate": "node ../../node_modules/typeorm/cli.js migration:generate",
|
|
32
32
|
"migration:run": "node ../../node_modules/typeorm/cli.js migration:run",
|
|
@@ -41,67 +41,69 @@
|
|
|
41
41
|
"@material/mwc-formfield": "^0.22.1",
|
|
42
42
|
"@material/mwc-linear-progress": "^0.22.1",
|
|
43
43
|
"@material/mwc-radio": "^0.22.1",
|
|
44
|
-
"@
|
|
45
|
-
"@things-factory/
|
|
46
|
-
"@things-factory/
|
|
47
|
-
"@things-factory/
|
|
48
|
-
"@things-factory/
|
|
49
|
-
"@things-factory/board-
|
|
50
|
-
"@things-factory/
|
|
51
|
-
"@things-factory/
|
|
52
|
-
"@things-factory/
|
|
53
|
-
"@things-factory/
|
|
54
|
-
"@things-factory/export-ui
|
|
55
|
-
"@things-factory/export-ui-
|
|
56
|
-
"@things-factory/
|
|
57
|
-
"@things-factory/
|
|
58
|
-
"@things-factory/
|
|
59
|
-
"@things-factory/
|
|
60
|
-
"@things-factory/
|
|
61
|
-
"@things-factory/
|
|
62
|
-
"@things-factory/
|
|
63
|
-
"@things-factory/
|
|
64
|
-
"@things-factory/
|
|
65
|
-
"@things-factory/
|
|
66
|
-
"@things-factory/
|
|
67
|
-
"@things-factory/
|
|
68
|
-
"@things-factory/
|
|
69
|
-
"@things-factory/
|
|
70
|
-
"@things-factory/
|
|
71
|
-
"@things-factory/scene-
|
|
72
|
-
"@things-factory/scene-
|
|
73
|
-
"@things-factory/scene-
|
|
74
|
-
"@things-factory/scene-
|
|
75
|
-
"@things-factory/scene-
|
|
76
|
-
"@things-factory/scene-
|
|
77
|
-
"@things-factory/scene-
|
|
78
|
-
"@things-factory/scene-
|
|
79
|
-
"@things-factory/scene-
|
|
80
|
-
"@things-factory/scene-
|
|
81
|
-
"@things-factory/scene-
|
|
82
|
-
"@things-factory/scene-
|
|
83
|
-
"@things-factory/scene-
|
|
84
|
-
"@things-factory/scene-
|
|
85
|
-
"@things-factory/scene-
|
|
86
|
-
"@things-factory/scene-
|
|
87
|
-
"@things-factory/scene-
|
|
88
|
-
"@things-factory/scene-
|
|
89
|
-
"@things-factory/scene-
|
|
90
|
-
"@things-factory/scene-
|
|
91
|
-
"@things-factory/scene-
|
|
92
|
-
"@things-factory/scene-
|
|
93
|
-
"@things-factory/scene-
|
|
94
|
-
"@things-factory/scene-
|
|
95
|
-
"@things-factory/scene-
|
|
96
|
-
"@things-factory/scene-
|
|
97
|
-
"@things-factory/scene-
|
|
98
|
-
"@things-factory/
|
|
99
|
-
"@things-factory/
|
|
100
|
-
"@things-factory/
|
|
44
|
+
"@operato/ghost-print": "0.1.14",
|
|
45
|
+
"@things-factory/apptool-ui": "^4.0.0-beta.1",
|
|
46
|
+
"@things-factory/attachment-base": "^4.0.0-beta.1",
|
|
47
|
+
"@things-factory/auth-ui": "^4.0.0-beta.1",
|
|
48
|
+
"@things-factory/biz-base": "^4.0.0-beta.1",
|
|
49
|
+
"@things-factory/board-service": "^4.0.0-beta.1",
|
|
50
|
+
"@things-factory/board-ui": "^4.0.0-beta.1",
|
|
51
|
+
"@things-factory/code-ui": "^4.0.0-beta.1",
|
|
52
|
+
"@things-factory/context-ui": "^4.0.0-beta.1",
|
|
53
|
+
"@things-factory/dashboard": "^4.0.0-beta.1",
|
|
54
|
+
"@things-factory/export-ui": "^4.0.0-beta.1",
|
|
55
|
+
"@things-factory/export-ui-csv": "^4.0.0-beta.1",
|
|
56
|
+
"@things-factory/export-ui-excel": "^4.0.0-beta.1",
|
|
57
|
+
"@things-factory/geography": "^4.0.0-beta.1",
|
|
58
|
+
"@things-factory/grist-ui": "^4.0.0-beta.0",
|
|
59
|
+
"@things-factory/help": "^4.0.0-beta.1",
|
|
60
|
+
"@things-factory/i18n-ui": "^4.0.0-beta.1",
|
|
61
|
+
"@things-factory/integration-fulfillment": "^4.0.0-beta.1",
|
|
62
|
+
"@things-factory/integration-lmd": "^4.0.0-beta.1",
|
|
63
|
+
"@things-factory/lite-menu": "^4.0.0-beta.1",
|
|
64
|
+
"@things-factory/marketplace-base": "^4.0.0-beta.1",
|
|
65
|
+
"@things-factory/more-ui": "^4.0.0-beta.1",
|
|
66
|
+
"@things-factory/notification": "^4.0.0-beta.1",
|
|
67
|
+
"@things-factory/oauth2-client": "^4.0.0-beta.1",
|
|
68
|
+
"@things-factory/pdf": "^4.0.0-beta.0",
|
|
69
|
+
"@things-factory/product-base": "^4.0.0-beta.1",
|
|
70
|
+
"@things-factory/resource-ui": "^4.0.0-beta.1",
|
|
71
|
+
"@things-factory/scene-chartjs": "^4.0.0-beta.0",
|
|
72
|
+
"@things-factory/scene-clock": "^4.0.0-beta.0",
|
|
73
|
+
"@things-factory/scene-clone": "^4.0.0-beta.0",
|
|
74
|
+
"@things-factory/scene-compass": "^4.0.0-beta.0",
|
|
75
|
+
"@things-factory/scene-data-transform": "^4.0.0-beta.0",
|
|
76
|
+
"@things-factory/scene-excel": "^4.0.0-beta.0",
|
|
77
|
+
"@things-factory/scene-firebase": "^4.0.0-beta.0",
|
|
78
|
+
"@things-factory/scene-form": "^4.0.0-beta.0",
|
|
79
|
+
"@things-factory/scene-gauge": "^4.0.0-beta.0",
|
|
80
|
+
"@things-factory/scene-google-map": "^4.0.0-beta.0",
|
|
81
|
+
"@things-factory/scene-graphql": "^4.0.0-beta.0",
|
|
82
|
+
"@things-factory/scene-grist": "^4.0.0-beta.0",
|
|
83
|
+
"@things-factory/scene-half-roundrect": "^4.0.0-beta.0",
|
|
84
|
+
"@things-factory/scene-indoor-map": "^4.0.0-beta.0",
|
|
85
|
+
"@things-factory/scene-integration": "^4.0.0-beta.0",
|
|
86
|
+
"@things-factory/scene-label": "^4.0.0-beta.1",
|
|
87
|
+
"@things-factory/scene-legend": "^4.0.0-beta.0",
|
|
88
|
+
"@things-factory/scene-marker": "^4.0.0-beta.0",
|
|
89
|
+
"@things-factory/scene-mqtt": "^4.0.0-beta.0",
|
|
90
|
+
"@things-factory/scene-news-ticker": "^4.0.0-beta.0",
|
|
91
|
+
"@things-factory/scene-progressbar": "^4.0.0-beta.0",
|
|
92
|
+
"@things-factory/scene-random": "^4.0.0-beta.0",
|
|
93
|
+
"@things-factory/scene-restful": "^4.0.0-beta.0",
|
|
94
|
+
"@things-factory/scene-switch": "^4.0.0-beta.0",
|
|
95
|
+
"@things-factory/scene-tab": "^4.0.0-beta.0",
|
|
96
|
+
"@things-factory/scene-table": "^4.0.0-beta.0",
|
|
97
|
+
"@things-factory/scene-timer": "^4.0.0-beta.0",
|
|
98
|
+
"@things-factory/scene-visualizer": "^4.0.0-beta.0",
|
|
99
|
+
"@things-factory/scene-wheel-sorter": "^4.0.0-beta.0",
|
|
100
|
+
"@things-factory/setting-ui": "^4.0.0-beta.1",
|
|
101
|
+
"@things-factory/system-ui": "^4.0.0-beta.1",
|
|
102
|
+
"@things-factory/warehouse-base": "^4.0.0-beta.1"
|
|
101
103
|
},
|
|
102
104
|
"devDependencies": {
|
|
103
|
-
"@things-factory/builder": "^4.0.0-
|
|
105
|
+
"@things-factory/builder": "^4.0.0-beta.0",
|
|
104
106
|
"@types/node-fetch": "^2.5.7"
|
|
105
107
|
},
|
|
106
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "99c01f42759b9b426087544268cb68f10bc2e978"
|
|
107
109
|
}
|
|
@@ -1,38 +1,107 @@
|
|
|
1
|
-
import { FulfillmentAPI } from '@things-factory/integration-fulfillment'
|
|
2
|
-
import { Domain } from '@things-factory/shell'
|
|
3
|
-
import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
4
|
-
import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
|
|
5
1
|
import { EntityManager } from 'typeorm'
|
|
6
2
|
|
|
3
|
+
import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
|
|
4
|
+
import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
5
|
+
import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
6
|
+
import { Domain } from '@things-factory/shell'
|
|
7
|
+
|
|
7
8
|
export const addReleaseOrderResolver = {
|
|
8
9
|
async addReleaseOrder(
|
|
9
10
|
_: void,
|
|
10
11
|
{ marketplaceOrderIds, warehouseId }: { marketplaceOrderIds: any; warehouseId: string },
|
|
11
12
|
context: any
|
|
12
13
|
): Promise<void> {
|
|
13
|
-
const { tx }: { tx: EntityManager } = context.state
|
|
14
|
+
const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
|
|
14
15
|
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
|
|
17
|
+
const centerId: string = fulfilmentCenter.centerId
|
|
17
18
|
|
|
18
19
|
var warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
|
|
19
20
|
var customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
|
|
20
|
-
|
|
21
|
+
|
|
22
|
+
const customerBizplaceId: string = customerBizplaces.find(
|
|
23
|
+
customerBizplace => customerBizplace.company.domain.id === domain.id
|
|
24
|
+
).id
|
|
21
25
|
|
|
22
26
|
for (var i = 0; i < marketplaceOrderIds.length; i++) {
|
|
23
27
|
const marketplaceOrderId = marketplaceOrderIds[i]
|
|
24
28
|
|
|
25
29
|
const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne(marketplaceOrderId, {
|
|
26
|
-
relations: [
|
|
30
|
+
relations: [
|
|
31
|
+
'marketplaceOrderItems',
|
|
32
|
+
'marketplaceOrderItems.marketplaceProductVariation',
|
|
33
|
+
'marketplaceOrderItems.marketplaceOrderShipping'
|
|
34
|
+
]
|
|
27
35
|
})
|
|
28
36
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
37
|
+
const marketplaceOrderShippings: MarketplaceOrderShipping[] = await tx
|
|
38
|
+
.getRepository(MarketplaceOrderShipping)
|
|
39
|
+
.find({ where: { orderNoRef: marketplaceOrder.orderNo, domain } })
|
|
40
|
+
|
|
41
|
+
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
42
|
+
const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
|
|
43
|
+
|
|
44
|
+
const date: Date = new Date()
|
|
45
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
46
|
+
.toString()
|
|
47
|
+
.padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
|
|
48
|
+
|
|
49
|
+
const newMarketplaceOrder: any = {
|
|
50
|
+
releaseDate,
|
|
51
|
+
type: 'b2c',
|
|
52
|
+
transporter: marketplaceOrder.shippingProvider,
|
|
53
|
+
trackingNo: marketplaceOrderShipping?.ownTrackingNo
|
|
54
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
55
|
+
: marketplaceOrderShipping.trackingNo,
|
|
56
|
+
packingOption: true,
|
|
57
|
+
exportOption: false,
|
|
58
|
+
ownTransport: true,
|
|
59
|
+
courierOption: true,
|
|
60
|
+
collectionOrderNo: marketplaceOrder.orderNo,
|
|
61
|
+
refNo: marketplaceOrder.orderNo,
|
|
62
|
+
refNo2: marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length,
|
|
63
|
+
deliverTo: {
|
|
64
|
+
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
65
|
+
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
66
|
+
deliveryAddress3: marketplaceOrderShipping.address3,
|
|
67
|
+
deliveryAddress4: marketplaceOrderShipping.address4,
|
|
68
|
+
deliveryAddress5: marketplaceOrderShipping.address5,
|
|
69
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
70
|
+
city: marketplaceOrderShipping.city,
|
|
71
|
+
postalCode: marketplaceOrderShipping.postCode,
|
|
72
|
+
country: marketplaceOrderShipping.country,
|
|
73
|
+
state: marketplaceOrderShipping.state,
|
|
74
|
+
phone1: marketplaceOrderShipping.phone1,
|
|
75
|
+
phone2: marketplaceOrderShipping?.phone2 ? marketplaceOrderShipping.phone2 : null
|
|
76
|
+
},
|
|
77
|
+
marketplaceOrderStatus: marketplaceOrder.status,
|
|
78
|
+
airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
|
|
79
|
+
invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
|
|
80
|
+
orderInventories: marketplaceOrder.marketplaceOrderItems
|
|
81
|
+
.filter(item => {
|
|
82
|
+
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
83
|
+
return item
|
|
84
|
+
}
|
|
85
|
+
})
|
|
86
|
+
.map((orderItem: any) => {
|
|
87
|
+
const { marketplaceProductVariation: productVariation }: any = orderItem
|
|
88
|
+
return {
|
|
89
|
+
product: {
|
|
90
|
+
sku: productVariation.sku
|
|
91
|
+
},
|
|
92
|
+
releaseQty: orderItem.qty
|
|
93
|
+
}
|
|
94
|
+
})
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
var releaseOrder: any = await FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
98
|
+
customerBizplaceId,
|
|
99
|
+
releaseOrder: newMarketplaceOrder
|
|
100
|
+
})
|
|
101
|
+
}
|
|
34
102
|
|
|
35
103
|
marketplaceOrder.releaseOrderId = releaseOrder.id
|
|
104
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter
|
|
36
105
|
await tx.getRepository(MarketplaceOrder).save(marketplaceOrder)
|
|
37
106
|
}
|
|
38
107
|
}
|