@things-factory/operato-hub 4.3.200 → 4.3.203
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/config.development.js +18 -18
- package/dist-server/entities/email.js +4 -0
- package/dist-server/entities/email.js.map +1 -1
- package/dist-server/graphql/resolvers/email/send-emails.js +5 -2
- package/dist-server/graphql/resolvers/email/send-emails.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js +3 -0
- package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js +3 -2
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js +2 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-list.js.map +1 -1
- package/openapi/v1/outbound.yaml +6 -0
- package/package.json +8 -8
- package/server/entities/email.ts +3 -0
- package/server/graphql/resolvers/email/send-emails.ts +6 -2
- package/server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts +6 -1
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts +3 -2
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts +2 -1
package/config.development.js
CHANGED
|
@@ -6,30 +6,30 @@ module.exports = {
|
|
|
6
6
|
subdomainOffset: 2,
|
|
7
7
|
port: 1200,
|
|
8
8
|
inspect: '9260',
|
|
9
|
+
// ormconfig: {
|
|
10
|
+
// name: 'default',
|
|
11
|
+
// type: 'postgres',
|
|
12
|
+
// database: 'dev',
|
|
13
|
+
// username: 'postgres',
|
|
14
|
+
// password: 'hatio',
|
|
15
|
+
// host: '192.168.0.153',
|
|
16
|
+
// port: 15432,
|
|
17
|
+
// synchronize: true,
|
|
18
|
+
// logging: false
|
|
19
|
+
// },
|
|
9
20
|
ormconfig: {
|
|
10
21
|
name: 'default',
|
|
11
22
|
type: 'postgres',
|
|
12
|
-
|
|
23
|
+
host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
24
|
+
port: 55432,
|
|
25
|
+
database: 'postgres',
|
|
13
26
|
username: 'postgres',
|
|
14
|
-
password: '
|
|
15
|
-
host: '192.168.0.153',
|
|
16
|
-
port: 15432,
|
|
27
|
+
password: 'abcd1234',
|
|
17
28
|
synchronize: true,
|
|
18
|
-
logging:
|
|
29
|
+
logging: true,
|
|
30
|
+
connectTimeoutMS: 30000,
|
|
31
|
+
extra: { poolSize: 30 }
|
|
19
32
|
},
|
|
20
|
-
// ormconfig: {
|
|
21
|
-
// name: 'default',
|
|
22
|
-
// type: 'postgres',
|
|
23
|
-
// host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
24
|
-
// port: 55432,
|
|
25
|
-
// database: 'postgres',
|
|
26
|
-
// username: 'postgres',
|
|
27
|
-
// password: 'abcd1234',
|
|
28
|
-
// synchronize: false,
|
|
29
|
-
// logging: true,
|
|
30
|
-
// connectTimeoutMS: 30000,
|
|
31
|
-
// extra: { poolSize: 30 }
|
|
32
|
-
// },
|
|
33
33
|
password: {
|
|
34
34
|
lowerCase: true,
|
|
35
35
|
upperCase: false,
|
|
@@ -54,6 +54,10 @@ __decorate([
|
|
|
54
54
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
55
55
|
__metadata("design:type", String)
|
|
56
56
|
], Email.prototype, "partnerBlackList", void 0);
|
|
57
|
+
__decorate([
|
|
58
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
59
|
+
__metadata("design:type", String)
|
|
60
|
+
], Email.prototype, "partnerList", void 0);
|
|
57
61
|
__decorate([
|
|
58
62
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
59
63
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../server/entities/email.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAC9C,uDAAkD;AAClD,yDAAoD;AAI7C,IAAM,KAAK,GAAX,MAAM,KAAK;
|
|
1
|
+
{"version":3,"file":"email.js","sourceRoot":"","sources":["../../server/entities/email.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAC9C,uDAAkD;AAClD,yDAAoD;AAI7C,IAAM,KAAK,GAAX,MAAM,KAAK;CAuDjB,CAAA;AAtDC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;iCACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;qCAAA;AAEd;IAAC,IAAA,gBAAM,GAAE;;mCACG;AAEZ;IAAC,IAAA,gBAAM,GAAE;;uCACO;AAEhB;IAAC,IAAA,gBAAM,GAAE;;sCACM;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACZ;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;qCACX;AAEf;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACL;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACH;AAExB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACR;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACX;AAEhB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gCAAc,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC;;8CACzC;AAEjC;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,kCAAe,EAAE,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;;+CAC1C;AAEnC;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;wCAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;wCAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;sCAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;sCAAA;AAtDF,KAAK;IAFjB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,YAAY,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACvE,KAAK,CAuDjB;AAvDY,sBAAK"}
|
|
@@ -96,10 +96,13 @@ function flattenObject(obj, delimiter = '|') {
|
|
|
96
96
|
async function processEmailCronJob(email, fromDate, toDate) {
|
|
97
97
|
let attachments = [];
|
|
98
98
|
// black list filtration
|
|
99
|
-
let partnerBlackList = JSON.parse(email.partnerBlackList) || []
|
|
99
|
+
// let partnerBlackList = JSON.parse(email.partnerBlackList) || []
|
|
100
|
+
//
|
|
101
|
+
// partner list
|
|
102
|
+
let partnerList = JSON.parse(email.partnerList) || [];
|
|
100
103
|
//
|
|
101
104
|
const partners = await (0, typeorm_1.getRepository)(auth_base_1.Partner).find({
|
|
102
|
-
where: { domain: email.domain, id: (0, typeorm_1.
|
|
105
|
+
where: { domain: email.domain, id: (0, typeorm_1.In)(partnerList) },
|
|
103
106
|
relations: ['partnerDomain']
|
|
104
107
|
});
|
|
105
108
|
// retrieve and process xlsx attachmennts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAyC;AACzC,8DAA6B;AAC7B,qCAAgD;AAEhD,yDAAyD;AACzD,uDAAmD;AACnD,2DAAyE;AACzE,6CAA4C;AAC5C,iDAA0D;AAE1D,gDAAyC;AAEzC,MAAM,qBAAqB,GAAG,EAAE,CAAA;AAEnB,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,UAAU,CAAC,CAAM,EAAE,EAAE,EAAE,OAAY;QACvC,MAAM,MAAM,GAAY,MAAM,IAAA,uBAAa,EAAC,gBAAK,CAAC,CAAC,IAAI,CAAC;YACtD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC;SAC3F,CAAC,CAAA;QAEF,IAAI;YACF,IAAI,GAAG,GAAQ,IAAI,IAAI,EAAE,CAAA;YACzB,IAAI,aAAa,GAAQ,IAAI,IAAI,CAAC,GAAG,GAAG,qBAAqB,GAAG,KAAK,CAAC,CAAA;YACtE,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;gBACxB,yCAAyC;gBACzC,IAAI,QAAQ,GAAQ,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;gBAC9D,IAAI,GAAG,GAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA,CAAC,+BAA+B;gBACxE,IAAI,SAAS,GAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;gBAE9C,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,aAAa,EAAE;oBACpC,IAAI;wBACF,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAA,CAAC,gBAAgB;qBACxF;oBAAC,OAAO,CAAC,EAAE;wBACV,YAAM,CAAC,KAAK,CAAC,yBAAyB,KAAK,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;qBACzD;iBACF;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,YAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAA;SACtC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;AAED,SAAS,aAAa,CAAC,eAAuB,EAAE,SAAc,EAAE;IAC9D,KAAK,IAAI,GAAG,IAAI,MAAM,EAAE;QACtB,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;KAC/D;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;AACpC,CAAC;AAED,4DAA4D;AAC5D,SAAS,aAAa,CAAC,GAAG,EAAE,SAAS,GAAG,GAAG;IACzC,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,KAAK,IAAI,KAAK,IAAI,GAAG,EAAE;QACrB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YAAE,SAAQ;QAErD,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,EAAE;YACjD,IAAI,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAA;YACrD,KAAK,IAAI,CAAC,IAAI,UAAU,EAAE;gBACxB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;oBAAE,SAAQ;gBAExD,SAAS,CAAC,KAAK,GAAG,SAAS,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;aACjD;SACF;aAAM;YACL,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;SAC9B;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM;IACxD,IAAI,WAAW,GAAQ,EAAE,CAAA;IACzB,wBAAwB;IACxB,IAAI,
|
|
1
|
+
{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,9 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
|
|
|
86
86
|
marketplaceOrderItem.marketplaceOrder = newMarketplaceOrder;
|
|
87
87
|
marketplaceOrderItem.domain = domain;
|
|
88
88
|
marketplaceOrderItem.creator = user;
|
|
89
|
+
if (foundVariation.sku) {
|
|
90
|
+
await (0, marketplace_base_1.updateQtyAndReserveQty)(tx, foundVariation, newMarketplaceOrder, marketplaceOrderItem.qty);
|
|
91
|
+
}
|
|
89
92
|
return marketplaceOrderItem;
|
|
90
93
|
}));
|
|
91
94
|
marketplaceOrderItems = await tx.getRepository(marketplace_base_1.MarketplaceOrderItem).save(marketplaceOrderItems);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":";;AAAA,qCAAkF;AAClF,+BAAmC;AAEnC,6CAAgE;AAChE,qFAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
6
7
|
const typeorm_1 = require("typeorm");
|
|
7
8
|
const api_1 = require("@things-factory/api");
|
|
8
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
9
|
-
const error_util_1 = require("../utils/error-util");
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
10
|
const middlewares_1 = require("../middlewares");
|
|
11
|
+
const error_util_1 = require("../utils/error-util");
|
|
12
12
|
api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
|
|
13
13
|
try {
|
|
14
14
|
// get contact points for that bizplace
|
|
@@ -61,6 +61,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
61
61
|
storeId: releaseGood.storeId,
|
|
62
62
|
routeId: releaseGood.routeId,
|
|
63
63
|
stopId: releaseGood.stopId,
|
|
64
|
+
status: releaseGood.status,
|
|
64
65
|
billTo: {
|
|
65
66
|
billingAddress: releaseGood.billingAddress
|
|
66
67
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":";;;;;AAAA,qCAAuC;AAEvC,6CAAgE;AAChE,2DAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
7
7
|
const typeorm_1 = require("typeorm");
|
|
8
8
|
const api_1 = require("@things-factory/api");
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
|
-
const error_util_1 = require("../utils/error-util");
|
|
11
10
|
const middlewares_1 = require("../middlewares");
|
|
11
|
+
const error_util_1 = require("../utils/error-util");
|
|
12
12
|
api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
|
|
13
13
|
try {
|
|
14
14
|
// get contact points for that bizplace
|
|
@@ -70,6 +70,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-list', middlewares_1
|
|
|
70
70
|
storeId: releaseGood.storeId,
|
|
71
71
|
routeId: releaseGood.routeId,
|
|
72
72
|
stopId: releaseGood.stopId,
|
|
73
|
+
status: releaseGood.status,
|
|
73
74
|
billTo: {
|
|
74
75
|
billingAddress: releaseGood.billingAddress
|
|
75
76
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAgD;AAEhD,6CAAgE;AAChE,2DAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"get-release-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts"],"names":[],"mappings":"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"}
|
package/openapi/v1/outbound.yaml
CHANGED
|
@@ -332,6 +332,9 @@ definitions:
|
|
|
332
332
|
stopId:
|
|
333
333
|
type: 'string'
|
|
334
334
|
example: '24'
|
|
335
|
+
status:
|
|
336
|
+
type: 'string'
|
|
337
|
+
example: 'PICKING'
|
|
335
338
|
billTo:
|
|
336
339
|
type: 'object'
|
|
337
340
|
properties:
|
|
@@ -485,6 +488,9 @@ definitions:
|
|
|
485
488
|
stopId:
|
|
486
489
|
type: 'string'
|
|
487
490
|
example: '24'
|
|
491
|
+
status:
|
|
492
|
+
type: 'string'
|
|
493
|
+
example: 'PICKING'
|
|
488
494
|
billTo:
|
|
489
495
|
type: 'object'
|
|
490
496
|
properties:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.203",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -80,18 +80,18 @@
|
|
|
80
80
|
"@things-factory/integration-accounting": "^4.3.190",
|
|
81
81
|
"@things-factory/integration-fulfillment": "^4.3.190",
|
|
82
82
|
"@things-factory/integration-lmd": "^4.3.197",
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.203",
|
|
84
84
|
"@things-factory/integration-pos": "^4.3.190",
|
|
85
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
85
|
+
"@things-factory/integration-sellercraft": "^4.3.203",
|
|
86
86
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
87
87
|
"@things-factory/lite-menu": "^4.3.186",
|
|
88
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
88
|
+
"@things-factory/marketplace-base": "^4.3.203",
|
|
89
89
|
"@things-factory/more-ui": "^4.3.179",
|
|
90
90
|
"@things-factory/notification": "^4.3.186",
|
|
91
91
|
"@things-factory/pdf": "^4.3.159",
|
|
92
92
|
"@things-factory/product-ui": "^4.3.187",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.179",
|
|
94
|
-
"@things-factory/sales-base": "^4.3.
|
|
94
|
+
"@things-factory/sales-base": "^4.3.203",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.159",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.159",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.159",
|
|
@@ -106,8 +106,8 @@
|
|
|
106
106
|
"@things-factory/setting-ui": "^4.3.186",
|
|
107
107
|
"@things-factory/shell": "^4.3.179",
|
|
108
108
|
"@things-factory/system-ui": "^4.3.179",
|
|
109
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
110
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
109
|
+
"@things-factory/warehouse-base": "^4.3.203",
|
|
110
|
+
"@things-factory/worksheet-base": "^4.3.203",
|
|
111
111
|
"cron-parser": "^4.7.0",
|
|
112
112
|
"koa2-swagger-ui": "^5.0.2",
|
|
113
113
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -119,5 +119,5 @@
|
|
|
119
119
|
"resolutions": {
|
|
120
120
|
"core-js": "^3.16.0"
|
|
121
121
|
},
|
|
122
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "b52c1edcf8ce5a968ccbf008a6a5f364f7de6f08"
|
|
123
123
|
}
|
package/server/entities/email.ts
CHANGED
|
@@ -74,11 +74,15 @@ function flattenObject(obj, delimiter = '|') {
|
|
|
74
74
|
async function processEmailCronJob(email, fromDate, toDate) {
|
|
75
75
|
let attachments: any = []
|
|
76
76
|
// black list filtration
|
|
77
|
-
let partnerBlackList = JSON.parse(email.partnerBlackList) || []
|
|
77
|
+
// let partnerBlackList = JSON.parse(email.partnerBlackList) || []
|
|
78
|
+
//
|
|
79
|
+
|
|
80
|
+
// partner list
|
|
81
|
+
let partnerList = JSON.parse(email.partnerList) || []
|
|
78
82
|
//
|
|
79
83
|
|
|
80
84
|
const partners: Partner[] = await getRepository(Partner).find({
|
|
81
|
-
where: { domain: email.domain, id:
|
|
85
|
+
where: { domain: email.domain, id: In(partnerList) },
|
|
82
86
|
relations: ['partnerDomain']
|
|
83
87
|
})
|
|
84
88
|
|
|
@@ -9,7 +9,8 @@ import {
|
|
|
9
9
|
MarketplaceOrderShipping as MarketplaceOrderShippingEntity,
|
|
10
10
|
MarketplaceOrderShippingItem as MarketplaceOrderShippingItemEntity,
|
|
11
11
|
MarketplaceProductVariation as MarketplaceProductVariationEntity,
|
|
12
|
-
NoGenerator
|
|
12
|
+
NoGenerator,
|
|
13
|
+
updateQtyAndReserveQty
|
|
13
14
|
} from '@things-factory/marketplace-base'
|
|
14
15
|
import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
|
|
15
16
|
|
|
@@ -113,6 +114,10 @@ router.post(
|
|
|
113
114
|
marketplaceOrderItem.domain = domain
|
|
114
115
|
marketplaceOrderItem.creator = user
|
|
115
116
|
|
|
117
|
+
if (foundVariation.sku) {
|
|
118
|
+
await updateQtyAndReserveQty(tx, foundVariation, newMarketplaceOrder, marketplaceOrderItem.qty)
|
|
119
|
+
}
|
|
120
|
+
|
|
116
121
|
return marketplaceOrderItem
|
|
117
122
|
})
|
|
118
123
|
)
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import _ from 'lodash'
|
|
1
2
|
import { getRepository } from 'typeorm'
|
|
2
3
|
|
|
3
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
4
5
|
import { ReleaseGood } from '@things-factory/sales-base'
|
|
5
6
|
|
|
7
|
+
import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
|
|
6
8
|
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
7
|
-
import _ from 'lodash'
|
|
8
|
-
import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
|
|
9
9
|
|
|
10
10
|
router.get(
|
|
11
11
|
'/v1/warehouse/get-release-order-details',
|
|
@@ -66,6 +66,7 @@ router.get(
|
|
|
66
66
|
storeId: releaseGood.storeId,
|
|
67
67
|
routeId: releaseGood.routeId,
|
|
68
68
|
stopId: releaseGood.stopId,
|
|
69
|
+
status: releaseGood.status,
|
|
69
70
|
billTo: {
|
|
70
71
|
billingAddress: releaseGood.billingAddress
|
|
71
72
|
},
|
|
@@ -4,8 +4,8 @@ import { Between, getRepository } from 'typeorm'
|
|
|
4
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
5
|
import { ReleaseGood } from '@things-factory/sales-base'
|
|
6
6
|
|
|
7
|
-
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
8
7
|
import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
|
|
8
|
+
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
9
9
|
|
|
10
10
|
router.get(
|
|
11
11
|
'/v1/warehouse/get-release-order-list',
|
|
@@ -76,6 +76,7 @@ router.get(
|
|
|
76
76
|
storeId: releaseGood.storeId,
|
|
77
77
|
routeId: releaseGood.routeId,
|
|
78
78
|
stopId: releaseGood.stopId,
|
|
79
|
+
status: releaseGood.status,
|
|
79
80
|
billTo: {
|
|
80
81
|
billingAddress: releaseGood.billingAddress
|
|
81
82
|
},
|