@things-factory/operato-hub 4.3.747 → 4.3.752

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.
@@ -47,22 +47,20 @@ api_1.restfulApiRouter.post('/v1/company/add-products', middlewares_1.businessMi
47
47
  delete product.productDetails;
48
48
  let result = await tx.getRepository(product_base_1.Product).save(product);
49
49
  const duplicates = findDuplicates(productDetails);
50
+ // check isDefault
51
+ const updatedProductDetails = await checkProductDetails(productDetails);
50
52
  // save product details
51
- let pds = await Promise.all(productDetails.map(async (pd, index) => {
53
+ let pds = await Promise.all(updatedProductDetails.map(async (pd, index) => {
52
54
  var _a;
53
55
  if (pd.packingSize < 0)
54
56
  throw new error_util_1.ApiError('E01', `${pd.gtin}: packing size cannot be negative`);
55
57
  const count = index + 1;
56
- const updatedProductDetails = checkProductDetails(productDetails);
57
- const productDetail = updatedProductDetails.find(detail => detail.gtin === pd.gtin);
58
- const productBarcodes = productDetail.productBarcodes;
58
+ const productBarcodes = pd.productBarcodes;
59
59
  const duplicateIndexes = duplicates.get(`${pd.packingType}-${pd.packingSize}`);
60
60
  let nameIndex = duplicateIndexes.length > 1 ? ` (${duplicateIndexes.indexOf(index) + 1})` : '';
61
61
  let productDetailsName = `${product.name} (${pd.packingType}) (${pd.packingSize})${nameIndex}`;
62
- let pdResult = await tx.getRepository(product_base_1.ProductDetail).save(Object.assign(Object.assign({}, productDetail), { name: productDetailsName, product: result, refCode: productDetail.refCode && productDetail.refCode !== ''
63
- ? (_a = productDetail === null || productDetail === void 0 ? void 0 : productDetail.refCode) === null || _a === void 0 ? void 0 : _a.trim()
64
- : result.sku + '-000' + count, childProductDetail: null, childQty: 0, domain: domain, creator: user, updater: user }));
65
- if (productDetail.isDefault) {
62
+ let pdResult = await tx.getRepository(product_base_1.ProductDetail).save(Object.assign(Object.assign({}, pd), { name: productDetailsName, product: result, refCode: pd.refCode && pd.refCode !== '' ? (_a = pd === null || pd === void 0 ? void 0 : pd.refCode) === null || _a === void 0 ? void 0 : _a.trim() : result.sku + '-000' + count, childProductDetail: null, childQty: 0, domain: domain, creator: user, updater: user }));
63
+ if (pd.isDefault) {
66
64
  await tx.getRepository(product_base_1.Product).update({ id: result.id }, {
67
65
  packingType: pdResult.packingType,
68
66
  weightUnit: pdResult.weightUnit,
@@ -1 +1 @@
1
- {"version":3,"file":"add-products.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/add-products.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-products.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/company/add-products.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.747",
3
+ "version": "4.3.752",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -55,61 +55,61 @@
55
55
  "@operato/scene-tab": "^0.1.8",
56
56
  "@operato/scene-table": "^0.1.8",
57
57
  "@operato/scene-wheel-sorter": "^0.1.8",
58
- "@things-factory/api": "^4.3.743",
59
- "@things-factory/apptool-ui": "^4.3.743",
60
- "@things-factory/attachment-base": "^4.3.743",
61
- "@things-factory/auth-base": "^4.3.743",
62
- "@things-factory/auth-ui": "^4.3.743",
63
- "@things-factory/biz-base": "^4.3.745",
64
- "@things-factory/biz-ui": "^4.3.745",
65
- "@things-factory/board-service": "^4.3.743",
66
- "@things-factory/board-ui": "^4.3.743",
67
- "@things-factory/code-ui": "^4.3.743",
68
- "@things-factory/component-ui": "^4.3.743",
69
- "@things-factory/context-ui": "^4.3.743",
70
- "@things-factory/document-template-ui": "^4.3.743",
71
- "@things-factory/export-ui": "^4.3.743",
72
- "@things-factory/export-ui-csv": "^4.3.743",
73
- "@things-factory/export-ui-excel": "^4.3.743",
74
- "@things-factory/geography": "^4.3.743",
75
- "@things-factory/grist-ui": "^4.3.743",
76
- "@things-factory/help": "^4.3.743",
77
- "@things-factory/i18n-base": "^4.3.743",
78
- "@things-factory/import-ui": "^4.3.743",
79
- "@things-factory/import-ui-excel": "^4.3.743",
80
- "@things-factory/integration-accounting": "^4.3.745",
81
- "@things-factory/integration-fulfillment": "^4.3.745",
82
- "@things-factory/integration-lmd": "^4.3.745",
83
- "@things-factory/integration-marketplace": "^4.3.745",
84
- "@things-factory/integration-pos": "^4.3.745",
85
- "@things-factory/integration-powrup": "^4.3.745",
86
- "@things-factory/integration-sellercraft": "^4.3.745",
87
- "@things-factory/integration-sftp": "^4.3.745",
88
- "@things-factory/lite-menu": "^4.3.743",
89
- "@things-factory/marketplace-base": "^4.3.745",
90
- "@things-factory/more-ui": "^4.3.743",
91
- "@things-factory/notification": "^4.3.743",
92
- "@things-factory/pdf": "^4.3.743",
93
- "@things-factory/product-ui": "^4.3.745",
94
- "@things-factory/resource-ui": "^4.3.743",
95
- "@things-factory/sales-base": "^4.3.745",
96
- "@things-factory/scene-data-transform": "^4.3.743",
97
- "@things-factory/scene-excel": "^4.3.743",
98
- "@things-factory/scene-firebase": "^4.3.743",
99
- "@things-factory/scene-form": "^4.3.743",
100
- "@things-factory/scene-google-map": "^4.3.743",
101
- "@things-factory/scene-graphql": "^4.3.743",
102
- "@things-factory/scene-label": "^4.3.743",
103
- "@things-factory/scene-marker": "^4.3.743",
104
- "@things-factory/scene-mqtt": "^4.3.743",
105
- "@things-factory/scene-restful": "^4.3.743",
106
- "@things-factory/scene-visualizer": "^4.3.743",
107
- "@things-factory/setting-ui": "^4.3.743",
108
- "@things-factory/shell": "^4.3.743",
109
- "@things-factory/system-ui": "^4.3.743",
110
- "@things-factory/transport-base": "^4.3.745",
111
- "@things-factory/warehouse-base": "^4.3.745",
112
- "@things-factory/worksheet-base": "^4.3.747",
58
+ "@things-factory/api": "^4.3.752",
59
+ "@things-factory/apptool-ui": "^4.3.752",
60
+ "@things-factory/attachment-base": "^4.3.752",
61
+ "@things-factory/auth-base": "^4.3.752",
62
+ "@things-factory/auth-ui": "^4.3.752",
63
+ "@things-factory/biz-base": "^4.3.752",
64
+ "@things-factory/biz-ui": "^4.3.752",
65
+ "@things-factory/board-service": "^4.3.752",
66
+ "@things-factory/board-ui": "^4.3.752",
67
+ "@things-factory/code-ui": "^4.3.752",
68
+ "@things-factory/component-ui": "^4.3.752",
69
+ "@things-factory/context-ui": "^4.3.752",
70
+ "@things-factory/document-template-ui": "^4.3.752",
71
+ "@things-factory/export-ui": "^4.3.752",
72
+ "@things-factory/export-ui-csv": "^4.3.752",
73
+ "@things-factory/export-ui-excel": "^4.3.752",
74
+ "@things-factory/geography": "^4.3.752",
75
+ "@things-factory/grist-ui": "^4.3.752",
76
+ "@things-factory/help": "^4.3.752",
77
+ "@things-factory/i18n-base": "^4.3.752",
78
+ "@things-factory/import-ui": "^4.3.752",
79
+ "@things-factory/import-ui-excel": "^4.3.752",
80
+ "@things-factory/integration-accounting": "^4.3.752",
81
+ "@things-factory/integration-fulfillment": "^4.3.752",
82
+ "@things-factory/integration-lmd": "^4.3.752",
83
+ "@things-factory/integration-marketplace": "^4.3.752",
84
+ "@things-factory/integration-pos": "^4.3.752",
85
+ "@things-factory/integration-powrup": "^4.3.752",
86
+ "@things-factory/integration-sellercraft": "^4.3.752",
87
+ "@things-factory/integration-sftp": "^4.3.752",
88
+ "@things-factory/lite-menu": "^4.3.752",
89
+ "@things-factory/marketplace-base": "^4.3.752",
90
+ "@things-factory/more-ui": "^4.3.752",
91
+ "@things-factory/notification": "^4.3.752",
92
+ "@things-factory/pdf": "^4.3.752",
93
+ "@things-factory/product-ui": "^4.3.752",
94
+ "@things-factory/resource-ui": "^4.3.752",
95
+ "@things-factory/sales-base": "^4.3.752",
96
+ "@things-factory/scene-data-transform": "^4.3.752",
97
+ "@things-factory/scene-excel": "^4.3.752",
98
+ "@things-factory/scene-firebase": "^4.3.752",
99
+ "@things-factory/scene-form": "^4.3.752",
100
+ "@things-factory/scene-google-map": "^4.3.752",
101
+ "@things-factory/scene-graphql": "^4.3.752",
102
+ "@things-factory/scene-label": "^4.3.752",
103
+ "@things-factory/scene-marker": "^4.3.752",
104
+ "@things-factory/scene-mqtt": "^4.3.752",
105
+ "@things-factory/scene-restful": "^4.3.752",
106
+ "@things-factory/scene-visualizer": "^4.3.752",
107
+ "@things-factory/setting-ui": "^4.3.752",
108
+ "@things-factory/shell": "^4.3.752",
109
+ "@things-factory/system-ui": "^4.3.752",
110
+ "@things-factory/transport-base": "^4.3.752",
111
+ "@things-factory/warehouse-base": "^4.3.752",
112
+ "@things-factory/worksheet-base": "^4.3.752",
113
113
  "cron-parser": "^4.7.0",
114
114
  "koa2-swagger-ui": "^5.0.2",
115
115
  "swagger-jsdoc": "^5.0.0",
@@ -117,10 +117,10 @@
117
117
  "yamljs": "^0.3.0"
118
118
  },
119
119
  "devDependencies": {
120
- "@things-factory/builder": "^4.3.743"
120
+ "@things-factory/builder": "^4.3.752"
121
121
  },
122
122
  "resolutions": {
123
123
  "core-js": "^3.16.0"
124
124
  },
125
- "gitHead": "f75b0a9eee4f2843663d2a652d96be2a8790e6d6"
125
+ "gitHead": "cc2f8abfd00055dfbd1737e3016fe4a464af2548"
126
126
  }
@@ -66,29 +66,26 @@ router.post(
66
66
 
67
67
  const duplicates = findDuplicates(productDetails)
68
68
 
69
+ // check isDefault
70
+ const updatedProductDetails = await checkProductDetails(productDetails)
71
+
69
72
  // save product details
70
73
  let pds = await Promise.all(
71
- productDetails.map(async (pd, index) => {
74
+ updatedProductDetails.map(async (pd, index) => {
72
75
  if (pd.packingSize < 0) throw new ApiError('E01', `${pd.gtin}: packing size cannot be negative`)
73
76
  const count = index + 1
74
- const updatedProductDetails = checkProductDetails(productDetails)
75
-
76
- const productDetail = updatedProductDetails.find(detail => detail.gtin === pd.gtin)
77
77
 
78
- const productBarcodes = productDetail.productBarcodes
78
+ const productBarcodes = pd.productBarcodes
79
79
 
80
80
  const duplicateIndexes = duplicates.get(`${pd.packingType}-${pd.packingSize}`)
81
81
  let nameIndex = duplicateIndexes.length > 1 ? ` (${duplicateIndexes.indexOf(index) + 1})` : ''
82
82
  let productDetailsName = `${product.name} (${pd.packingType}) (${pd.packingSize})${nameIndex}`
83
83
 
84
84
  let pdResult = await tx.getRepository(ProductDetail).save({
85
- ...productDetail,
85
+ ...pd,
86
86
  name: productDetailsName,
87
87
  product: result,
88
- refCode:
89
- productDetail.refCode && productDetail.refCode !== ''
90
- ? productDetail?.refCode?.trim()
91
- : result.sku + '-000' + count,
88
+ refCode: pd.refCode && pd.refCode !== '' ? pd?.refCode?.trim() : result.sku + '-000' + count,
92
89
  childProductDetail: null,
93
90
  childQty: 0,
94
91
  domain: domain,
@@ -96,7 +93,7 @@ router.post(
96
93
  updater: user
97
94
  })
98
95
 
99
- if (productDetail.isDefault) {
96
+ if (pd.isDefault) {
100
97
  await tx.getRepository(Product).update(
101
98
  { id: result.id },
102
99
  {