@things-factory/sales-base 4.3.105-alpha.0 → 4.3.105

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

@@ -17,7 +17,7 @@ import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
 // import { sendNotification } from '@things-factory/notification'
-import { Product, ProductBundleSetting, ProductDetail } from '@things-factory/product-base'
+import { Product, ProductBundleSetting } from '@things-factory/product-base'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -676,7 +676,7 @@ export async function generateReleaseGoodFunction(
 
           const pbSettings: ProductBundleSetting[] = await tx.getRepository(ProductBundleSetting).find({
             where: { productBundle: oi.product.id },
-            relations: ['product', 'productBundle', 'productDetail']
+            relations: ['product', 'productBundle']
           })
 
           pbSettings.forEach(pbs => {
@@ -690,9 +690,6 @@ export async function generateReleaseGoodFunction(
                 id: pbs.product.id,
                 name: pbs.product.name,
                 groupType: PRODUCT_GROUP_TYPE.SINGLE
-              },
-              productDetail: {
-                id: pbs.productDetail.id
               }
             }
             splitBundleOIs.push(splitOI)
@@ -707,10 +704,6 @@ export async function generateReleaseGoodFunction(
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
 
     for (let oi of orderInventories) {
-      let productDetail: any = await tx
-        .getRepository(ProductDetail)
-        .findOne(oi.productDetail.id, { relations: ['product'] })
-
       let newOrderInv: OrderInventory = Object.assign({}, oi)
       newOrderInv = {
         ...newOrderInv,
@@ -719,8 +712,7 @@ export async function generateReleaseGoodFunction(
         status: ORDER_INVENTORY_STATUS.PENDING,
         name: OrderNoGenerator.orderInventory(),
         releaseGood: newReleaseGood,
-        product: productDetail.product,
-        productDetail,
+        product: await tx.getRepository(Product).findOne(oi.product.id),
         creator: user,
         updater: user
       }
@@ -758,9 +750,9 @@ export async function generateReleaseGoodFunction(
         }
 
         let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
+          newOrderInv.product,
           oi,
-          productDetail.product,
-          productDetail,
+          oi.packingType,
           locationSortingRules,
           bizplace,
           warehouseDomain,
@@ -1387,17 +1379,12 @@ export async function bulkGenerateReleaseGood(
         }
       }
 
-      let productDetail = oi.orderProduct?.productDetail
-      let product = oi.orderProduct?.product
-      if (!productDetail) {
-        productDetail = await tx.getRepository(ProductDetail).findOne(oi.productDetailId, { relations: ['product'] })
-        product = productDetail.product
-      }
+      const product: Product = await tx.getRepository(Product).findOne(oi.productId)
 
       let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
-        oi,
         product,
-        productDetail,
+        oi,
+        oi.packingType,
         locationSortingRules,
         bizplace,
         warehouseDomain,

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

@@ -196,7 +196,6 @@ export class ReleaseGoodQuery {
           .createQueryBuilder('oi')
           .leftJoinAndSelect('oi.inventory', 'inventory')
           .leftJoinAndSelect('oi.product', 'product')
-          .leftJoinAndSelect('oi.productDetail', 'productDetail')
           .leftJoinAndSelect('inventory.location', 'location')
           .where('oi.domain_id = :domainId', { domainId: domain.id })
           .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
@@ -227,7 +226,6 @@ export class ReleaseGoodQuery {
                 batchIdRef: inventory.batchIdRef,
                 palletId: inventory.palletId,
                 product: orderInv.product,
-                productDetail: orderInv.productDetail,
                 productIdRef: orderInv.product.id,
                 productName: `${orderInv.product.name} (${orderInv.product.description})`,
                 packingType: orderInv.packingType,
@@ -377,7 +375,10 @@ export class ReleaseGoodQuery {
         params.filters.push({
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: 'gte',
-          value: typeFilter == 'b2c' ? releaseDateFrom : fromDateVal.toISOString(),
+          value:
+            typeFilter == 'b2c'
+              ? releaseDateFrom
+              : fromDateVal.toISOString(),
           relation: false
         })
       }
@@ -392,7 +393,9 @@ export class ReleaseGoodQuery {
           name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
           operator: typeFilter == 'b2c' ? 'lte' : 'lt',
           value:
-            typeFilter == 'b2c' ? releaseDateTo : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+            typeFilter == 'b2c'
+              ? releaseDateTo
+              : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
           relation: false
         })
       }

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

@@ -1,6 +1,6 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product } from '@things-factory/product-base'
 import { ObjectRef } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
 
@@ -77,9 +77,6 @@ export class InventoryInfos {
   @Field(type => Product, { nullable: true })
   product?: Product
 
-  @Field(type => ProductDetail, { nullable: true })
-  productDetail?: ProductDetail
-
   @Field({ nullable: true })
   packingType?: string
 
@@ -188,6 +185,8 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   orderMethod: string
 
+
+
   @Field({ nullable: true })
   collectionOrderNo: string
 

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

@@ -194,6 +194,18 @@ export class ReleaseGood {
   @Field({ nullable: true })
   remark: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  platformName: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   marketplaceOrderStatus: string
@@ -382,6 +394,26 @@ export class ReleaseGood {
   @Field(type => ShippingOrderInfo, { nullable: true })
   shippingOrderInfo?: ShippingOrderInfo
 
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  discountAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  promotionAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  taxAmount?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  shippingFee?: number
+
+  @Column('float', { nullable: true })
+  @Field({ nullable: true })
+  paidAmount: number
+
   /* Mainly used for rawReleaseGood*/
   @Field({ nullable: true })
   productId: string
@@ -459,10 +491,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   orderRemark: Boolean
 
-  @Field({ nullable:true })
+  @Field({ nullable: true })
   totalInventoriesByBin: Number
 
-  @Field({ nullable:true })
+  @Field({ nullable: true })
   isOrderInventoryBin: Boolean
 
   @Field({ nullable: true })

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

@@ -6,7 +6,7 @@ import { Attachment, createAttachments } from '@things-factory/attachment-base'
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
-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'
 
@@ -59,7 +59,6 @@ export class ReturnOrderMutation {
         itm =>
           itm.product.id === curr.product.id &&
           itm.packingType === curr.packingType &&
-          itm.productDetailId === curr.product.productDetailId &&
           itm.batchId === curr.batchId &&
           itm.packingSize === curr.packingSize
       )
@@ -100,7 +99,6 @@ export class ReturnOrderMutation {
       newOrderInv.name = OrderNoGenerator.orderInventory()
       newOrderInv.returnOrder = createdReturnOrder
       newOrderInv.product = await tx.getRepository(Product).findOne(moi.product.id)
-      newOrderInv.productDetail = await tx.getRepository(ProductDetail).findOne(moi.productDetail.id)
       newOrderInv.creator = user
       newOrderInv.updater = user
 

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

@@ -115,7 +115,6 @@ export class NewReturnOrder {
   @Field({ nullable: true })
   truckNo: string
 
-
   @Field({ nullable: true })
   deliveryOrderNo: string
 

package/server/service/reverse-kitting-order-inventory/reverse-kitting-order-inventory.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'
 
@@ -127,10 +127,6 @@ export class ReverseKittingOrderInventory {
   @Field({ nullable: true })
   updatedAt?: Date
 
-  @ManyToOne(type => ProductDetail, { nullable: true })
-  @Field({ nullable: true })
-  productDetail: ProductDetail
-
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User