@things-factory/sales-base 4.3.108 → 4.3.109

package/server/service/order-inventory/order-inventory-query.ts

@@ -286,7 +286,6 @@ export class OrderInventoryQuery {
       .leftJoinAndSelect('oi.bizplace', 'bizplace')
       .leftJoinAndSelect('oi.inventory', 'inventory')
       .leftJoinAndSelect('inventory.product', 'product')
-      .leftJoinAndSelect('inventory.productDetail', 'productDetail')
       .leftJoinAndSelect('oi.creator', 'creator')
       .leftJoinAndSelect('oi.updater', 'updater')
 
@@ -300,7 +299,6 @@ export class OrderInventoryQuery {
         releaseGoodName: item.releaseGood.name,
         palletId: item.inventory.palletId,
         productId: item.inventory.product.id,
-        productDetailId: item.inventory.productDetail.id,
         productName: item.inventory.product.name,
         productSKU: item.inventory.product.sku,
         productBrand: item.inventory.product.brand,

package/server/service/order-inventory/order-inventory-types.ts

@@ -41,9 +41,6 @@ export class NewOrderInventory {
   @Field(type => NewProduct, { nullable: true })
   product: NewProduct
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field({ nullable: true })
   productSKU: string
 
@@ -203,9 +200,6 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   productId: string
 
-  @Field({ nullable: true })
-  productDetailId: string
-
   @Field({ nullable: true })
   orderProductId: string
 

package/server/service/order-inventory/order-inventory.ts

@@ -13,7 +13,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail} from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -341,13 +341,6 @@ export class OrderInventory {
   @Field({ nullable: true })
   loadedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
-  @Field({ nullable: true })
-  productDetailId: String
-
   @Field({ nullable: true })
   dispatchedAt: Date
 

package/server/service/order-product/order-product-query.ts

@@ -26,7 +26,6 @@ export class OrderProductQuery {
 
     let qb: SelectQueryBuilder<OrderProduct> = await getRepository(OrderProduct).createQueryBuilder('op')
     qb.leftJoinAndSelect('op.product', 'product')
-      .leftJoinAndSelect('op.productDetail', 'productDetail')
       .leftJoinAndSelect('op.domain', 'domain')
       .leftJoinAndSelect('op.bizplace', 'bizplace')
       .leftJoinAndSelect('bizplace.company', 'company')

package/server/service/order-product/order-product-types.ts

@@ -90,9 +90,6 @@ export class OrderProductPatch {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 
@@ -234,9 +231,6 @@ export class NewOrderProduct {
   @Field(type => ObjectRef, { nullable: true })
   toInventory: ObjectRef
 
-  @Field(type => ObjectRef, { nullable: true })
-  productDetail: ObjectRef
-
   @Field(type => InboundProduct, { nullable: true })
   product: InboundProduct
 

package/server/service/order-vas/order-vas.ts

@@ -12,7 +12,7 @@ import {
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
@@ -200,10 +200,6 @@ export class OrderVas {
   @Field()
   updatedAt: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   creator: User
@@ -217,5 +213,4 @@ export class OrderVas {
 
   @RelationId((orderVas: OrderVas) => orderVas.updater)
   updaterId: string
-
 }

package/server/service/others/other-query.ts

@@ -7,7 +7,6 @@ import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain, ListParam } from '@things-factory/shell'
-import i18next from 'i18next'
 
 import {
   InventoryProductGroup,
@@ -188,12 +187,6 @@ export class OtherQuery {
           operator: 'eq',
           value: orderInventory.packingType
         })
-      } else {
-        filters.push({
-          name: 'packingType',
-          operator: 'eq',
-          value: ''
-        })
       }
 
       const params: any = {
@@ -212,30 +205,32 @@ export class OtherQuery {
 
       let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       const newOrderInventory: any = {
-        product:
-          total > 0 ? { id: items[0].productId, sku: items[0].productSKU, name: items[0].productName } : { id: null },
-        productDetail: total > 0 ? { id: items[0].productDetailId } : null,
-        inventory:
-          total > 0
-            ? {
-                ...items[0],
-                remainQty: total > 0 ? items[0].remainQty : null,
-                remainUomValue: total > 0 ? items[0].remainUomValue : null,
-                remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
-              }
-            : null,
-        productId: total > 0 ? items[0].productId : null,
-        productDetailID: total > 0 ? items[0].productDetailId : null,
-        productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
-        productName: total > 0 ? items[0].productName : null,
-        uom: total > 0 ? items[0].uom : null,
-        remainQty: total > 0 ? items[0].remainQty : null,
-        remainUomValue: total > 0 ? items[0].remainUomValue : null,
-        remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',
-        batchId: total > 0 ? items[0].batchId : null,
-        batchIdRef: total > 0 ? items[0].batchIdRef : null,
-        packingType: total > 0 ? items[0].packingType : orderInventory.packingType,
-        packingSize: total > 0 ? items[0].packingSize : 1,
+        product: availableItem
+          ? {
+              id: availableItem.productId,
+              sku: availableItem.productSKU,
+              name: availableItem.productName
+            }
+          : { id: null },
+        inventory: availableItem
+          ? {
+              ...availableItem,
+              remainQty: availableItem ? availableItem.remainQty : null,
+              remainUomValue: availableItem ? availableItem.remainUomValue : null,
+              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
+            }
+          : null,
+        productId: availableItem ? availableItem.productId : null,
+        productSKU: availableItem ? availableItem.productSKU : orderInventory.productSKU,
+        productName: availableItem ? availableItem.productName : null,
+        uom: availableItem ? availableItem.uom : null,
+        remainQty: availableItem ? availableItem.remainQty : null,
+        remainUomValue: availableItem ? availableItem.remainUomValue : null,
+        remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : '',
+        batchId: availableItem ? availableItem.batchId : null,
+        batchIdRef: availableItem ? availableItem.batchIdRef : null,
+        packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
+        packingSize: availableItem ? availableItem.packingSize : 1,
         releaseQty: orderInventory.releaseQty
           ? Number.isInteger(orderInventory.releaseQty)
             ? orderInventory.releaseQty
@@ -247,7 +242,7 @@ export class OtherQuery {
             : null
           : null,
         groupType: availableItem ? availableItem.groupType : null,
-        isError: !availableItem || !orderInventory.releaseQty || !orderInventory.packingType ? true : false
+        isError: !availableItem ? true : false
       }
 
       newOrderInventories.push(newOrderInventory)
@@ -301,132 +296,128 @@ export class OtherQuery {
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    try {
-      const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
-        context.state
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+      context.state
 
-      const productDetailRepo = tx.getRepository(ProductDetail)
+    const productDetailRepo = tx.getRepository(ProductDetail)
 
-      let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
-      let foundPermittedBizplace: Bizplace
-      let companyBizplace: Bizplace
+    let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
+    let foundPermittedBizplace: Bizplace
+    let companyBizplace: Bizplace
 
-      if (partnerBizplaceId) {
-        foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == partnerBizplaceId)
+    if (partnerBizplaceId) {
+      foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == partnerBizplaceId)
 
-        if (foundPermittedBizplace) {
-          if (!foundPermittedBizplace.company?.id) {
-            foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
-              relations: ['domain', 'company', 'company.domain']
-            })
-          }
-          const companyDomain: Domain = foundPermittedBizplace.company.domain
-          companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
+      if (foundPermittedBizplace) {
+        if (!foundPermittedBizplace.company?.id) {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+            relations: ['domain', 'company', 'company.domain']
+          })
         }
+        const companyDomain: Domain = foundPermittedBizplace.company.domain
+        companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
       }
+    }
 
-      const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
-      if (bizplace) bizplaces.push(bizplace)
-
-      let strictProduct = 'false'
+    const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
+    if (bizplace) bizplaces.push(bizplace)
 
-      const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
-        where: { domain, category: 'id-rule', name: 'strict-product-selection' }
-      })
+    let strictProduct: boolean = false
 
-      if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
+    const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain, category: 'id-rule', name: 'strict-product-selection' }
+    })
 
-      const partnerStrictProductSelectionSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
-        where: { setting: strictProductSelectionSetting, domain, partnerDomain: foundPermittedBizplace?.domain }
-      })
+    if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
 
-      if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
+    const partnerStrictProductSelectionSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
+      where: { setting: strictProductSelectionSetting, domain, partnerDomain: foundPermittedBizplace?.domain }
+    })
 
-      let newOrderProducts: any[] = []
+    if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
 
-      for (var i = 0; i < orderProducts.length; i++) {
-        const orderProduct = orderProducts[i]
-        const productSKU: string = orderProduct.productSKU
-        const foundProduct: Product = await tx.getRepository(Product).findOne({
-          where: {
-            sku: productSKU,
-            bizplace: companyBizplace
-          }
-        })
+    let newOrderProducts: any[] = []
 
-        let newOrderProduct: any
+    for (var i = 0; i < orderProducts.length; i++) {
+      const orderProduct = orderProducts[i]
+      const productSKU: string = orderProduct.productSKU
+      const foundProduct: Product = await tx.getRepository(Product).findOne({
+        where: {
+          sku: productSKU,
+          bizplace: companyBizplace
+        }
+      })
 
-        if (foundProduct) {
-          let productDetail: ProductDetail
-          const hasConditions: boolean = Boolean(
-            (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-              (orderProduct?.uom && orderProduct?.uom.trim() != '') ||
-              orderProduct?.uomValue
-          )
-          let productDetailCondition: any = { product: foundProduct }
+      let newOrderProduct: any
 
-          if (hasConditions && strictProduct == 'true') {
-            if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
-              productDetailCondition.packingType = orderProduct.packingType.trim()
+      if (foundProduct) {
+        let productDetail: ProductDetail
+        const hasConditions: boolean = Boolean(
+          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
+            (orderProduct?.uom && orderProduct?.uom.trim() != '')
+        )
+        let productDetailCondition: any = { product: foundProduct }
 
-            if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
+        if (hasConditions) {
+          if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
+            productDetailCondition.packingType = orderProduct.packingType.trim()
 
-            if (orderProduct?.uomValue) productDetailCondition.uomValue = orderProduct.uomValue
-          } else {
-            productDetailCondition.isDefault = true
-          }
+          if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
+        } else {
+          productDetailCondition.isDefault = true
+        }
 
-          productDetail = await productDetailRepo.findOne({
-            where: productDetailCondition
-          })
+        productDetail = await productDetailRepo.findOne({
+          where: productDetailCondition
+        })
 
-          if (!productDetail) throw new Error(i18next.t('error.product_not_found'))
-
-          //check if is strict product selection for uom value, uom, packing type
-          const uomValue: number = strictProduct == 'true' ? productDetail.uomValue : orderProduct.uomValue
-
-          const uom = strictProduct == 'true' ? productDetail.uom : orderProduct.uom
-
-          const packingType = strictProduct == 'true' ? productDetail.packingType : orderProduct.packingType
-
-          newOrderProduct = {
-            ...orderProduct,
-            packingType,
-            packingSize: productDetail ? productDetail.packingSize : orderProduct.packingSize,
-            uom,
-            uomValue,
-            productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
-            productBrand: foundProduct?.brand ? foundProduct.brand : null,
-            product: {
-              id: foundProduct.id,
-              name: foundProduct.name,
-              sku: foundProduct.sku,
-              type: foundProduct.type,
-              brand: foundProduct.brand,
-              primaryUnit: productDetail ? productDetail.uom : null,
-              primaryValue: productDetail ? productDetail.uomValue : null
-            },
-            productDetail,
-            totalUomValue:
-              orderProduct.packQty > 0
-                ? uomValue
-                  ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${uom}`
-                  : null
+        const uomValue: number =
+          strictProduct == true
+            ? productDetail?.uomValue
+              ? productDetail.uomValue
+              : null
+            : orderProduct?.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
+
+        newOrderProduct = {
+          ...orderProduct,
+          packingType: orderProduct?.packingType ? orderProduct.packingType : productDetail.packingType,
+          packingSize: productDetail?.packingSize ? productDetail.packingSize : null,
+          uom: productDetail?.uom ? productDetail.uom : null,
+          uomValue: uomValue,
+          productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
+          productBrand: foundProduct?.brand ? foundProduct.brand : null,
+          isError: productDetail ? false : true,
+          product: {
+            id: foundProduct.id,
+            name: foundProduct.name,
+            sku: foundProduct.sku,
+            type: foundProduct.type,
+            brand: foundProduct.brand,
+            primaryUnit: productDetail?.uom ? productDetail.uom : null,
+            primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
+          },
+          totalUomValue:
+            orderProduct.packQty > 0
+              ? uomValue
+                ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}`
                 : null
-          }
-        } else {
-          throw new Error(i18next.t('error.product_not_found'))
+              : null
+        }
+      } else {
+        newOrderProduct = {
+          ...orderProduct,
+          productName: orderProduct.productSKU,
+          isError: true
         }
-
-        newOrderProducts.push(newOrderProduct)
       }
 
-      return newOrderProducts
-    } catch (e) {
-      return e
+      newOrderProducts.push(newOrderProduct)
     }
-  }
 
+    return newOrderProducts
+  }
   @Directive('@privilege(category: "order_customer", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => [InventoryProductGroup])
@@ -435,129 +426,126 @@ export class OtherQuery {
     @Arg('partnerBizplaceId') partnerBizplaceId: string,
     @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
   ): Promise<OrderProduct[]> {
-    try {
-      const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
-        context.state
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+      context.state
 
-      const productDetailRepo = tx.getRepository(ProductDetail)
+    const productDetailRepo = tx.getRepository(ProductDetail)
 
-      let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
-      let foundPermittedBizplace: Bizplace
-      let companyBizplace: Bizplace
+    let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
+    let foundPermittedBizplace: Bizplace
+    let companyBizplace: Bizplace
 
-      if (partnerBizplaceId) {
-        foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == partnerBizplaceId)
+    if (partnerBizplaceId) {
+      foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == partnerBizplaceId)
 
-        if (foundPermittedBizplace) {
-          if (!foundPermittedBizplace.company?.id) {
-            foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
-              relations: ['domain', 'company', 'company.domain']
-            })
-          }
-          const companyDomain: Domain = foundPermittedBizplace.company.domain
-          companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
+      if (foundPermittedBizplace) {
+        if (!foundPermittedBizplace.company?.id) {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+            relations: ['domain', 'company', 'company.domain']
+          })
         }
+        const companyDomain: Domain = foundPermittedBizplace.company.domain
+        companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
       }
+    }
 
-      const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
-      if (bizplace) bizplaces.push(bizplace)
-
-      let strictProduct: boolean = false
+    const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
+    if (bizplace) bizplaces.push(bizplace)
 
-      const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
-        where: { domain, category: 'id-rule', name: 'strict-product-selection' }
-      })
+    let strictProduct: boolean = false
 
-      if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
+    const strictProductSelectionSetting: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain, category: 'id-rule', name: 'strict-product-selection' }
+    })
 
-      const partnerStrictProductSelectionSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
-        where: { setting: strictProductSelectionSetting, domain, partnerDomain: foundPermittedBizplace?.domain }
-      })
+    if (strictProductSelectionSetting) strictProduct = strictProductSelectionSetting.value
 
-      if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
+    const partnerStrictProductSelectionSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
+      where: { setting: strictProductSelectionSetting, domain, partnerDomain: foundPermittedBizplace?.domain }
+    })
 
-      let newOrderProducts: any[] = []
+    if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
 
-      for (var i = 0; i < orderProducts.length; i++) {
-        const orderProduct = orderProducts[i]
-        const productSKU: string = orderProduct.productSKU
-        const foundProduct: Product = await tx.getRepository(Product).findOne({
-          where: {
-            sku: productSKU,
-            bizplace: companyBizplace
-          }
-        })
+    let newOrderProducts: any[] = []
 
-        let newOrderProduct: any
+    for (var i = 0; i < orderProducts.length; i++) {
+      const orderProduct = orderProducts[i]
+      const productSKU: string = orderProduct.productSKU
+      const foundProduct: Product = await tx.getRepository(Product).findOne({
+        where: {
+          sku: productSKU,
+          bizplace: companyBizplace
+        }
+      })
 
-        if (foundProduct) {
-          let productDetail: ProductDetail
-          const hasConditions: boolean = Boolean(
-            (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-              (orderProduct?.uom && orderProduct?.uom.trim() != '')
-          )
-          let productDetailCondition: any = { product: foundProduct }
+      let newOrderProduct: any
 
-          if (hasConditions) {
-            if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
-              productDetailCondition.packingType = orderProduct.packingType.trim()
+      if (foundProduct) {
+        let productDetail: ProductDetail
+        const hasConditions: boolean = Boolean(
+          (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
+            (orderProduct?.uom && orderProduct?.uom.trim() != '')
+        )
+        let productDetailCondition: any = { product: foundProduct }
 
-            if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
-          } else {
-            productDetailCondition.isDefault = true
-          }
+        if (hasConditions) {
+          if (orderProduct?.packingType && orderProduct.packingType.trim() != '')
+            productDetailCondition.packingType = orderProduct.packingType.trim()
 
-          productDetail = await productDetailRepo.findOne({
-            where: productDetailCondition
-          })
+          if (orderProduct?.uom && orderProduct.uom.trim() != '') productDetailCondition.uom = orderProduct.uom.trim()
+        } else {
+          productDetailCondition.isDefault = true
+        }
 
-          if (!productDetail) throw new Error('Invalid packing type or uom')
+        productDetail = await productDetailRepo.findOne({
+          where: productDetailCondition
+        })
 
-          const uomValue: number =
-            strictProduct == true
-              ? productDetail?.uomValue
-                ? productDetail.uomValue
+        const uomValue: number =
+          strictProduct == true
+            ? productDetail?.uomValue
+              ? productDetail.uomValue
+              : null
+            : orderProduct?.uomValue
+            ? orderProduct.uomValue
+            : productDetail.uomValue
+
+        newOrderProduct = {
+          ...orderProduct,
+          packingType: orderProduct?.packingType ? orderProduct.packingType : productDetail.packingType,
+          packingSize: productDetail?.packingSize ? productDetail.packingSize : null,
+          uom: productDetail?.uom ? productDetail.uom : null,
+          uomValue: uomValue,
+          productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
+          productBrand: foundProduct?.brand ? foundProduct.brand : null,
+          isError: productDetail ? false : true,
+          product: {
+            id: foundProduct.id,
+            name: foundProduct.name,
+            sku: foundProduct.sku,
+            type: foundProduct.type,
+            brand: foundProduct.brand,
+            primaryUnit: productDetail?.uom ? productDetail.uom : null,
+            primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
+          },
+          totalUomValue:
+            orderProduct.packQty > 0
+              ? uomValue
+                ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}`
                 : null
-              : orderProduct?.uomValue
-              ? orderProduct.uomValue
-              : productDetail.uomValue
-
-          newOrderProduct = {
-            ...orderProduct,
-            packingType: orderProduct?.packingType ? orderProduct.packingType : productDetail.packingType,
-            packingSize: productDetail?.packingSize ? productDetail.packingSize : null,
-            uom: productDetail?.uom ? productDetail.uom : null,
-            uomValue: uomValue,
-            productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
-            productBrand: foundProduct?.brand ? foundProduct.brand : null,
-            isError: productDetail ? false : true,
-            product: {
-              id: foundProduct.id,
-              name: foundProduct.name,
-              sku: foundProduct.sku,
-              type: foundProduct.type,
-              brand: foundProduct.brand,
-              primaryUnit: productDetail?.uom ? productDetail.uom : null,
-              primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
-            },
-            productDetail,
-            totalUomValue:
-              orderProduct.packQty > 0
-                ? uomValue
-                  ? `${(orderProduct.packQty * uomValue).toFixed(2)} ${productDetail.uom}`
-                  : null
-                : null
-          }
-        } else {
-          throw new Error(`(${orderProduct.productSKU}) sku not found`)
+              : null
+        }
+      } else {
+        newOrderProduct = {
+          ...orderProduct,
+          productName: orderProduct.productSKU,
+          isError: true
         }
-
-        newOrderProducts.push(newOrderProduct)
       }
 
-      return newOrderProducts
-    } catch (e) {
-      return e
+      newOrderProducts.push(newOrderProduct)
     }
+
+    return newOrderProducts
   }
 }