@things-factory/sales-base 4.3.562 → 4.3.566

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

@@ -1,5 +1,14 @@
-import { FileUpload, GraphQLUpload } from 'graphql-upload'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import {
+  FileUpload,
+  GraphQLUpload
+} from 'graphql-upload'
+import {
+  Arg,
+  Ctx,
+  Directive,
+  Mutation,
+  Resolver
+} from 'type-graphql'
 import {
   Brackets,
   EntityManager,
@@ -12,8 +21,17 @@ import {
   SelectQueryBuilder
 } from 'typeorm'
 
-import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Application, ApplicationType, Partner, Role, User } from '@things-factory/auth-base'
+import {
+  Attachment,
+  createAttachments
+} from '@things-factory/attachment-base'
+import {
+  Application,
+  ApplicationType,
+  Partner,
+  Role,
+  User
+} from '@things-factory/auth-base'
 import {
   Bizplace,
   getCompanyBizplace,
@@ -24,16 +42,31 @@ import {
 } from '@things-factory/biz-base'
 import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
-import { webhookHandler, WebhookEventsEnum } from '@things-factory/integration-base'
+import {
+  WebhookEventsEnum,
+  webhookHandler
+} from '@things-factory/integration-base'
 import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
-import { ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  ProductBundleSetting,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, ProductDetailStock } from '@things-factory/warehouse-base'
+import {
+  Inventory,
+  ProductDetailStock
+} from '@things-factory/warehouse-base'
 
 // import { NewOrderProduct } from '../order-product/order-product-types'
 import {
@@ -47,18 +80,32 @@ import {
   ORDER_VAS_STATUS,
   PRODUCT_GROUP_TYPE
 } from '../../constants'
-import { EcommerceController, PowrupController, SellercraftController } from '../../controllers'
+import {
+  EcommerceController,
+  PowrupController,
+  SellercraftController
+} from '../../controllers'
 import { ValidationError } from '../../errors'
-import { InventoryUtil, OrderNoGenerator } from '../../utils'
+import {
+  InventoryUtil,
+  OrderNoGenerator
+} from '../../utils'
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
-import { confirmArrivalNoticeFunction, deleteArrivalNotice } from '../arrival-notice/arrival-notice-mutation'
+import {
+  confirmArrivalNoticeFunction,
+  deleteArrivalNotice
+} from '../arrival-notice/arrival-notice-mutation'
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderPackage } from '../order-package/order-package'
 import { OrderProduct } from '../order-product/order-product'
 import { OrderVasItem } from '../order-vas-item/order-vas-item'
 import { OrderVas } from '../order-vas/order-vas'
 import { OrderVasPatch } from '../order-vas/order-vas-types'
-import { NewReleaseGood, ReleaseGoodPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
+import {
+  NewReleaseGood,
+  ReleaseGoodPatch,
+  ShippingOrderInfoPatch
+} from '../release-good/release-good-types'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 import { editVas } from '../vas'
@@ -694,32 +741,44 @@ export async function generateReleaseGoodFunction(
       recall: releaseGood.recall,
       marketplaceOrderStatus: releaseGood?.marketplaceOrderStatus || null,
       billingAddress:
-        releaseGood.type == 'b2c' ? releaseGood?.billingAddress || null : shippingOrderInfo.billingAddress || null,
+        releaseGood.type == 'b2c' ? releaseGood?.billingAddress : shippingOrderInfo.billingAddress || null,
+      billingAddress2: 
+        releaseGood.type == 'b2c' ? releaseGood?.billingAddress2 : shippingOrderInfo.billingAddress2 || null,
+      billingAddress3: 
+        releaseGood.type == 'b2c' ? releaseGood?.billingAddress3 : shippingOrderInfo.billingAddress3 || null,
+      billingAddress4: 
+        releaseGood.type == 'b2c' ? releaseGood?.billingAddress4 : shippingOrderInfo.billingAddress4 || null,
+      billingAddress5: 
+        releaseGood.type == 'b2c' ? releaseGood?.billingAddress5 : shippingOrderInfo.billingAddress5 || 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: releaseGood.type == 'b2c' ? releaseGood?.attentionTo || null : shippingOrderInfo.attentionTo || null,
+        releaseGood.type == 'b2c' ? releaseGood?.deliveryAddress1 : shippingOrderInfo.deliveryAddress1 || null,
+      deliveryAddress2: 
+        releaseGood.type == 'b2c' ? releaseGood?.deliveryAddress2 : shippingOrderInfo.deliveryAddress2 || null,
+      deliveryAddress3: 
+        releaseGood.type == 'b2c' ? releaseGood?.deliveryAddress3 : shippingOrderInfo.deliveryAddress3 || null,
+      deliveryAddress4: 
+        releaseGood.type == 'b2c' ? releaseGood?.deliveryAddress4 : shippingOrderInfo.deliveryAddress4 || null,
+      deliveryAddress5: 
+        releaseGood.type == 'b2c' ? releaseGood?.deliveryAddress5 : shippingOrderInfo.deliveryAddress5 || null,
+      attentionTo: releaseGood.type == 'b2c' ? releaseGood?.attentionTo : 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,
+        releaseGood.type == 'b2c' ? releaseGood?.companyName : shippingOrderInfo.attentionCompany || null,
+      city: releaseGood.type == 'b2c' ? releaseGood?.city : shippingOrderInfo.city || null,
+      state: releaseGood.type == 'b2c' ? releaseGood?.state : shippingOrderInfo.state || null,
+      postalCode: releaseGood.type == 'b2c' ? releaseGood?.postalCode : shippingOrderInfo.postalCode || null,
+      country: releaseGood.type == 'b2c' ? releaseGood?.country : shippingOrderInfo.country || null,
+      phone1: releaseGood.type == 'b2c' ? releaseGood?.phone1 : shippingOrderInfo.phone1 || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
-      billingCity: releaseGood.type == 'b2c' ? releaseGood?.billingCity || null : shippingOrderInfo.billingCity || null,
+      billingCity: releaseGood.type == 'b2c' ? releaseGood?.billingCity : shippingOrderInfo.billingCity || null,
       billingCountry:
-        releaseGood.type == 'b2c' ? releaseGood?.billingCountry || null : shippingOrderInfo.billingCountry || null,
+        releaseGood.type == 'b2c' ? releaseGood?.billingCountry : shippingOrderInfo.billingCountry || null,
       billingPostalCode:
         releaseGood.type == 'b2c'
           ? releaseGood?.billingPostalCode || null
           : shippingOrderInfo.billingPostalCode || null,
       billingState:
-        releaseGood.type == 'b2c' ? releaseGood?.billingState || null : shippingOrderInfo.billingState || null,
+        releaseGood.type == 'b2c' ? releaseGood?.billingState : shippingOrderInfo.billingState || null,
       district: releaseGood.type == 'b2c' ? releaseGood?.city : null,
       transporter: releaseGood?.transporter,
       trackingNo: releaseGood?.trackingNo,
@@ -1536,6 +1595,7 @@ export async function bulkGenerateReleaseGood(
       deliveryAddress2: releaseGood?.deliveryAddress2 || null,
       deliveryAddress3: releaseGood?.deliveryAddress3 || null,
       deliveryAddress4: releaseGood?.deliveryAddress4 || null,
+      deliveryAddress5: releaseGood?.deliveryAddress5 || null,
       attentionTo: releaseGood?.attentionTo || null,
       attentionCompany: releaseGood?.attentionCompany || null,
       city: releaseGood?.city || null,
@@ -1570,6 +1630,10 @@ export async function bulkGenerateReleaseGood(
       packingOption: releaseGood?.packingOption || false,
       courierOption: releaseGood?.courierOption || false,
       billingAddress: releaseGood?.billingAddress || null,
+      billingAddress2: releaseGood?.billingAddress2 || null,
+      billingAddress3: releaseGood?.billingAddress3 || null,
+      billingAddress4: releaseGood?.billingAddress4 || null,
+      billingAddress5: releaseGood?.billingAddress5 || null,
       billingCity: releaseGood?.billingCity || null,
       billingState: releaseGood?.billingState || null,
       billingPostalCode: releaseGood?.billingPostalCode ? releaseGood.billingPostalCode : null,
@@ -1833,6 +1897,7 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
         'deliveryAddress2',
         'deliveryAddress3',
         'deliveryAddress4',
+        'deliveryAddress5',
         'postalCode'
       ]
 
@@ -1884,8 +1949,13 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
         deliveryAddress2: item.deliveryAddress2,
         deliveryAddress3: item.deliveryAddress3,
         deliveryAddress4: item.deliveryAddress4,
+        deliveryAddress5: item.deliveryAddress5,
         billingAddress: item.billingAddress,
-        billingCity: item.billingPostalCode,
+        billingAddress2: item.billingAddress2,
+        billingAddress3: item.billingAddress3,
+        billingAddress4: item.billingAddress4,
+        billingAddress5: item.billingAddress5,
+        billingCity: item.billingCity,
         billingState: item.billingState,
         billingCountry: item.billingCountry,
         billingPostalCode: item.billingPostalCode,
@@ -2014,4 +2084,4 @@ async function autoAssignLmd(domain, countryId, postalCode, bizplace) {
   }
 
   return lmdResult
-}
+}

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

@@ -1180,54 +1180,51 @@ function _extractData(rawData, validatedData) {
     return {
       ...raw,
       releaseUomValue,
-      errorMsg:
-        errMsg ? errMsg
-        : !raw.productId || !raw.productDetailId
-          ? 'inventory or product not found'
-          : raw.releaseQty <= 0 || raw.releaseQty % 1 !== 0
-            ? 'invalid release qty'
-            : raw.assignedQty < raw.releaseQty
-              ? 'insufficient stock'
-              : raw.releaseDate === ''
-                ? 'release date is empty'
-                : releaseDate < _getStdDateStr(new Date())
-                  ? 'backdate is not allowed'
-                  : !raw.refNo || raw.refNo === ''
-                    ? 'ref no is empty'
-                    : !Number.isInteger(raw.packingSize)
-                      ? 'packing size must be an integer'
-                      : raw?.type === 'b2c'
-                        ? !raw.attentionTo
-                          ? 'attention to is empty'
-                          : !raw.postalCode
-                            ? 'postal code is empty'
-                            : !raw.country
-                              ? 'country is empty'
-                              : !raw.deliveryAddress1
-                                ? 'delivery address 1 is empty'
-                                : !raw.city
-                                  ? 'city is empty'
-                                  : !raw.phone1
-                                    ? 'contact is empty'
-                                    : !raw.state
-                                      ? 'state is empty'
-                                      : !raw.billingAddress
-                                        ? 'billing address is empty'
-                                        : !raw.billingPostalCode
-                                          ? 'billing postal code is empty'
-                                          : !raw.billingCity
-                                            ? 'billing city is empty'
-                                            : !raw.billingState
-                                              ? 'billing state is empty'
-                                              : !raw.billingCountry
-                                                ? 'billing country is empty'
-                                                : (raw.codOption && !raw.paidAmount) || raw.paidAmount < 0 || raw.paidAmount == null
-                                                  ? 'invalid paid amount'
-                                                  : raw.airwayBill && raw.lmdOption == true
-                                                    ? 'kindly remove AWB as LMD is marked as true '
-                                                    : ''
-                        : ''
-    }
+      errorMsg: (() => {
+        const errors = [];
+
+        if (errMsg){
+          errors.push(errMsg)
+        }
+        if (!raw.productId || !raw.productDetailId) {
+          errors.push('inventory or product not found');
+        }
+        if (raw.releaseQty <= 0 || raw.releaseQty % 1 !== 0) {
+          errors.push('invalid release qty');
+        }
+        if (raw.assignedQty < raw.releaseQty) {
+          errors.push('insufficient stock');
+        }
+        if (raw.releaseDate === '') {
+          errors.push('release date is empty');
+        }
+        if (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.attentionTo) errors.push('attention to is empty');
+          if (!raw.postalCode) errors.push('postal code is empty');
+          if (!raw.country) errors.push('country is empty');
+          if (!raw.deliveryAddress1) errors.push('delivery address 1 is empty');
+          if (!raw.city) errors.push('city is empty');
+          if (!raw.phone1) errors.push('contact is empty');
+          if (!raw.state) errors.push('state is empty');
+          if ((raw.codOption && !raw.paidAmount) || raw.paidAmount < 0 || raw.paidAmount == null) {
+            errors.push('invalid paid amount');
+          }
+          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
+      })(),
+    };
+    
   })
 }
 
@@ -1254,4 +1251,4 @@ function _getStdDateStr(date) {
     date.setHours(date.getHours() + 8)
     return date.toISOString().split('T')[0]
   }
-}
+}

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

@@ -1,6 +1,15 @@
-import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
-
-import { Product, ProductDetail } from '@things-factory/product-base'
+import {
+  Field,
+  Float,
+  InputType,
+  Int,
+  ObjectType
+} from 'type-graphql'
+
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -240,6 +249,18 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   billingAddress: string
 
+  @Field({ nullable: true })
+  billingAddress2: string
+
+  @Field({ nullable: true })
+  billingAddress3: string
+
+  @Field({ nullable: true })
+  billingAddress4: string
+
+  @Field({ nullable: true })
+  billingAddress5: string
+
   @Field({ nullable: true })
   deliveryAddress1: string
 
@@ -520,6 +541,18 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   billingAddress: string
 
+  @Field({ nullable: true })
+  billingAddress2: string
+
+  @Field({ nullable: true })
+  billingAddress3: string
+
+  @Field({ nullable: true })
+  billingAddress4: string
+
+  @Field({ nullable: true })
+  billingAddress5: string
+
   @Field({ nullable: true })
   deliveryAddress1: string
 
@@ -628,9 +661,6 @@ export class ExportInformationPatch {
 
 @InputType()
 export class ShippingOrderInfoPatch {
-  @Field({ nullable: true })
-  billingAddress: string
-
   @Field({ nullable: true })
   billingCity: string
 
@@ -667,9 +697,36 @@ export class ShippingOrderInfoPatch {
   @Field({ nullable: true })
   attentionTo: string
 
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Field({ nullable: true })
+  billingAddress2: string
+
+  @Field({ nullable: true })
+  billingAddress3: string
+
+  @Field({ nullable: true })
+  billingAddress4: string
+
+  @Field({ nullable: true })
+  billingAddress5: string
+
   @Field({ nullable: true })
   deliveryAddress1: string
 
+  @Field({ nullable: true })
+  deliveryAddress2: string
+
+  @Field({ nullable: true })
+  deliveryAddress3: string
+
+  @Field({ nullable: true })
+  deliveryAddress4: string
+
+  @Field({ nullable: true })
+  deliveryAddress5: string
+
   @Field({ nullable: true })
   country: string
 
@@ -702,4 +759,4 @@ export class ShippingOrderInfoPatch {
 
   @Field({ nullable: true })
   ward: string
-}
+}

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

@@ -1,4 +1,8 @@
-import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Field,
+  ID,
+  ObjectType
+} from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -15,7 +19,10 @@ import {
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import {
+  Bizplace,
+  ContactPoint
+} from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { Domain } from '@things-factory/shell'
@@ -250,6 +257,22 @@ export class ReleaseGood {
   @Field({ nullable: true })
   billingAddress: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress3: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress4: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingAddress5: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   billingCountry: string
@@ -640,4 +663,4 @@ export class ReleaseGood {
   })
   @Field({ nullable: true })
   sourceData: string
-}
+}