@things-factory/sales-base 4.3.41 → 4.3.44

package/server/service/delivery-order/delivery-order-mutation.ts

@@ -13,7 +13,6 @@ import { Domain, ObjectRef } from '@things-factory/shell'
 import { TransportDriver, TransportVehicle, TRUCK_STATUS } from '@things-factory/transport-base'
 import { Inventory } from '@things-factory/warehouse-base'
 
-
 import {
   ORDER_INVENTORY_STATUS,
   ORDER_NUMBER_RULE_TYPE,
@@ -27,7 +26,7 @@ import { NewOrderInventory, OrderInventoryPatch } from '../order-inventory/order
 import { ReleaseGood } from '../release-good/release-good'
 import { DeliveryOrder } from './delivery-order'
 import { DeliveryOrderPatch, NewDeliveryOrder } from './delivery-order-types'
-import { ShippingOrderInfoPatch } from '../release-good/release-good-types'
+import { exportInformationPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
 
 @Resolver(DeliveryOrder)
 export class DeliveryOrderMutation {
@@ -209,13 +208,15 @@ export class DeliveryOrderMutation {
   }
 
   @Directive('@transaction')
+  //** Comment: @Oscar, this class name title is not conform to the naming convention set, kindly change. */
   @Mutation(returns => DeliveryOrder)
   async dispatchDeliveryOrder(
     @Ctx() context: any,
     @Arg('orderInfo', type => DeliveryOrderPatch, { nullable: true }) orderInfo?: DeliveryOrderPatch,
     @Arg('orderItems', type => [OrderInventoryPatch], { nullable: true }) orderItems?: OrderInventoryPatch[],
-    @Arg('shippingOrderInfo', type => ShippingOrderInfoPatch, { nullable: true })
-    shippingOrderInfo?: ShippingOrderInfoPatch
+    @Arg('shippingInfo', type => ShippingOrderInfoPatch, { nullable: true })
+    shippingOrderInfo?: ShippingOrderInfoPatch,
+    @Arg('exportInfo', type => exportInformationPatch, { nullable: true }) exportInfo?: exportInformationPatch
   ): Promise<DeliveryOrder> {
     try {
       const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -236,7 +237,7 @@ export class DeliveryOrderMutation {
       if (foundDeliveryOrder.status === ORDER_STATUS.PENDING_CANCEL)
         throw new Error('Release order is pending for cancel')
 
-      // @Oscar you can write it this way 
+      // @Oscar you can write it this way
       // foundDeliveryOrder.ownCollection = orderInfo.transportType == 'Own Transport' ? true : false
 
       if (orderInfo.transportType == 'Own Transport') {
@@ -257,16 +258,16 @@ export class DeliveryOrderMutation {
         const product: Product = inventory.product
         const foundItem = inventory.reusablePallet
           ? orderItems.filter(
-            (item: any) =>
-              item.productName === `${product.name} (${product.description})` &&
-              item.batchId === orderInventory.batchId &&
-              item.pallet === inventory.reusablePallet.name
-          )
+              (item: any) =>
+                item.productName === `${product.name} (${product.description})` &&
+                item.batchId === orderInventory.batchId &&
+                item.pallet === inventory.reusablePallet.name
+            )
           : orderItems.filter(
-            (item: any) =>
-              item.productName === `${product.name} (${product.description})` &&
-              item.batchId === orderInventory.batchId
-          )
+              (item: any) =>
+                item.productName === `${product.name} (${product.description})` &&
+                item.batchId === orderInventory.batchId
+            )
 
         if (foundItem[0].remark !== '') orderInventory.remark = foundItem[0].remark
         return orderInventory
@@ -320,24 +321,16 @@ export class DeliveryOrderMutation {
         deliveryOrderStatus = ORDER_STATUS.DELIVERING
       }
 
-      shippingOrderInfo.deliveryAddress1 = shippingOrderInfo.deliveryAddress
-      shippingOrderInfo.country = shippingOrderInfo.deliveryCountry
-      shippingOrderInfo.state = shippingOrderInfo.deliveryState
-      shippingOrderInfo.city = shippingOrderInfo.deliveryCity
-      shippingOrderInfo.phone1 = shippingOrderInfo.contact
-      shippingOrderInfo.postalCode = shippingOrderInfo.deliveryPostalCode
-      shippingOrderInfo.attentionCompany = shippingOrderInfo.companyName
-      shippingOrderInfo.collectionOrderNo = orderInfo.coNo
-
+      // save export option information
       if (orderInfo?.exportOption) {
         let savedShippingOrder: any = ''
         if (foundReleaseGood.shippingOrder == null) {
           savedShippingOrder = await tx.getRepository(ShippingOrder).save({
             name: OrderNoGenerator.shippingOrder(),
-            shipName: shippingOrderInfo.shippingOrder.shipName,
-            containerNo: shippingOrderInfo.shippingOrder.containerNo,
-            containerArrivalDate: shippingOrderInfo.shippingOrder.containerArrivalDate,
-            containerLeavingDate: shippingOrderInfo.shippingOrder.containerLeavingDate,
+            shipName: exportInfo.shipName,
+            containerNo: exportInfo.containerNo,
+            containerArrivalDate: exportInfo.containerArrivalDate,
+            containerLeavingDate: exportInfo.containerLeavingDate,
             status: ORDER_STATUS.PENDING,
             domain,
             bizplace: foundDeliveryOrder.bizplace,
@@ -348,17 +341,17 @@ export class DeliveryOrderMutation {
         savedShippingOrder = await tx.getRepository(ShippingOrder).save({
           ...foundReleaseGood.shippingOrder,
           name: OrderNoGenerator.shippingOrder(),
-          shipName: shippingOrderInfo.shippingOrder.shipName,
-          containerNo: shippingOrderInfo.shippingOrder.containerNo,
-          containerArrivalDate: shippingOrderInfo.shippingOrder.containerArrivalDate,
-          containerLeavingDate: shippingOrderInfo.shippingOrder.containerLeavingDate,
+          shipName: exportInfo.shipName,
+          containerNo: exportInfo.containerNo,
+          containerArrivalDate: exportInfo.containerArrivalDate,
+          containerLeavingDate: exportInfo.containerLeavingDate,
           status: ORDER_STATUS.PENDING,
           domain,
           bizplace: foundDeliveryOrder.bizplace,
           creator: user,
           updater: user
         })
-        shippingOrderInfo.shippingOrder = savedShippingOrder
+        exportInfo = savedShippingOrder
         foundReleaseGood.exportOption = true
       } else {
         foundReleaseGood.exportOption = false
@@ -367,7 +360,10 @@ export class DeliveryOrderMutation {
 
       await tx.getRepository(ReleaseGood).save({
         ...foundReleaseGood,
-        ...shippingOrderInfo
+        shippingOrder: {
+          ...exportInfo
+        },
+        collectionOrderNo: orderInfo.coNo
       })
 
       await tx.getRepository(DeliveryOrder).save({
@@ -383,6 +379,19 @@ export class DeliveryOrderMutation {
         remark: orderInfo?.remark,
         status: deliveryOrderStatus,
         reusablePallet: orderInfo?.reusablePallet,
+        attentionTo: shippingOrderInfo?.attentionTo || null,
+        attentionCompany: shippingOrderInfo?.attentionCompany || null,
+        city: shippingOrderInfo?.city || null,
+        state: shippingOrderInfo?.state || null,
+        postalCode: shippingOrderInfo?.postalCode || null,
+        country: shippingOrderInfo?.country || null,
+        phone1: shippingOrderInfo?.phone1 || null,
+        deliveryAddress1: shippingOrderInfo?.deliveryAddress1 || null,
+        billingAddress: shippingOrderInfo?.billingAddress || null,
+        billingCountry: shippingOrderInfo?.billingCountry || null,
+        billingPostalCode: shippingOrderInfo?.billingPostalCode || null,
+        billingState: shippingOrderInfo?.billingState || null,
+        billingCity: shippingOrderInfo?.billingCity || null,
         updater: user
       })
 
@@ -397,9 +406,7 @@ export class DeliveryOrderMutation {
   async dispatchManualDeliveryOrder(
     @Ctx() context: any,
     @Arg('orderInfo', type => DeliveryOrderPatch, { nullable: true }) orderInfo?: DeliveryOrderPatch,
-    @Arg('orderItems', type => [OrderInventoryPatch], { nullable: true }) orderItems?: OrderInventoryPatch[],
-    @Arg('shippingOrderInfo', type => ShippingOrderInfoPatch, { nullable: true })
-    shippingOrderInfo?: ShippingOrderInfoPatch
+    @Arg('orderItems', type => [OrderInventoryPatch], { nullable: true }) orderItems?: OrderInventoryPatch[]
   ): Promise<DeliveryOrder> {
     try {
       const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -774,6 +781,8 @@ export async function generateDeliveryOrder(
     orderNo = OrderNoGenerator.deliveryOrder()
   }
 
+  // insert shipping information from r/o to d/o
+
   let deliveryOrder: any = {
     domain,
     name: orderNo,
@@ -786,6 +795,19 @@ export async function generateDeliveryOrder(
     transportVehicle,
     status: ORDER_STATUS.READY_TO_DISPATCH,
     contactPointRefId: orderInfo?.contactPointRefId || null,
+    attentionTo: releaseGood?.attentionTo || null,
+    attentionCompany: releaseGood?.attentionCompany || null,
+    city: releaseGood?.city || null,
+    state: releaseGood?.state || null,
+    postalCode: releaseGood?.postalCode || null,
+    country: releaseGood?.country || null,
+    phone1: releaseGood?.phone1 || null,
+    deliveryAddress1: releaseGood?.deliveryAddress1 || null,
+    billingAddress: releaseGood?.billingAddress || null,
+    billingCountry: releaseGood?.billingCountry || null,
+    billingPostalCode: releaseGood?.billingPostalCode || null,
+    billingState: releaseGood?.billingState || null,
+    billingCity: releaseGood?.billingCity || null,
     creator: user,
     updater: user
   }

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

@@ -169,6 +169,74 @@ export class DeliveryOrder {
   @Field({ nullable: true })
   description: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionTo: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  attentionCompany: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  city: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  state: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  postalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  country: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  phone1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress1: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress3: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress4: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  deliveryAddress5: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingState: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCity: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

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

@@ -134,7 +134,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) { }
+      } catch (error) {}
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -228,15 +228,7 @@ export class ReleaseGoodMutation {
 
       releaseGood.shippingOrder = newShippingOrder
     }
-
-    shippingOrderInfo.deliveryAddress1 = shippingOrderInfo.deliveryFullAddress
-    shippingOrderInfo.country = shippingOrderInfo.deliveryCountry
-    shippingOrderInfo.state = shippingOrderInfo.deliveryState
-    shippingOrderInfo.city = shippingOrderInfo.deliveryCity
-    shippingOrderInfo.phone1 = shippingOrderInfo.contact
-    shippingOrderInfo.postalCode = shippingOrderInfo.deliveryPostalCode
-    shippingOrderInfo.attentionCompany = shippingOrderInfo.companyName
-
+    
     foundReleaseGood = await tx.getRepository(ReleaseGood).save({
       ...foundReleaseGood,
       ...releaseGood,
@@ -560,36 +552,6 @@ export async function generateReleaseGoodFunction(
       }
     })
 
-    let attentionToBind = releaseGood?.attentionTo
-    let billingAddressBind = releaseGood?.billingAddress
-    let deliveryAddressBind = releaseGood?.deliveryAddress1
-    let attentionCompanyBind = releaseGood?.companyName
-    let cityBind = releaseGood?.city
-    let stateBind = releaseGood?.state
-    let postalCodeBind = releaseGood?.postalCode
-    let countryBind = releaseGood?.country
-    let contactBind = releaseGood?.phone1
-    let billingCityBind = releaseGood?.billingCity
-    let billingCountryBind = releaseGood?.billingCountry
-    let billingPostalCodeBind = releaseGood?.billingPostalCode
-    let billingStateBind = releaseGood?.billingState
-
-    if (Object.keys(shippingOrderInfo).length > 0) {
-      attentionToBind = shippingOrderInfo.attentionTo
-      billingAddressBind = shippingOrderInfo.billingAddress
-      deliveryAddressBind = shippingOrderInfo.deliveryAddress
-      attentionCompanyBind = shippingOrderInfo.companyName
-      cityBind = shippingOrderInfo.deliveryCity
-      stateBind = shippingOrderInfo.deliveryState
-      postalCodeBind = shippingOrderInfo.deliveryPostalCode
-      countryBind = shippingOrderInfo.deliveryCountry
-      contactBind = shippingOrderInfo.contact
-      billingCityBind = shippingOrderInfo.billingCity
-      billingCountryBind = shippingOrderInfo.billingCountry
-      billingPostalCodeBind = shippingOrderInfo.billingPostalCode
-      billingStateBind = shippingOrderInfo.billingState
-    }
-
     newReleaseGood = {
       ...newReleaseGood,
       name: roNoSetting
@@ -603,25 +565,41 @@ export async function generateReleaseGoodFunction(
       ownTransport: releaseGood.ownTransport,
       packingOption: releaseGood.packingOption,
       marketplaceOrderStatus: releaseGood?.marketplaceOrderStatus || null,
-      billingAddress: billingAddressBind || null,
-      deliveryAddress1: deliveryAddressBind || null,
+      billingAddress: (releaseGood.type == 'b2c'
+        ? releaseGood?.billingAddress || null
+        : shippingOrderInfo.billingAddress || null),
+      deliveryAddress1: (releaseGood.type == 'b2c'
+        ? releaseGood?.deliveryAddress1 || null
+        : shippingOrderInfo.deliveryAddress1 || null),
       deliveryAddress2: releaseGood?.deliveryAddress2 || null,
       deliveryAddress3: releaseGood?.deliveryAddress3 || null,
       deliveryAddress4: releaseGood?.deliveryAddress4 || null,
       deliveryAddress5: releaseGood?.deliveryAddress5 || null,
-      attentionTo: attentionToBind || null,
-      attentionCompany: attentionCompanyBind || null,
-      city: cityBind || null,
-      state: stateBind || null,
-      postalCode: postalCodeBind || null,
-      country: countryBind || null,
-      phone1: contactBind || null,
+      attentionTo: (releaseGood.type == 'b2c'
+        ? releaseGood?.attentionTo || null
+        : shippingOrderInfo.attentionTo || null),
+      attentionCompany: (releaseGood.type =='b2c'
+        ? releaseGood?.companyName || null
+        : shippingOrderInfo.attentionCompany || null),
+      city: (releaseGood.type == 'b2c' ? releaseGood?.city || null : shippingOrderInfo.city || null),
+      state: (releaseGood.type == 'b2c' ? releaseGood?.state || null : shippingOrderInfo.state || null),
+      postalCode: (releaseGood.type == 'b2c' ? releaseGood?.postalCode || null : shippingOrderInfo.postalCode || null),
+      country: (releaseGood.type == 'b2c' ? releaseGood?.country || null : shippingOrderInfo.country || null),
+      phone1: (releaseGood.type == 'b2c' ? releaseGood?.phone1 || null : shippingOrderInfo.phone1 || null),
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
-      billingCity: billingCityBind || null,
-      billingCountry: billingCountryBind || null,
-      billingPostalCode: billingPostalCodeBind || null,
-      billingState: billingStateBind || null,
+      billingCity: (releaseGood.type == 'b2c'
+        ? releaseGood?.billingCity || null
+        : shippingOrderInfo.billingCity || null),
+      billingCountry: (releaseGood.type == 'b2c'
+        ? releaseGood?.billingCountry || null
+        : shippingOrderInfo.billingCountry || null),
+      billingPostalCode: (releaseGood.type == 'b2c'
+        ? releaseGood?.billingPostalCode || null
+        : shippingOrderInfo.billingPostalCode || null),
+      billingState: (releaseGood.type == 'b2c'
+        ? releaseGood?.billingState || null
+        : shippingOrderInfo.billingState || null),
       transporter: releaseGood?.transporter,
       trackingNo: releaseGood?.trackingNo,
       airwayBill: releaseGood?.airwayBill,

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

@@ -360,16 +360,16 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   stopId: string
 
-  @Field({ nullable: true})
+  @Field({ nullable: true })
   billingCity: string
 
-  @Field({ nullable: true})
+  @Field({ nullable: true })
   billingPostalCode: string
 
-  @Field({ nullable: true})
+  @Field({ nullable: true })
   billingCountry: string
-  
-  @Field({ nullable: true})
+
+  @Field({ nullable: true })
   billingState: string
 }
 
@@ -542,7 +542,8 @@ export class ReleaseGoodPatch {
 }
 
 @InputType()
-export class ShippingOrderInformationPatch {
+//** Comment: @Oscar, this class name title is not conform to the naming convention set, kindly change. */
+export class exportInformationPatch {
   @Field({ nullable: true })
   id?: string
 
@@ -581,7 +582,7 @@ export class ShippingOrderInfoPatch {
 
   @Field({ nullable: true })
   billingCountry: string
-  
+
   @Field({ nullable: true })
   companyName: string
 
@@ -623,20 +624,16 @@ export class ShippingOrderInfoPatch {
 
   @Field({ nullable: true })
   postalCode: string
-  
+
   @Field({ nullable: true })
   attentionCompany: string
-  
-  @Field({ nullable: true})
+
+  @Field({ nullable: true })
   collectionOrderNo: string
 
-  @Field({ nullable: true})
+  @Field({ nullable: true })
   billingFullAddress: string
 
-  @Field({ nullable: true})
+  @Field({ nullable: true })
   deliveryFullAddress: string
-
-  @Field(type => ShippingOrderInformationPatch, { nullable: true })
-  shippingOrder: ShippingOrderInformationPatch
 }
-

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

@@ -28,7 +28,7 @@ import {
   OrderProduct,
   OrderVas,
   ShippingOrder,
-  ShippingOrderInfo,
+  ShippingOrderInfo
 } from '../'
 
 import { ReleaseOrderType } from '../../constants'
@@ -96,8 +96,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -164,8 +164,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
+        ? 'varchar2'
+        : 'smallint',
     enum: DispatchmentStatus,
     default: DispatchmentStatus.READY_TO_DISPATCH
   })
@@ -441,6 +441,9 @@ export class ReleaseGood {
   @Field({ nullable: true })
   orderRemark: Boolean
 
-  @Field({nullable:true})
+  @Field({ nullable: true })
   invStatus: String
+
+  @Field({ nullable: true })
+  matchDeliveryAddress: Boolean
 }