@things-factory/sales-base 4.3.603 → 4.3.607

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -1,16 +1,52 @@
-import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In, Raw, SelectQueryBuilder } from 'typeorm'
+import {
+  Arg,
+  Args,
+  Ctx,
+  Directive,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root
+} from 'type-graphql'
+import {
+  EntityManager,
+  getRepository,
+  In,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
-import { Bizplace, getCompanyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
-
-import { ArrivalNoticeList, NewArrivalNotice, RawArrivalNotice } from '../'
-import { ATTACHMENT_TYPE, ORDER_STATUS } from '../../constants'
-import { OrderInventory, OrderProduct } from '../../service'
-import { ArrivalNotice } from './arrival-notice'
+import {
+  checkUserBelongsDomain,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  getCompanyBizplace,
+  getPermittedBizplaceIds
+} from '@things-factory/biz-base'
 import { Setting } from '@things-factory/setting-base'
+import {
+  buildQuery,
+  Domain,
+  ListParam
+} from '@things-factory/shell'
+
+import {
+  ArrivalNoticeList,
+  NewArrivalNotice,
+  RawArrivalNotice
+} from '../'
+import {
+  ATTACHMENT_TYPE,
+  ORDER_STATUS
+} from '../../constants'
+import {
+  OrderInventory,
+  OrderProduct
+} from '../../service'
+import { convertExcelDateToISO } from '../../utils/datetime-util'
+import { ArrivalNotice } from './arrival-notice'
 
 @Resolver(ArrivalNotice)
 export class ArrivalNoticeQuery {
@@ -335,21 +371,16 @@ export async function validateBulkArrivalNoticesFunction(
   trxMgr: EntityManager
 ): Promise<RawArrivalNotice[]> {
   const companyBizplace: Bizplace = await getCompanyBizplace(null, null, bizplaceId)
-
   const json_oi = JSON.stringify(
     rawArrivalNotices.map(raw => {
-      // -1 and -2 acts as code to display error.
-      // if (raw.unitPrice < 0) {
-      //   raw.unitPrice = -1
-      // }
-      // if ((raw.unitPrice === undefined) == false && raw.unitPrice == null) {
-      //   raw.unitPrice = -2
-      // }
+      let etaDate = convertExcelDateToISO(raw.etaDate)
+      let manufactureDate = convertExcelDateToISO(raw.manufactureDate)
+
       return {
         ref_no: raw.refNo || null,
         ref_no_2: raw.refNo2 || null,
         ref_no_3: raw.refNo3 || null,
-        eta_date: raw.etaDate || null,
+        eta_date: etaDate || null,
         truck_no: raw.truckNo || null,
         own_transport: !!raw.truckNo || false,
         loose_item: raw.looseItem || false,
@@ -367,7 +398,7 @@ export async function validateBulkArrivalNoticesFunction(
         pallet_qty: raw.palletQty || null,
         pallet_id: raw.palletId || null,
         unit_price: raw.unitPrice === undefined ? (isNaN(raw.unitPrice) ? '' : null) : raw.unitPrice,
-        manufacture_date: raw.manufactureDate || null
+        manufacture_date: manufactureDate || null
       }
     })
   )
@@ -423,7 +454,7 @@ export async function validateBulkArrivalNoticesFunction(
         pallet_qty INT,
         pallet_id VARCHAR(50),
         unit_price VARCHAR(50),
-        manufacture_date DATE
+        manufacture_date VARCHAR(24)
       );
     `
   )
@@ -475,61 +506,61 @@ export async function validateBulkArrivalNoticesFunction(
   let validatedItems = await trxMgr.query(
     `
       WITH foo AS (
-	      SELECT 
-	      	an.name AS gan_name,
-	      	an.ref_no AS gan_ref_no,
-	        raw.ref_no, 
-	        raw.ref_no_2, 
-	        raw.ref_no_3, 
-	        raw.eta_date, 
-	        raw.truck_no, 
-	        raw.own_transport, 
-	        raw.container, 
-	        raw.container_no, 
-	        raw.container_size, 
-	        raw.import_cargo, 
-	        raw.loose_item, 
-	        pr.id AS product_id, 
-	        pd.id AS product_detail_id, 
-	        raw.sku AS sku, 
-	        CASE WHEN pr.description NOT IN (NULL, '', '-') THEN CONCAT(pr.name, '(', pr.description, ')') ELSE pr.name END AS product_info, 
-	        raw.batch_id,
-	        raw.batch_id_ref,
-	        pd.packing_type, 
-	        pd.packing_size, 
+        SELECT 
+          an.name AS gan_name,
+          an.ref_no AS gan_ref_no,
+          raw.ref_no, 
+          raw.ref_no_2, 
+          raw.ref_no_3, 
+          raw.eta_date, 
+          raw.truck_no, 
+          raw.own_transport, 
+          raw.container, 
+          raw.container_no, 
+          raw.container_size, 
+          raw.import_cargo, 
+          raw.loose_item, 
+          pr.id AS product_id, 
+          pd.id AS product_detail_id, 
+          raw.sku AS sku, 
+          CASE WHEN pr.description NOT IN (NULL, '', '-') THEN CONCAT(pr.name, '(', pr.description, ')') ELSE pr.name END AS product_info, 
+          raw.batch_id,
+          raw.batch_id_ref,
+          pd.packing_type, 
+          pd.packing_size, 
           pd.cost_price,
-	        sum(raw.pack_qty) AS pack_qty, 
+          sum(raw.pack_qty) AS pack_qty, 
           raw.pallet_id,
-	        sum(pd.uom_value) AS uom_value,
-	        pd.uom,  
-	        sum(raw.pallet_qty) AS pallet_qty, 
-	        CASE WHEN raw.unit_price = '' THEN pd.cost_price::varchar ELSE raw.unit_price::varchar END AS unit_price, 
-	        raw.manufacture_date
-	      FROM 
-	        raw_arrival_notices raw 
-	        LEFT JOIN temp_gan an ON raw.ref_no = an.ref_no 
-	        AND raw.ref_no_2 = an.ref_no_2
-	        AND raw.ref_no_3 = an.ref_no_3
-	        AND raw.eta_date::date = an.eta_date::date
-	        AND raw.truck_no = an.truck_no
-	        AND raw.own_transport = an.own_transport
-	        AND raw.container = an.container
-	        AND raw.container_no = an.container_no
-	        AND raw.container_size = an.container_size
-	        AND raw.loose_item = an.loose_item
-	        AND raw.import_cargo = an.import_cargo 
-	        LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(raw.sku)
-	        LEFT JOIN product_details pd ON pr.id = pd.product_id
-	        AND CASE WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom NOTNULL
-	          THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.uom = raw.uom 
-	          WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom ISNULL
-	            THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.is_default IS TRUE
-	            WHEN raw.packing_type ISNULL AND raw.packing_size ISNULL AND raw.uom NOTNULL
-	              THEN pd.uom = raw.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
-	        END
+          sum(pd.uom_value) AS uom_value,
+          pd.uom,  
+          sum(raw.pallet_qty) AS pallet_qty, 
+          CASE WHEN raw.unit_price = '' THEN pd.cost_price::varchar ELSE raw.unit_price::varchar END AS unit_price, 
+          raw.manufacture_date
+        FROM 
+          raw_arrival_notices raw 
+          LEFT JOIN temp_gan an ON raw.ref_no = an.ref_no 
+          AND raw.ref_no_2 = an.ref_no_2
+          AND raw.ref_no_3 = an.ref_no_3
+          AND raw.eta_date = an.eta_date
+          AND raw.truck_no = an.truck_no
+          AND raw.own_transport = an.own_transport
+          AND raw.container = an.container
+          AND raw.container_no = an.container_no
+          AND raw.container_size = an.container_size
+          AND raw.loose_item = an.loose_item
+          AND raw.import_cargo = an.import_cargo 
+          LEFT JOIN products pr ON LOWER(pr.sku) = LOWER(raw.sku)
+          LEFT JOIN product_details pd ON pr.id = pd.product_id
+          AND CASE WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom NOTNULL
+            THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.uom = raw.uom 
+            WHEN raw.packing_type NOTNULL AND raw.packing_size NOTNULL AND raw.uom ISNULL
+              THEN pd.packing_type = raw.packing_type AND pd.packing_size = raw.packing_size AND pd.is_default IS TRUE
+              WHEN raw.packing_type ISNULL AND raw.packing_size ISNULL AND raw.uom NOTNULL
+                THEN pd.uom = raw.uom AND pd.is_default IS TRUE ELSE pd.is_default IS TRUE
+          END
         WHERE pr.bizplace_id = $1
-	      GROUP BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.eta_date, raw.truck_no, raw.own_transport, raw.container, raw.container_no, raw.container_size, raw.import_cargo, raw.loose_item,
-	        pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.pallet_id, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_date, an.ref_no, an.name
+        GROUP BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.eta_date, raw.truck_no, raw.own_transport, raw.container, raw.container_no, raw.container_size, raw.import_cargo, raw.loose_item,
+          pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.pallet_id, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_date, an.ref_no, an.name
       ), foo_duplicates AS (
         SELECT 
           pallet_id, 
@@ -545,9 +576,13 @@ export async function validateBulkArrivalNoticesFunction(
              WHEN foo.gan_ref_no IS NOT NULL THEN 'order duplicated with ' || foo.gan_name || ','
              ELSE ''
            END ||
-           CASE 
-             WHEN foo.manufacture_date > current_date THEN 'invalid manufacture date,'
-             ELSE ''
+           CASE
+             WHEN (SUBSTRING(foo.manufacture_date,5,1) = '-' AND SUBSTRING(foo.manufacture_date,8,1) = '-') OR foo.manufacture_date IS NULL THEN 
+               CASE
+                 WHEN TO_DATE(foo.manufacture_date, 'YYYY-MM-DD') > current_date THEN 'invalid manufacture date,'
+                 ELSE ''
+               END
+             ELSE 'invalid manufacture date format. please use dd/mm/yyyy,'
            END ||
            CASE 
              WHEN foo.product_id IS NULL OR foo.product_detail_id IS NULL OR foo.sku IS NULL THEN 'product not found,'
@@ -569,6 +604,10 @@ export async function validateBulkArrivalNoticesFunction(
              WHEN foo.eta_date IS NULL THEN 'eta date is required,'
              ELSE ''
            END ||
+           CASE
+             WHEN NOT(SUBSTRING(foo.eta_date,5,1) = '-' AND SUBSTRING(foo.eta_date,8,1) = '-') THEN 'invalid eta date format. please use dd/mm/yyyy,'
+             ELSE ''
+           END ||
            CASE 
              WHEN foo.unit_price IS NULL THEN 'invalid unit price (not a number),'
              ELSE ''
@@ -606,7 +645,7 @@ FROM foo
   )
 
   await trxMgr.query('DROP TABLE raw_arrival_notices, temp_gan')
-
+  
   return validatedItems.map(item => {
     return {
       refNo: item.ref_no,

package/server/service/draft-release-good/draft-release-good-create.ts

@@ -1,19 +1,54 @@
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, getConnection, getRepository, In, Repository } from 'typeorm'
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
+import {
+  EntityManager,
+  getConnection,
+  getRepository,
+  In,
+  Repository
+} from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
+import {
+  WebhookEventsEnum,
+  webhookHandler
+} from '@things-factory/integration-base'
 import { ProductBundle } from '@things-factory/product-base'
-import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { bulkReleaseGoodsAvailableItemsFunction, DraftReleaseGood, DraftReleaseGoodInfos, OrderProduct } from '../'
-import { DRAFT_RELEASE_ORDER_STATUS, ORDER_NUMBER_SETTING_KEY, ORDER_STATUS } from '../../constants'
+
+import {
+  bulkReleaseGoodsAvailableItemsFunction,
+  DraftReleaseGood,
+  DraftReleaseGoodInfos,
+  OrderProduct
+} from '../'
+import {
+  DRAFT_RELEASE_ORDER_STATUS,
+  ORDER_NUMBER_SETTING_KEY,
+  ORDER_STATUS
+} from '../../constants'
 import { ValidationError } from '../../errors'
-import { InventoryUtil, OrderNoGenerator } from '../../utils'
+import {
+  InventoryUtil,
+  OrderNoGenerator
+} from '../../utils'
 import { ReleaseGood } from '../release-good/release-good'
+import {
+  bulkGenerateReleaseGood,
+  confirmReleaseGood,
+  receiveReleaseGood
+} from '../release-good/release-good-mutation'
 import { SuccessReleasedDraftOrder } from './draft-release-good-type'
-import { bulkGenerateReleaseGood, confirmReleaseGood, receiveReleaseGood } from '../release-good/release-good-mutation'
 
 @Resolver(DraftReleaseGood)
 export class DraftReleaseGoodCreate {
@@ -71,6 +106,7 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
       relations: [
         'orderProducts',
         'orderProducts.product',
+        'orderProducts.productDetail',
         'orderProducts.productBundle',
         'orderProducts.productBundle.productBundleSettings',
         'orderProducts.productBundle.productBundleSettings.product',
@@ -85,6 +121,7 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
       ]
     })
     let failReleaseOrder = []
+    let successReleaseOrder = []
 
     if (updatableDraftOrders.length > 0) {
       const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
@@ -142,7 +179,8 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                     name: 'productId',
                     operator: 'in',
                     value: productIds
-                  }
+                  },
+                  { name: 'deleted_at', operator: 'eq', value: true }
                 ]
               },
               context,
@@ -178,8 +216,11 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
               }
             })
 
-            let insufficient = draftOrder.orderProducts.find(op => op.status == 'insufficient')
-            if (!insufficient) {
+            let failedInventory = draftOrder.orderProducts.find(
+              op => op.status == 'insufficient' || op.productDetail.deletedAt != null
+            )
+
+            if (!failedInventory) {
               //create RO
               let releaseGood = { ...draftOrder }
               delete releaseGood.id
@@ -266,6 +307,14 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                   context,
                   innerTx2
                 )
+
+                if (availableItems.some(item => item.orderProduct.productDetail.deletedAt != null)) {
+                  throw new ValidationError({
+                    ...ValidationError.ERROR_CODES.DELETED_PRODUCT_DETAIL,
+                    detail: { data: JSON.stringify(availableItems) }
+                  })
+                }
+
                 if (availableItems.some(item => !item.releaseQty || item.releaseQty > item.assignedQty))
                   throw new ValidationError({
                     ...ValidationError.ERROR_CODES.INSUFFICIENT_STOCK,
@@ -303,6 +352,7 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                   if (existingReleaseGood.length > 1) {
                     throw new Error('generating release orders')
                   }
+                  // successReleaseOrder.push({ draftName: draftOrder?.name, status: 'success' })
                 })
 
                 await innerTx2
@@ -332,6 +382,7 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
 
                 createdReleaseGood = await confirmReleaseGood(createdReleaseGood.name, context, innerTx2)
 
+                successReleaseOrder.push({ draftName: draftOrder?.name, status: 'success' })
                 if (settingValue > 1) {
                   createdReleaseGood = await receiveReleaseGood(createdReleaseGood.name, context, innerTx2)
                 }
@@ -340,8 +391,12 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
                 webhookHandler(createdReleaseGood, createdReleaseGood.bizplace, WebhookEventsEnum.ReleaseOrderCreated)
               })
             } else {
-              if (draftOrder.orderProducts.every(op => op.id === insufficient?.id)) {
-                failReleaseOrder.push(draftOrder?.name)
+              if (
+                draftOrder.orderProducts.some(op => op.id === failedInventory?.id && op.productDetail.deletedAt != null)
+              ) {
+                failReleaseOrder.push({ draftName: draftOrder?.name, status: 'deleted' })
+              } else {
+                failReleaseOrder.push({ draftName: draftOrder?.name, status: 'insufficient' })
               }
             }
           } catch (e) {
@@ -352,12 +407,12 @@ export async function generateReleaseGoods(_generateReleaseGoodsRecord, context:
         })
       }
     }
-    releasedOrders = updatableDraftOrders.filter(drg => !drg.name.includes(failReleaseOrder))
-    releasedOrders = releasedOrders.map(item => {
-      return {
-        draftName: item.name
-      }
+    releasedOrders.push({
+      successCount: successReleaseOrder.length,
+      insufficientCount: failReleaseOrder.filter(fro => fro.status === 'insufficient').length,
+      deletedCount: failReleaseOrder.filter(fro => fro.status === 'deleted').length
     })
+
     return releasedOrders
   } catch (e) {
     logger.error(`draft-release-good-mutation[generateReleaseGoodsFromDraft]: ${e?.message}`)

package/server/service/draft-release-good/draft-release-good-type.ts

@@ -1,9 +1,4 @@
-import {
-  Field,
-  InputType,
-  Int,
-  ObjectType
-} from 'type-graphql'
+import { Field, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef } from '@things-factory/shell'
 
@@ -287,6 +282,15 @@ export class SuccessReleasedDraftOrder {
 
   @Field({ nullable: true })
   isProductBundle?: Boolean
+
+  @Field({ nullable: true })
+  successCount?: number
+
+  @Field({ nullable: true })
+  insufficientCount?: number
+
+  @Field({ nullable: true })
+  deletedCount?: number
 }
 
 @InputType()

package/server/service/goods-receival-note/goods-receival-note-query.ts

@@ -1,20 +1,40 @@
-import { PurchaseOrder } from './../purchase-order/purchase-order'
-import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
-import { IsNull, Not, In } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
-import { InventoryItem } from '@things-factory/warehouse-base'
+import {
+  Arg,
+  Args,
+  Ctx,
+  FieldResolver,
+  Query,
+  Resolver,
+  Root
+} from 'type-graphql'
+import {
+  getRepository,
+  IsNull,
+  Not,
+  SelectQueryBuilder
+} from 'typeorm'
+
+import {
+  Partner,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  ContactPoint,
+  getPermittedBizplaceIds
+} from '@things-factory/biz-base'
+import {
+  buildQuery,
+  Domain,
+  ListParam
+} from '@things-factory/shell'
+import { ReducedInventoryHistory } from '@things-factory/warehouse-base'
+
 import { GoodsReceivalNoteList } from '../'
-import { GoodsReceivalNote } from './goods-receival-note'
+import { DateTimeConverter } from '../../utils/datetime-util'
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
-import { Partner } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { OrderProduct } from '../order-product/order-product'
-import { ReducedInventoryHistory } from '@things-factory/warehouse-base'
-import { DateTimeConverter } from '../../utils/datetime-util'
+import { GoodsReceivalNote } from './goods-receival-note'
 
 @Resolver(GoodsReceivalNote)
 export class GoodsReceivalNoteQuery {

package/server/service/goods-receival-note/goods-receival-note-types.ts

@@ -1,5 +1,12 @@
+import {
+  Field,
+  InputType,
+  Int,
+  ObjectType
+} from 'type-graphql'
+
 import { ObjectRef } from '@things-factory/shell'
-import { Field, InputType, Int, ObjectType } from 'type-graphql'
+
 import { GoodsReceivalNote } from './goods-receival-note'
 
 @ObjectType()

package/server/service/release-good/release-good-query.ts

@@ -47,6 +47,7 @@ import {
   ORDER_STATUS,
   ORDER_VAS_STATUS
 } from '../../constants'
+import { convertExcelDateToISO } from '../../utils/datetime-util'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
@@ -1105,6 +1106,8 @@ function _extractData(rawData, validatedData) {
     let errMsg
     let comparison = ['packingType', 'packingSize', 'uom']
     let data = validatedData
+    raw.releaseDate = raw.releaseDate ? convertExcelDateToISO(raw.releaseDate) : null
+    raw.expirationDate = raw.expirationDate ? convertExcelDateToISO(raw.expirationDate) : null
     if (raw.batchId) {
       data = data.filter(val => val.batchId === raw.batchId)
       comparison.push('batchId')
@@ -1176,7 +1179,8 @@ function _extractData(rawData, validatedData) {
       raw.productId = null
     }
 
-    let releaseDate = _getStdDateStr(new Date(raw.releaseDate || ''))
+    
+    const dateRegex = /^\d{4}-\d{2}-\d{2}$/
 
     return {
       ...raw,
@@ -1196,17 +1200,19 @@ function _extractData(rawData, validatedData) {
         if (raw.assignedQty < raw.releaseQty) {
           errors.push('insufficient stock');
         }
+        if(!dateRegex.test(raw.releaseDate)){
+          errors.push('invalid release date format. please use dd/mm/yyyy')
+        }
         if (raw.releaseDate === '') {
           errors.push('release date is empty');
         }
-        if (releaseDate < _getStdDateStr(new Date())) {
+        if (raw.releaseDate < _getStdDateStr(new Date())) {
           errors.push('backdate is not allowed');
         }
         if (!raw.refNo || raw.refNo === '') {
           errors.push('ref no is empty');
         }
-    
-        if (raw?.type === 'b2c') {
+          if (raw?.type === 'b2c') {
           if (!raw.attentionTo) errors.push('attention to is empty');
           if (!raw.postalCode) errors.push('postal code is empty');
           if (!raw.country) errors.push('country is empty');
@@ -1217,12 +1223,14 @@ function _extractData(rawData, validatedData) {
           if ((raw.codOption && !raw.paidAmount) || raw.paidAmount < 0 || raw.paidAmount == null) {
             errors.push('invalid paid amount');
           }
+          if(raw?.expirationDate != null && !dateRegex.test(raw?.expirationDate)){
+            errors.push('invalid expiration date format. please use dd/mm/yyyy')
+          }
           if (raw.airwayBill && raw.lmdOption === true) {
             errors.push('kindly remove AWB as LMD is marked as true');
           }
         }
-    
-        return errors.length > 0 ? errors.join(', ') : ''; // Combine all errors into a single string
+        return errors.length > 0 ? errors.join(', ') : ''// Combine all errors into a single string
       })(),
     };
     
@@ -1252,4 +1260,4 @@ function _getStdDateStr(date) {
     date.setHours(date.getHours() + 8)
     return date.toISOString().split('T')[0]
   }
-}
+}

package/server/utils/datetime-util.ts

@@ -66,3 +66,26 @@ export class DateTimeDifference {
     return diffInSeconds
   }
 }
+
+export function isValidExcelDate(excelSerial) {
+  // Check if the serial number is a valid positive number
+  if (isNaN(excelSerial) || excelSerial <= 0) {
+      return false;
+  }
+  const date = new Date((parseInt(excelSerial) - 25569) * 86400 * 1000)
+
+  return !isNaN(date.getTime());
+}
+
+export function convertExcelDateToISO(excelSerial) {
+  if (!isValidExcelDate(excelSerial)) {
+      return excelSerial; // Invalid date serial
+  }
+  const date = new Date((parseInt(excelSerial) - 25569) * 86400 * 1000)
+  // Format the date in YYYY-MM-DD format
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0'); // Months are zero-indexed
+  const day = String(date.getDate()).padStart(2, '0');
+
+  return `${year}-${month}-${day}`;
+}

package/server/utils/inventory-util.ts

@@ -1,10 +1,29 @@
-import { EntityManager, Equal, getRepository, In, Not, Raw, Repository, SelectQueryBuilder } from 'typeorm'
+import {
+  EntityManager,
+  Equal,
+  getRepository,
+  In,
+  Not,
+  Raw,
+  Repository,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
-import { Domain, ListParam } from '@things-factory/shell'
+import {
+  Product,
+  ProductBundle,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
+import {
+  Domain,
+  ListParam
+} from '@things-factory/shell'
 import {
   generateInventoryHistory,
   Inventory,
@@ -57,6 +76,7 @@ export const InventoryUtil = {
 
       let productFilter = filters.find(itm => itm.name == 'productName')
       let inventoryBizplaceFilter = filters.find(itm => itm.name == 'bizplaceId')
+      let deletedAt = filters.find(filter => filter.name == 'deleted_at')
 
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group ON COMMIT DROP AS (
@@ -152,6 +172,7 @@ export const InventoryUtil = {
             `
                   : ``
               }
+              ${deletedAt && deletedAt.value == true ? `AND  pd.deleted_at isnull` : ``}
             GROUP BY
               i.lock_inventory,
               p.id,