@things-factory/operato-hub 4.3.80-alpha.4 → 4.3.82

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 (22) hide show
  1. package/dist-server/routers/api/restful-apis/v1/company/get-partner-list.js +0 -1
  2. package/dist-server/routers/api/restful-apis/v1/company/get-partner-list.js.map +1 -1
  3. package/dist-server/routers/api/restful-apis/v1/company/index.js +1 -0
  4. package/dist-server/routers/api/restful-apis/v1/company/index.js.map +1 -1
  5. package/dist-server/routers/api/restful-apis/v1/company/update-marketplace-order-delivered.js +41 -38
  6. package/dist-server/routers/api/restful-apis/v1/company/update-marketplace-order-delivered.js.map +1 -1
  7. package/dist-server/routers/api/restful-apis/v1/company/update-marketplace-shipping-order.js +44 -0
  8. package/dist-server/routers/api/restful-apis/v1/company/update-marketplace-shipping-order.js.map +1 -0
  9. package/dist-server/routers/api/restful-apis/v1/middlewares/store-middleware.js +1 -1
  10. package/dist-server/routers/api/restful-apis/v1/middlewares/store-middleware.js.map +1 -1
  11. package/dist-server/routers/api/restful-apis/v1/middlewares/validation-middleware.js +8 -6
  12. package/dist-server/routers/api/restful-apis/v1/middlewares/validation-middleware.js.map +1 -1
  13. package/dist-server/routers/api/restful-apis/v1/utils/params.js +4 -2
  14. package/dist-server/routers/api/restful-apis/v1/utils/params.js.map +1 -1
  15. package/package.json +54 -54
  16. package/server/routers/api/restful-apis/v1/company/get-partner-list.ts +0 -1
  17. package/server/routers/api/restful-apis/v1/company/index.ts +1 -0
  18. package/server/routers/api/restful-apis/v1/company/update-marketplace-order-delivered.ts +40 -37
  19. package/server/routers/api/restful-apis/v1/company/update-marketplace-shipping-order.ts +55 -0
  20. package/server/routers/api/restful-apis/v1/middlewares/store-middleware.ts +1 -1
  21. package/server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts +7 -5
  22. package/server/routers/api/restful-apis/v1/utils/params.ts +4 -2
@@ -28,7 +28,6 @@ api_1.restfulApiRouter.get('/v1/company/get-partner-list', middlewares_1.busines
28
28
  .orWhere('p.domain_id = :domainId', { domainId: bizplace.domain.id })
29
29
  .limit(limit)
30
30
  .offset(offset)
31
- .orderBy('p.created_at', 'DESC')
32
31
  .getRawMany();
33
32
  const count = await (0, typeorm_1.getRepository)(auth_base_1.Partner)
34
33
  .createQueryBuilder('p')
@@ -1 +1 @@
1
- {"version":3,"file":"get-partner-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/get-partner-list.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-partner-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/get-partner-list.ts"],"names":[],"mappings":"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"}
@@ -11,4 +11,5 @@ require("./get-marketplace-store-list");
11
11
  require("./get-partner-list");
12
12
  require("./get-product-list");
13
13
  require("./update-marketplace-order-delivered");
14
+ require("./update-marketplace-shipping-order");
14
15
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/index.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mCAAgC;AAChC,yBAAsB;AACtB,sCAAmC;AACnC,+BAA4B;AAC5B,oCAAiC;AACjC,iDAA8C;AAC9C,wCAAqC;AACrC,8BAA2B;AAC3B,8BAA2B;AAC3B,gDAA6C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/index.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mCAAgC;AAChC,yBAAsB;AACtB,sCAAmC;AACnC,+BAA4B;AAC5B,oCAAiC;AACjC,iDAA8C;AAC9C,wCAAqC;AACrC,8BAA2B;AAC3B,8BAA2B;AAC3B,gDAA6C;AAC7C,+CAA4C"}
@@ -8,45 +8,48 @@ const error_util_1 = require("../utils/error-util");
8
8
  const middlewares_1 = require("../middlewares");
9
9
  api_1.restfulApiRouter.post('/v1/company/update-marketplace-order-delivered', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
10
10
  try {
11
- // check if name exists under the domain of the requester
12
- const marketplaceStore = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceStore).findOne({
13
- where: { name: context.request.body.data.storeId, domain: context.state.business.domain }
11
+ await (0, typeorm_1.getConnection)().transaction(async (tx) => {
12
+ // check if name exists under the domain of the requester
13
+ const marketplaceStore = await tx.getRepository(integration_marketplace_1.MarketplaceStore).findOne({
14
+ where: { name: context.request.body.data.storeId, domain: context.state.business.domain }
15
+ });
16
+ if (!marketplaceStore)
17
+ throw new error_util_1.ApiError('E04', 'storeId');
18
+ // update values to DB
19
+ // restricted to marketplaceStores in the domain of the requester
20
+ const datapoint = context.request.body.data;
21
+ const result = await tx
22
+ .getRepository(marketplace_base_1.MarketplaceOrder)
23
+ .createQueryBuilder()
24
+ .update(marketplace_base_1.MarketplaceOrder)
25
+ .set({ status: 'delivered' })
26
+ .where({ orderNo: datapoint.orderNo, marketplaceStore })
27
+ .execute();
28
+ if (result.affected !== 1)
29
+ throw new error_util_1.ApiError('E01', 'orderNo is invalid');
30
+ const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
31
+ where: { orderNo: datapoint.orderNo, marketplaceStore },
32
+ relations: ['domain', 'marketplaceStore', 'updater']
33
+ });
34
+ // create and format response
35
+ const data = {
36
+ orderNo: marketplaceOrder.orderNo,
37
+ status: marketplaceOrder.status,
38
+ updatedAt: marketplaceOrder.updatedAt,
39
+ domain: {
40
+ name: marketplaceOrder.domain.name
41
+ },
42
+ marketplaceStore: {
43
+ name: marketplaceOrder.marketplaceStore.storeName
44
+ },
45
+ updater: {
46
+ name: marketplaceOrder.updater.name
47
+ }
48
+ };
49
+ context.body = {
50
+ data
51
+ };
14
52
  });
15
- if (!marketplaceStore)
16
- throw new error_util_1.ApiError('E04', 'storeId');
17
- // update values to DB
18
- // restricted to marketplaceStores in the domain of the requester
19
- const datapoint = context.request.body.data;
20
- const result = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder)
21
- .createQueryBuilder()
22
- .update(marketplace_base_1.MarketplaceOrder)
23
- .set({ status: 'delivered' })
24
- .where({ orderNo: datapoint.orderNo, marketplaceStore })
25
- .execute();
26
- if (result.affected !== 1)
27
- throw new error_util_1.ApiError('E01', 'orderNo is invalid');
28
- const marketplaceOrder = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
29
- where: { orderNo: datapoint.orderNo, marketplaceStore },
30
- relations: ['domain', 'marketplaceStore', 'updater']
31
- });
32
- // create and format response
33
- const data = {
34
- orderNo: marketplaceOrder.orderNo,
35
- status: marketplaceOrder.status,
36
- updatedAt: marketplaceOrder.updatedAt,
37
- domain: {
38
- name: marketplaceOrder.domain.name
39
- },
40
- marketplaceStore: {
41
- name: marketplaceOrder.marketplaceStore.storeName
42
- },
43
- updater: {
44
- name: marketplaceOrder.updater.name
45
- }
46
- };
47
- context.body = {
48
- data
49
- };
50
53
  }
51
54
  catch (e) {
52
55
  if (e instanceof error_util_1.ApiError)
@@ -1 +1 @@
1
- {"version":3,"file":"update-marketplace-order-delivered.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/update-marketplace-order-delivered.ts"],"names":[],"mappings":";;AAAA,qCAAuC;AAEvC,6CAAgE;AAChE,uEAAmE;AACnE,qFAA0E;AAE1E,oDAAyF;AACzF,gDAA4F;AAE5F,sBAAM,CAAC,IAAI,CACT,gDAAgD,EAChD,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,yDAAyD;QACzD,MAAM,gBAAgB,GAAqB,MAAM,IAAA,uBAAa,EAAC,0CAAgB,CAAC,CAAC,OAAO,CAAC;YACvF,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;SAC1F,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QAE3D,sBAAsB;QACtB,iEAAiE;QACjE,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC;aACjD,kBAAkB,EAAE;aACpB,MAAM,CAAC,mCAAgB,CAAC;aACxB,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;aAC5B,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAC;aACvD,OAAO,EAAE,CAAA;QACZ,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;QAE1E,MAAM,gBAAgB,GAAqB,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;YACvF,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE;YACvD,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC;SACrD,CAAC,CAAA;QAEF,6BAA6B;QAC7B,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS;YACrC,MAAM,EAAE;gBACN,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI;aACnC;YACD,gBAAgB,EAAE;gBAChB,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,SAAS;aAClD;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI;aACpC;SACF,CAAA;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;SACL,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
1
+ {"version":3,"file":"update-marketplace-order-delivered.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/update-marketplace-order-delivered.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AAEtD,6CAAgE;AAChE,uEAAmE;AACnE,qFAA0E;AAE1E,oDAAyF;AACzF,gDAA4F;AAE5F,sBAAM,CAAC,IAAI,CACT,gDAAgD,EAChD,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;YAC5D,yDAAyD;YACzD,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,OAAO,CAAC;gBAC1F,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;aAC1F,CAAC,CAAA;YACF,IAAI,CAAC,gBAAgB;gBAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;YAE3D,sBAAsB;YACtB,iEAAiE;YACjE,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;YAC3C,MAAM,MAAM,GAAG,MAAM,EAAE;iBACpB,aAAa,CAAC,mCAAgB,CAAC;iBAC/B,kBAAkB,EAAE;iBACpB,MAAM,CAAC,mCAAgB,CAAC;iBACxB,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;iBAC5B,KAAK,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAC;iBACvD,OAAO,EAAE,CAAA;YACZ,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;gBAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;YAE1E,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;gBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE;gBACvD,SAAS,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC;aACrD,CAAC,CAAA;YAEF,6BAA6B;YAC7B,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,gBAAgB,CAAC,OAAO;gBACjC,MAAM,EAAE,gBAAgB,CAAC,MAAM;gBAC/B,SAAS,EAAE,gBAAgB,CAAC,SAAS;gBACrC,MAAM,EAAE;oBACN,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI;iBACnC;gBACD,gBAAgB,EAAE;oBAChB,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,SAAS;iBAClD;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI;iBACpC;aACF,CAAA;YAED,OAAO,CAAC,IAAI,GAAG;gBACb,IAAI;aACL,CAAA;QACH,CAAC,CAAC,CAAA;KACH;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
@@ -0,0 +1,44 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const typeorm_1 = require("typeorm");
4
+ const api_1 = require("@things-factory/api");
5
+ const marketplace_base_1 = require("@things-factory/marketplace-base");
6
+ const error_util_1 = require("../utils/error-util");
7
+ const middlewares_1 = require("../middlewares");
8
+ api_1.restfulApiRouter.post('/v1/company/update-marketplace-shipping-order', middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, middlewares_1.storeMiddleware, async (context, next) => {
9
+ await (0, typeorm_1.getConnection)().transaction(async (tx) => {
10
+ try {
11
+ const { user } = context.state;
12
+ const { marketplaceStore } = context.state;
13
+ const data = context.request.body.data;
14
+ let marketplaceOrderShipping = await tx
15
+ .getRepository(marketplace_base_1.MarketplaceOrderShipping)
16
+ .findOne({
17
+ where: { marketplaceStore, subOrderNoRef: data.orderNo },
18
+ relations: ['marketplaceStore']
19
+ });
20
+ if (!marketplaceOrderShipping)
21
+ throw new error_util_1.ApiError('E04', 'Order Shipping');
22
+ marketplaceOrderShipping.ownTrackingNo = data.trackingNo;
23
+ if (marketplaceOrderShipping.marketplaceStore.platform == 'lazada') {
24
+ if (data.trackingNo) {
25
+ data.trackingNo = marketplaceOrderShipping.trackingNo;
26
+ }
27
+ }
28
+ marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).save(Object.assign(Object.assign(Object.assign({}, marketplaceOrderShipping), data), { updater: user }));
29
+ context.body = {
30
+ orderNoRef: marketplaceOrderShipping.orderNoRef,
31
+ transporter: marketplaceOrderShipping.transporter,
32
+ airwayBill: marketplaceOrderShipping.airwayBill,
33
+ trackingNo: marketplaceOrderShipping.trackingNo
34
+ };
35
+ }
36
+ catch (e) {
37
+ if (e instanceof error_util_1.ApiError)
38
+ (0, error_util_1.ApiErrorHandler)(context, e);
39
+ else
40
+ (0, error_util_1.throwInternalServerError)(context, e);
41
+ }
42
+ });
43
+ });
44
+ //# sourceMappingURL=update-marketplace-shipping-order.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"update-marketplace-shipping-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/update-marketplace-shipping-order.ts"],"names":[],"mappings":";;AAAA,qCAAsD;AACtD,6CAAgE;AAChE,uEAA6G;AAC7G,oDAAyF;AACzF,gDAA6G;AAG7G,sBAAM,CAAC,IAAI,CACT,+CAA+C,EAC/C,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,6BAAe,EACf,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;QAC5D,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAmB,OAAO,CAAC,KAAK,CAAA;YAC9C,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;YACtC,IAAI,wBAAwB,GAAmC,MAAM,EAAE;iBACpE,aAAa,CAAC,2CAA8B,CAAC;iBAC7C,OAAO,CAAC;gBACP,KAAK,EAAE,EAAE,gBAAgB,EAAE,aAAa,EAAE,IAAI,CAAC,OAAO,EAAE;gBACxD,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YAEJ,IAAI,CAAC,wBAAwB;gBAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;YAE1E,wBAAwB,CAAC,aAAa,GAAG,IAAI,CAAC,UAAU,CAAA;YAExD,IAAI,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,EAAE;gBAClE,IAAI,IAAI,CAAC,UAAU,EAAE;oBACnB,IAAI,CAAC,UAAU,GAAG,wBAAwB,CAAC,UAAU,CAAA;iBACtD;aACF;YAED,wBAAwB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,2CAA8B,CAAC,CAAC,IAAI,+CACjF,wBAAwB,GACxB,IAAI,KACP,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,OAAO,CAAC,IAAI,GAAG;gBACb,UAAU,EAAE,wBAAwB,CAAC,UAAU;gBAC/C,WAAW,EAAE,wBAAwB,CAAC,WAAW;gBACjD,UAAU,EAAE,wBAAwB,CAAC,UAAU;gBAC/C,UAAU,EAAE,wBAAwB,CAAC,UAAU;aAChD,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,qBAAQ;gBAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;gBACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;SAC1C;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CACF,CAAA"}
@@ -7,7 +7,7 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
7
7
  const debug = require('debug')('things-factory:operato-hub:store-middleware');
8
8
  async function storeMiddleware(context, next) {
9
9
  var _a;
10
- const { storeId } = context.query;
10
+ const { storeId } = context.method == 'GET' ? context.query : context.request.body.data;
11
11
  const { business } = context.state;
12
12
  let marketplaceStore;
13
13
  debug('company and store', business, storeId);
@@ -1 +1 @@
1
- {"version":3,"file":"store-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/store-middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,oDAA8C;AAE9C,qFAAoG;AAEpG,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,6CAA6C,CAAC,CAAA;AAEtE,KAAK,UAAU,eAAe,CAAC,OAAO,EAAE,IAAI;;IACjD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACjC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAElC,IAAI,gBAAwC,CAAA;IAE5C,KAAK,CAAC,mBAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAE7C,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAEnD,IAAI,OAAO,EAAE;QACX,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,0CAAsB,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;YACnE,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;QACF,KAAK,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,0CAAE,SAAS,CAAC,CAAA;QAExE,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAA;KAC9E;SAAM;QACL,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;KACrC;IAED,OAAO,CAAC,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAEjD,MAAM,IAAI,EAAE,CAAA;AACd,CAAC;AAzBD,0CAyBC"}
1
+ {"version":3,"file":"store-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/store-middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,oDAA8C;AAE9C,qFAAoG;AAEpG,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,6CAA6C,CAAC,CAAA;AAEtE,KAAK,UAAU,eAAe,CAAC,OAAO,EAAE,IAAI;;IACjD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;IACvF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAElC,IAAI,gBAAwC,CAAA;IAE5C,KAAK,CAAC,mBAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAE7C,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAEnD,IAAI,OAAO,EAAE;QACX,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,0CAAsB,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE;YACnE,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;QACF,KAAK,CAAC,mBAAmB,EAAE,OAAO,EAAE,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,0CAAE,SAAS,CAAC,CAAA;QAExE,IAAI,CAAC,gBAAgB;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAA;KAC9E;SAAM;QACL,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;KACrC;IAED,OAAO,CAAC,KAAK,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAEjD,MAAM,IAAI,EAAE,CAAA;AACd,CAAC;AAzBD,0CAyBC"}
@@ -50,12 +50,14 @@ function validateRequired(endpoint, context) {
50
50
  let data = context.method == 'POST' ? context.request.body.data : context.request.query;
51
51
  let required = params_1.reqParams[endpoint];
52
52
  let result = context.method == 'POST' ? Object.keys(flatten(data)) : Object.keys(data);
53
- for (let r of required) {
54
- let v = r.split('.').slice(0, -1).join('.');
55
- if (!required.includes(v) && !result.includes(v))
56
- continue;
57
- if (!result.includes(r))
58
- throw new error_util_1.ApiError('E03', r.toString());
53
+ if (required) {
54
+ for (let r of required) {
55
+ let v = r.split('.').slice(0, -1).join('.');
56
+ if (!required.includes(v) && !result.includes(v))
57
+ continue;
58
+ if (!result.includes(r))
59
+ throw new error_util_1.ApiError('E03', r.toString());
60
+ }
59
61
  }
60
62
  }
61
63
  function flatten(obj, path = '') {
@@ -1 +1 @@
1
- {"version":3,"file":"validation-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation-middleware.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/middlewares/validation-middleware.ts"],"names":[],"mappings":"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"}
@@ -243,7 +243,8 @@ exports.params = {
243
243
  'shippingOrder.to',
244
244
  'shippingOrder.containerArrivalDate',
245
245
  'shippingOrder.containerLeavingDate'
246
- ]
246
+ ],
247
+ 'update-marketplace-shipping-order': ['storeId', 'orderNo', 'transporter', 'airwayBill', 'trackingNo']
247
248
  };
248
249
  exports.reqParams = {
249
250
  'get-contact-point-list': ['bizplaceId'],
@@ -332,7 +333,8 @@ exports.reqParams = {
332
333
  'shippingOrder.containerNo',
333
334
  'shippingOrder.containerArrivalDate',
334
335
  'shippingOrder.containerLeavingDate'
335
- ]
336
+ ],
337
+ 'update-marketplace-shipping-order': ['storeId', 'orderNo', 'airwayBill', 'trackingNo']
336
338
  };
337
339
  exports.requireLimitOffsetValidation = [
338
340
  'get-release-order-list',
@@ -1 +1 @@
1
- {"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/params.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/utils/params.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-hub",
3
- "version": "4.3.80-alpha.4",
3
+ "version": "4.3.82",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -56,66 +56,66 @@
56
56
  "@operato/scene-tab": "^0.1.8",
57
57
  "@operato/scene-table": "^0.1.8",
58
58
  "@operato/scene-wheel-sorter": "^0.1.8",
59
- "@things-factory/api": "^4.3.80-alpha.4",
60
- "@things-factory/apptool-ui": "^4.3.80-alpha.4",
61
- "@things-factory/attachment-base": "^4.3.80-alpha.4",
62
- "@things-factory/auth-base": "^4.3.80-alpha.4",
63
- "@things-factory/auth-ui": "^4.3.80-alpha.4",
64
- "@things-factory/biz-base": "^4.3.80-alpha.4",
65
- "@things-factory/biz-ui": "^4.3.80-alpha.4",
66
- "@things-factory/board-service": "^4.3.80-alpha.4",
67
- "@things-factory/board-ui": "^4.3.80-alpha.4",
68
- "@things-factory/code-ui": "^4.3.80-alpha.4",
69
- "@things-factory/component-ui": "^4.3.80-alpha.4",
70
- "@things-factory/context-ui": "^4.3.80-alpha.4",
71
- "@things-factory/document-template-ui": "^4.3.80-alpha.4",
72
- "@things-factory/export-ui": "^4.3.80-alpha.4",
73
- "@things-factory/export-ui-csv": "^4.3.80-alpha.4",
74
- "@things-factory/export-ui-excel": "^4.3.80-alpha.4",
75
- "@things-factory/grist-ui": "^4.3.80-alpha.4",
76
- "@things-factory/help": "^4.3.80-alpha.4",
77
- "@things-factory/i18n-base": "^4.3.80-alpha.4",
78
- "@things-factory/import-ui": "^4.3.80-alpha.4",
79
- "@things-factory/import-ui-excel": "^4.3.80-alpha.4",
80
- "@things-factory/integration-accounting": "^4.3.80-alpha.4",
81
- "@things-factory/integration-fulfillment": "^4.3.80-alpha.4",
82
- "@things-factory/integration-lmd": "^4.3.80-alpha.4",
83
- "@things-factory/integration-marketplace": "^4.3.80-alpha.4",
84
- "@things-factory/integration-pos": "^4.3.80-alpha.4",
85
- "@things-factory/integration-sellercraft": "^4.3.80-alpha.4",
86
- "@things-factory/integration-sftp": "^4.3.80-alpha.4",
87
- "@things-factory/lite-menu": "^4.3.80-alpha.4",
88
- "@things-factory/more-ui": "^4.3.80-alpha.4",
89
- "@things-factory/notification": "^4.3.80-alpha.4",
90
- "@things-factory/pdf": "^4.3.80-alpha.4",
91
- "@things-factory/product-ui": "^4.3.80-alpha.4",
92
- "@things-factory/resource-ui": "^4.3.80-alpha.4",
93
- "@things-factory/sales-base": "^4.3.80-alpha.4",
94
- "@things-factory/scene-data-transform": "^4.3.80-alpha.4",
95
- "@things-factory/scene-excel": "^4.3.80-alpha.4",
96
- "@things-factory/scene-firebase": "^4.3.80-alpha.4",
97
- "@things-factory/scene-form": "^4.3.80-alpha.4",
98
- "@things-factory/scene-google-map": "^4.3.80-alpha.4",
99
- "@things-factory/scene-graphql": "^4.3.80-alpha.4",
100
- "@things-factory/scene-label": "^4.3.80-alpha.4",
101
- "@things-factory/scene-marker": "^4.3.80-alpha.4",
102
- "@things-factory/scene-mqtt": "^4.3.80-alpha.4",
103
- "@things-factory/scene-restful": "^4.3.80-alpha.4",
104
- "@things-factory/scene-visualizer": "^4.3.80-alpha.4",
105
- "@things-factory/setting-ui": "^4.3.80-alpha.4",
106
- "@things-factory/shell": "^4.3.80-alpha.4",
107
- "@things-factory/system-ui": "^4.3.80-alpha.4",
108
- "@things-factory/warehouse-base": "^4.3.80-alpha.4",
109
- "@things-factory/worksheet-base": "^4.3.80-alpha.4",
59
+ "@things-factory/api": "^4.3.82",
60
+ "@things-factory/apptool-ui": "^4.3.82",
61
+ "@things-factory/attachment-base": "^4.3.82",
62
+ "@things-factory/auth-base": "^4.3.82",
63
+ "@things-factory/auth-ui": "^4.3.82",
64
+ "@things-factory/biz-base": "^4.3.82",
65
+ "@things-factory/biz-ui": "^4.3.82",
66
+ "@things-factory/board-service": "^4.3.82",
67
+ "@things-factory/board-ui": "^4.3.82",
68
+ "@things-factory/code-ui": "^4.3.82",
69
+ "@things-factory/component-ui": "^4.3.82",
70
+ "@things-factory/context-ui": "^4.3.82",
71
+ "@things-factory/document-template-ui": "^4.3.82",
72
+ "@things-factory/export-ui": "^4.3.82",
73
+ "@things-factory/export-ui-csv": "^4.3.82",
74
+ "@things-factory/export-ui-excel": "^4.3.82",
75
+ "@things-factory/grist-ui": "^4.3.82",
76
+ "@things-factory/help": "^4.3.82",
77
+ "@things-factory/i18n-base": "^4.3.82",
78
+ "@things-factory/import-ui": "^4.3.82",
79
+ "@things-factory/import-ui-excel": "^4.3.82",
80
+ "@things-factory/integration-accounting": "^4.3.82",
81
+ "@things-factory/integration-fulfillment": "^4.3.82",
82
+ "@things-factory/integration-lmd": "^4.3.82",
83
+ "@things-factory/integration-marketplace": "^4.3.82",
84
+ "@things-factory/integration-pos": "^4.3.82",
85
+ "@things-factory/integration-sellercraft": "^4.3.82",
86
+ "@things-factory/integration-sftp": "^4.3.82",
87
+ "@things-factory/lite-menu": "^4.3.82",
88
+ "@things-factory/more-ui": "^4.3.82",
89
+ "@things-factory/notification": "^4.3.82",
90
+ "@things-factory/pdf": "^4.3.82",
91
+ "@things-factory/product-ui": "^4.3.82",
92
+ "@things-factory/resource-ui": "^4.3.82",
93
+ "@things-factory/sales-base": "^4.3.82",
94
+ "@things-factory/scene-data-transform": "^4.3.82",
95
+ "@things-factory/scene-excel": "^4.3.82",
96
+ "@things-factory/scene-firebase": "^4.3.82",
97
+ "@things-factory/scene-form": "^4.3.82",
98
+ "@things-factory/scene-google-map": "^4.3.82",
99
+ "@things-factory/scene-graphql": "^4.3.82",
100
+ "@things-factory/scene-label": "^4.3.82",
101
+ "@things-factory/scene-marker": "^4.3.82",
102
+ "@things-factory/scene-mqtt": "^4.3.82",
103
+ "@things-factory/scene-restful": "^4.3.82",
104
+ "@things-factory/scene-visualizer": "^4.3.82",
105
+ "@things-factory/setting-ui": "^4.3.82",
106
+ "@things-factory/shell": "^4.3.82",
107
+ "@things-factory/system-ui": "^4.3.82",
108
+ "@things-factory/warehouse-base": "^4.3.82",
109
+ "@things-factory/worksheet-base": "^4.3.82",
110
110
  "koa2-swagger-ui": "^5.0.2",
111
111
  "swagger-jsdoc": "^5.0.0",
112
112
  "yamljs": "^0.3.0"
113
113
  },
114
114
  "devDependencies": {
115
- "@things-factory/builder": "^4.3.80-alpha.4"
115
+ "@things-factory/builder": "^4.3.82"
116
116
  },
117
117
  "resolutions": {
118
118
  "core-js": "^3.16.0"
119
119
  },
120
- "gitHead": "8a4c9b0859c4d43ecbd90eb97374eac6780f4e19"
120
+ "gitHead": "fb0cb65bba75de2d2d0784202138d6d79dafa274"
121
121
  }
@@ -35,7 +35,6 @@ router.get(
35
35
  .orWhere('p.domain_id = :domainId', { domainId: bizplace.domain.id })
36
36
  .limit(limit)
37
37
  .offset(offset)
38
- .orderBy('p.created_at', 'DESC')
39
38
  .getRawMany()
40
39
 
41
40
  const count = await getRepository(Partner)
@@ -9,3 +9,4 @@ import './get-marketplace-store-list'
9
9
  import './get-partner-list'
10
10
  import './get-product-list'
11
11
  import './update-marketplace-order-delivered'
12
+ import './update-marketplace-shipping-order'
@@ -1,4 +1,4 @@
1
- import { getRepository } from 'typeorm'
1
+ import { getConnection, EntityManager } from 'typeorm'
2
2
 
3
3
  import { restfulApiRouter as router } from '@things-factory/api'
4
4
  import { MarketplaceOrder } from '@things-factory/marketplace-base'
@@ -14,47 +14,50 @@ router.post(
14
14
  loggingMiddleware,
15
15
  async (context, next) => {
16
16
  try {
17
- // check if name exists under the domain of the requester
18
- const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
19
- where: { name: context.request.body.data.storeId, domain: context.state.business.domain }
20
- })
21
- if (!marketplaceStore) throw new ApiError('E04', 'storeId')
17
+ await getConnection().transaction(async (tx: EntityManager) => {
18
+ // check if name exists under the domain of the requester
19
+ const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne({
20
+ where: { name: context.request.body.data.storeId, domain: context.state.business.domain }
21
+ })
22
+ if (!marketplaceStore) throw new ApiError('E04', 'storeId')
22
23
 
23
- // update values to DB
24
- // restricted to marketplaceStores in the domain of the requester
25
- const datapoint = context.request.body.data
26
- const result = await getRepository(MarketplaceOrder)
27
- .createQueryBuilder()
28
- .update(MarketplaceOrder)
29
- .set({ status: 'delivered' })
30
- .where({ orderNo: datapoint.orderNo, marketplaceStore })
31
- .execute()
32
- if (result.affected !== 1) throw new ApiError('E01', 'orderNo is invalid')
24
+ // update values to DB
25
+ // restricted to marketplaceStores in the domain of the requester
26
+ const datapoint = context.request.body.data
27
+ const result = await tx
28
+ .getRepository(MarketplaceOrder)
29
+ .createQueryBuilder()
30
+ .update(MarketplaceOrder)
31
+ .set({ status: 'delivered' })
32
+ .where({ orderNo: datapoint.orderNo, marketplaceStore })
33
+ .execute()
34
+ if (result.affected !== 1) throw new ApiError('E01', 'orderNo is invalid')
33
35
 
34
- const marketplaceOrder: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
35
- where: { orderNo: datapoint.orderNo, marketplaceStore },
36
- relations: ['domain', 'marketplaceStore', 'updater']
37
- })
36
+ const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
37
+ where: { orderNo: datapoint.orderNo, marketplaceStore },
38
+ relations: ['domain', 'marketplaceStore', 'updater']
39
+ })
38
40
 
39
- // create and format response
40
- const data = {
41
- orderNo: marketplaceOrder.orderNo,
42
- status: marketplaceOrder.status,
43
- updatedAt: marketplaceOrder.updatedAt,
44
- domain: {
45
- name: marketplaceOrder.domain.name
46
- },
47
- marketplaceStore: {
48
- name: marketplaceOrder.marketplaceStore.storeName
49
- },
50
- updater: {
51
- name: marketplaceOrder.updater.name
41
+ // create and format response
42
+ const data = {
43
+ orderNo: marketplaceOrder.orderNo,
44
+ status: marketplaceOrder.status,
45
+ updatedAt: marketplaceOrder.updatedAt,
46
+ domain: {
47
+ name: marketplaceOrder.domain.name
48
+ },
49
+ marketplaceStore: {
50
+ name: marketplaceOrder.marketplaceStore.storeName
51
+ },
52
+ updater: {
53
+ name: marketplaceOrder.updater.name
54
+ }
52
55
  }
53
- }
54
56
 
55
- context.body = {
56
- data
57
- }
57
+ context.body = {
58
+ data
59
+ }
60
+ })
58
61
  } catch (e) {
59
62
  if (e instanceof ApiError) ApiErrorHandler(context, e)
60
63
  else throwInternalServerError(context, e)
@@ -0,0 +1,55 @@
1
+ import { getConnection, EntityManager } from 'typeorm'
2
+ import { restfulApiRouter as router } from '@things-factory/api'
3
+ import { MarketplaceOrderShipping as MarketplaceOrderShippingEntity } from '@things-factory/marketplace-base'
4
+ import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
5
+ import { businessMiddleware, validationMiddleware, loggingMiddleware, storeMiddleware } from '../middlewares'
6
+ import { User } from '@things-factory/auth-base'
7
+
8
+ router.post(
9
+ '/v1/company/update-marketplace-shipping-order',
10
+ businessMiddleware,
11
+ validationMiddleware,
12
+ loggingMiddleware,
13
+ storeMiddleware,
14
+ async (context, next) => {
15
+ await getConnection().transaction(async (tx: EntityManager) => {
16
+ try {
17
+ const { user }: { user: User } = context.state
18
+ const { marketplaceStore } = context.state
19
+ const data = context.request.body.data
20
+ let marketplaceOrderShipping: MarketplaceOrderShippingEntity = await tx
21
+ .getRepository(MarketplaceOrderShippingEntity)
22
+ .findOne({
23
+ where: { marketplaceStore, subOrderNoRef: data.orderNo },
24
+ relations: ['marketplaceStore']
25
+ })
26
+
27
+ if (!marketplaceOrderShipping) throw new ApiError('E04', 'Order Shipping')
28
+
29
+ marketplaceOrderShipping.ownTrackingNo = data.trackingNo
30
+
31
+ if (marketplaceOrderShipping.marketplaceStore.platform == 'lazada') {
32
+ if (data.trackingNo) {
33
+ data.trackingNo = marketplaceOrderShipping.trackingNo
34
+ }
35
+ }
36
+
37
+ marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShippingEntity).save({
38
+ ...marketplaceOrderShipping,
39
+ ...data,
40
+ updater: user
41
+ })
42
+
43
+ context.body = {
44
+ orderNoRef: marketplaceOrderShipping.orderNoRef,
45
+ transporter: marketplaceOrderShipping.transporter,
46
+ airwayBill: marketplaceOrderShipping.airwayBill,
47
+ trackingNo: marketplaceOrderShipping.trackingNo
48
+ }
49
+ } catch (e) {
50
+ if (e instanceof ApiError) ApiErrorHandler(context, e)
51
+ else throwInternalServerError(context, e)
52
+ }
53
+ })
54
+ }
55
+ )
@@ -7,7 +7,7 @@ import { MarketplaceStore as MarketplaceStoreEntity } from '@things-factory/inte
7
7
  const debug = require('debug')('things-factory:operato-hub:store-middleware')
8
8
 
9
9
  export async function storeMiddleware(context, next) {
10
- const { storeId } = context.query
10
+ const { storeId } = context.method == 'GET' ? context.query : context.request.body.data
11
11
  const { business } = context.state
12
12
 
13
13
  let marketplaceStore: MarketplaceStoreEntity
@@ -13,7 +13,7 @@ export async function validationMiddleware(context, next) {
13
13
  // validate data key
14
14
  try {
15
15
  if (context.method == 'POST' && !context?.request?.body?.data) {
16
- throw new ApiError('E03', 'data')
16
+ throw new ApiError('E03', 'data')
17
17
  }
18
18
 
19
19
  validateExpected(endpoint, context)
@@ -50,10 +50,12 @@ function validateRequired(endpoint, context) {
50
50
  let data = context.method == 'POST' ? context.request.body.data : context.request.query
51
51
  let required = reqParams[endpoint]
52
52
  let result = context.method == 'POST' ? Object.keys(flatten(data)) : Object.keys(data)
53
- for (let r of required) {
54
- let v = r.split('.').slice(0, -1).join('.')
55
- if (!required.includes(v) && !result.includes(v)) continue
56
- if (!result.includes(r)) throw new ApiError('E03', r.toString())
53
+ if (required) {
54
+ for (let r of required) {
55
+ let v = r.split('.').slice(0, -1).join('.')
56
+ if (!required.includes(v) && !result.includes(v)) continue
57
+ if (!result.includes(r)) throw new ApiError('E03', r.toString())
58
+ }
57
59
  }
58
60
  }
59
61
 
@@ -241,7 +241,8 @@ export const params = {
241
241
  'shippingOrder.to',
242
242
  'shippingOrder.containerArrivalDate',
243
243
  'shippingOrder.containerLeavingDate'
244
- ]
244
+ ],
245
+ 'update-marketplace-shipping-order': ['storeId', 'orderNo', 'transporter', 'airwayBill', 'trackingNo']
245
246
  }
246
247
 
247
248
  export const reqParams = {
@@ -331,7 +332,8 @@ export const reqParams = {
331
332
  'shippingOrder.containerNo',
332
333
  'shippingOrder.containerArrivalDate',
333
334
  'shippingOrder.containerLeavingDate'
334
- ]
335
+ ],
336
+ 'update-marketplace-shipping-order': ['storeId', 'orderNo', 'airwayBill', 'trackingNo']
335
337
  }
336
338
 
337
339
  export const requireLimitOffsetValidation = [