@things-factory/operato-hub 4.3.135 → 4.3.138

package/server/routers/api/restful-apis/v1/company/get-product-list.ts

@@ -24,7 +24,7 @@ router.get(
       delete filter['offset']
       const [products, totalCount]: Product[] = await getRepository(Product).findAndCount({
         where: filter,
-        relations: ['productDetails'],
+        relations: ['productDetails', 'productDetails.productBarcodes'],
         skip: offset,
         take: limit,
         order: { createdAt: 'DESC' }
@@ -37,7 +37,7 @@ router.get(
         for (const productDetail of product.productDetails) {
           const productDetailDataPoint = {
             isDefault: productDetail.isDefault,
-            gtin: productDetail.gtin,
+            gtin: productDetail.productBarcodes.map(itm => itm.gtin),
             refCode: productDetail.refCode,
             packingType: productDetail.packingType,
             packingSize: productDetail.packingSize,

package/server/routers/api/restful-apis/v1/company/update-marketplace-shipping-order.ts

@@ -28,7 +28,6 @@ router.post(
 
         marketplaceOrderShipping.ownTrackingNo = data.trackingNo
 
-
         marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShippingEntity).save({
           ...marketplaceOrderShipping,
           ...data,

package/server/routers/api/restful-apis/v1/middlewares/business-middleware.ts

@@ -45,8 +45,7 @@ export async function businessMiddleware(context, next) {
           }
         }
         context.state.business = bizplace.company
-      }
-      else if ((domain.extType === 'company')) {
+      } else if (domain.extType === 'company') {
         let company = await getRepository(Company).findOne({ where: { domain }, relations: ['domain'] })
         context.state.business = company
       }

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -401,14 +401,18 @@ async function createReleaseGood(
     })
   }
 
-    // standardise country
-    let deliveryCountry: GeoCountry = releaseGood?.country ? await geoCountryRepo.findOne({
-      where: [{ name: ILike(releaseGood?.country) }, { description: ILike(releaseGood?.country) }]
-    }) : null
+  // standardise country
+  let deliveryCountry: GeoCountry = releaseGood?.country
+    ? await geoCountryRepo.findOne({
+        where: [{ name: ILike(releaseGood?.country) }, { description: ILike(releaseGood?.country) }]
+      })
+    : null
 
-    let platformCountry: GeoCountry = releaseGood?.platformCountry ? await geoCountryRepo.findOne({
-      where: [{ name: ILike(releaseGood.platformCountry) }, { description: ILike(releaseGood.platformCountry) }]
-    }) : null
+  let platformCountry: GeoCountry = releaseGood?.platformCountry
+    ? await geoCountryRepo.findOne({
+        where: [{ name: ILike(releaseGood.platformCountry) }, { description: ILike(releaseGood.platformCountry) }]
+      })
+    : null
 
   newReleaseGood = {
     name: roNoSetting
@@ -899,8 +903,9 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
               sum(qty - locked_qty - release_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
               from (
                 SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize
-              }' as packing_size,
+                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${
+          orderInventory.packingSize
+        }' as packing_size,
                 null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, null as created_at,
                 '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
                 UNION

package/server/routers/api/restful-apis/v1/warehouse/cancel-inbound-order.ts

@@ -40,7 +40,11 @@ router.post(
           where: { name: bodyReq.ganNo }
         })
         if (!validateArrivalNotice) throw new ApiError('E04', 'ganNo')
-        if (validateArrivalNotice && validateArrivalNotice.status != ORDER_STATUS.PENDING_RECEIVE) throw new ApiError('E01', `${validateArrivalNotice.name} is in "${validateArrivalNotice.status}" and not "${ORDER_STATUS.PENDING_RECEIVE}" state`)
+        if (validateArrivalNotice && validateArrivalNotice.status != ORDER_STATUS.PENDING_RECEIVE)
+          throw new ApiError(
+            'E01',
+            `${validateArrivalNotice.name} is in "${validateArrivalNotice.status}" and not "${ORDER_STATUS.PENDING_RECEIVE}" state`
+          )
 
         const arrivalNotice: ArrivalNotice = await rejectArrivalNotice(
           tx,

package/server/routers/api/restful-apis/v1/warehouse/get-onhand-inventory-list.ts

@@ -3,7 +3,6 @@ import { Between, getRepository } from 'typeorm'
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Inventory } from '@things-factory/warehouse-base'
 
-
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
 import _ from 'lodash'
 import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
@@ -20,7 +19,7 @@ router.get(
       filter['bizplace'] = filter['bizplaceId']
       delete filter['bizplaceId']
       if (_.has(filter, 'sku')) {
-        filter.product = { sku: filter['sku']}
+        filter.product = { sku: filter['sku'] }
         delete filter['sku']
       }
       filter['createdAt'] = Between(fromDate, toDate)
@@ -52,7 +51,9 @@ router.get(
           qty: inventory.qty,
           reservedQty: inventory.lockedQty,
           expirationDate: inventory.expirationDate,
-          weight: inventory.product.weight ? `${inventory.product.weight * inventory.qty} ${inventory.product.weightUnit}` : null,
+          weight: inventory.product.weight
+            ? `${inventory.product.weight * inventory.qty} ${inventory.product.weightUnit}`
+            : null,
           lastSeq: inventory?.lastSeq,
           status: 'STORED',
           product: {

package/server/routers/xilnex-router.ts

@@ -161,6 +161,7 @@ xilnexRouter.post('/webhook-xilnex-po', async (context, next) => {
                 uom: productDetail?.uom,
                 uomValue: productDetail?.uomValue,
                 packQty: item.confirmedQty,
+                palletQty: 1,
                 totalUomValue: `${(productDetail.uomValue * item.confirmedQty).toFixed(2)} ${productDetail.uom}`,
                 status: PURCHASE_ORDER_STATUS.DRAFT,
                 unitPrice: item.unitCost || 1,
@@ -443,6 +444,7 @@ xilnexRouter.post('/webhook-xilnex-transfer-note', async (context, next) => {
                   uom: productDetail?.uom,
                   uomValue: productDetail?.uomValue,
                   packQty: item.confirmedQty,
+                  palletQty: 1,
                   totalUomValue: `${(productDetail.uomValue * item.confirmedQty).toFixed(2)} ${productDetail.uom}`,
                   status: 'PENDING',
                   arrivalNotice,

package/translations/en.json

@@ -37,6 +37,7 @@
   "label.warehouse": "warehouse",
 
   "text.are_you_sure_to_sync_product": "are you sure to sync product?",
+  "text.attachment_info_not_valid": "attachment info not valid",
   "text.nothing_to_sync": "no data available for synchronisation",
   "text.please_select_template_type": "please select template type",
   "text.please_wait": "please wait",
@@ -47,6 +48,7 @@
   "text.user_deleted_successfully": "user deleted successfully",
   "text.x_cannot_delete": "{x} cannot be deleted",
   "text.transform_to_x": "transform to {x}",
+  "text.contact_type_does_not_exist": "contact type does not exist",
 
   "error.company not found": "company not found",
   "error.eta date is invalid": "eta date is invalid",

package/translations/ko.json

@@ -17,6 +17,7 @@
   "label.state": "상태",
 
   "text.are_you_sure_to_sync_product": "상품을 동기화하시겠습니까?",
+  "text.attachment_info_not_valid": "첨부파일 정보 유효하지 않음",
   "text.nothing_to_sync": "[ko]no data available for synchronisation",
   "text.please_wait": "잠시만 기다려주세요.",
   "text.product_sync_to_accounting": "[ko]synchronising product to accounting platform",
@@ -55,6 +56,7 @@
   "text.transform_to_x": "{x}로 변경",
   "text.user_deleted_successfully": "성공적으로 사용자를 삭제하였습니다.",
   "text.x_cannot_delete": "{x}(은)는 삭제할 수 없습니다.",
+  "text.contact_type_does_not_exist": "[ko]contact type does not exist",
   "error.warehouse not found": "웨어하우스를 찾을 수 없습니다.",
   "error.warehouse not found in the company": "회사내에서 웨어하우스를 찾을 수 없습니다.",
 

package/translations/ms.json

@@ -32,12 +32,14 @@
   "label.warehouse": "[ms] warehouse",
 
   "text.are_you_sure_to_sync_product": "[ms] are you sure to sync product?",
+  "text.attachment_info_not_valid": "informasi lampiran tidak sah",
   "text.nothing_to_sync": "[ms] no data available for synchronisation",
   "text.please_select_template_type": "[ms] please select template type",
   "text.please_wait": "[ms] please wait",
   "text.product_sync_to_accounting": "[ms] synchronising product to accounting platform",
   "text.success": "[ms] success",
   "text.transform_to_x": "[ms] transform to {x}",
+  "text.contact_type_does_not_exist": "[ms]contact type does not exist",
 
   "error.company not found": "[ms] company not found",
   "error.eta date is invalid": "[ms] eta date is invalid",

package/translations/zh.json

@@ -36,12 +36,14 @@
   "label.warehouse": "仓库",
 
   "text.are_you_sure_to_sync_product": "您确定要同步产品信息吗？",
+  "text.attachment_info_not_valid": "attachment info not valid",
   "text.nothing_to_sync": "没有可用于同步的数据！",
   "text.please_select_template_type": "请选择模板类型！",
   "text.please_wait": "请等待",
   "text.product_sync_to_accounting": "正在将产品与会计平台同步",
   "text.success": "成功",
   "text.transform_to_x": "变更为{x}",
+  "text.contact_type_does_not_exist": "[zh]contact type does not exist",
 
   "error.company not found": "未找到公司信息。",
   "error.eta date is invalid": "[zh] eta date is invalid",