@things-factory/marketplace-base 6.2.140 → 6.2.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "6.2.140",
+  "version": "6.2.142",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,8 +27,8 @@
     "@things-factory/env": "^6.2.139",
     "@things-factory/integration-fulfillment": "^6.2.140",
     "@things-factory/integration-marketplace": "^6.2.140",
-    "@things-factory/product-base": "^6.2.139",
+    "@things-factory/product-base": "^6.2.142",
     "@things-factory/shell": "^6.2.139"
   },
-  "gitHead": "aa99f06916839efd1616697529c8b1a08bdebde1"
+  "gitHead": "78bb2ad1a9d851be0c6ea0e176ccbab61c3b6cc8"
 }

package/server/entities/marketplace-order-item.ts

@@ -1,25 +1,12 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { MarketplaceOrder, MarketplaceOrderShippingItem, MarketplaceProductVariation } from '../entities'
 
 @Entity()
-@Index(
-  'ix_marketplace-order-item_0',
-  (marketplaceOrderItem: MarketplaceOrderItem) => [marketplaceOrderItem.domain, marketplaceOrderItem.id],
-  { unique: true }
-)
+@Index('ix_marketplace-order-item_0', (marketplaceOrderItem: MarketplaceOrderItem) => [marketplaceOrderItem.domain, marketplaceOrderItem.id], { unique: true })
 export class MarketplaceOrderItem {
   @PrimaryGeneratedColumn('uuid')
   id: string
@@ -33,16 +20,13 @@ export class MarketplaceOrderItem {
   @ManyToOne(type => MarketplaceOrder)
   marketplaceOrder: MarketplaceOrder
 
-  @OneToMany(
-    type => MarketplaceOrderShippingItem,
-    marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderItem
-  )
+  @OneToMany(type => MarketplaceOrderShippingItem, marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderItem)
   marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
 
   @Column()
   name: string
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   qty: number
 
   @Column({ nullable: true })
@@ -54,10 +38,10 @@ export class MarketplaceOrderItem {
   @Column({ nullable: true })
   paidPrice: string
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   originalPrice: number
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   discount: number
 
   @Column({ nullable: true })
@@ -84,55 +68,55 @@ export class MarketplaceOrderItem {
   @Column({ nullable: true })
   description: string
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   paymentFee: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   commissionFee: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   shippingFeePaidByCustomer: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   promotionalCharges: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   ordersMarketplaceFeesTotal: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   ordersMarketingFeesTotal: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   ordersSalesTotal: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   ordersLogisticsTotal: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   itemPriceCredit: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   marketplaceBonus: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   marketplaceBonusSeller: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   shippingFeeDiscountMarketplace: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   shippingFeeDiscountSeller: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   promotionalChargesFlexiCombo: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   autoShippingSubsidyMarketplace: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   originalShippingFee: number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   taxAmount: number
 
   @CreateDateColumn()

package/server/entities/marketplace-order-shipping.ts

@@ -1,30 +1,16 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { MarketplaceOrderShippingItem } from '../entities'
 
 @Entity()
-@Index(
-  'ix_marketplace-order-shipping_0',
-  (marketplaceOrderShipping: MarketplaceOrderShipping) => [
-    marketplaceOrderShipping.domain,
-    marketplaceOrderShipping.name
-  ],
-  { unique: true }
-)
+@Index('ix_marketplace-order-shipping_0', (marketplaceOrderShipping: MarketplaceOrderShipping) => [marketplaceOrderShipping.domain, marketplaceOrderShipping.name], {
+  unique: true
+})
 export class MarketplaceOrderShipping {
   @PrimaryGeneratedColumn('uuid')
   id: string
@@ -35,10 +21,7 @@ export class MarketplaceOrderShipping {
   @Column()
   name: string
 
-  @OneToMany(
-    type => MarketplaceOrderShippingItem,
-    marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderShipping
-  )
+  @OneToMany(type => MarketplaceOrderShippingItem, marketplaceOrderShippingItem => marketplaceOrderShippingItem.marketplaceOrderShipping)
   marketplaceOrderShippingItems: MarketplaceOrderShippingItem[]
 
   @ManyToOne(type => MarketplaceStore)
@@ -116,19 +99,19 @@ export class MarketplaceOrderShipping {
   @Column({ nullable: true })
   weightUnit: string
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   totalWeight: number
 
   @Column({ nullable: true })
   volumeUnit: string
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   totalVolume: number
 
   @Column({ nullable: true })
   collectionType: string
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   collectionAmount: number
 
   @Column({ nullable: true })
@@ -146,16 +129,16 @@ export class MarketplaceOrderShipping {
   @Column({ nullable: true })
   invoice: string
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   shippingFee: number
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   actualShippingFee: number
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   marketplaceShippingFeeVoucher: number
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   sellerShippingFeeVoucher: number
 
   @Column({ nullable: true })

package/server/entities/marketplace-order.ts

@@ -1,27 +1,16 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { MarketplaceOrderItem } from '../entities'
 
 @Entity()
-@Index(
-  'ix_marketplace-order_0',
-  (marketplaceOrder: MarketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name, marketplaceOrder.marketplaceStore],
-  { unique: true }
-)
+@Index('ix_marketplace-order_0', (marketplaceOrder: MarketplaceOrder) => [marketplaceOrder.domain, marketplaceOrder.name, marketplaceOrder.marketplaceStore], {
+  unique: true
+})
 export class MarketplaceOrder {
   @PrimaryGeneratedColumn('uuid')
   id: string
@@ -50,7 +39,7 @@ export class MarketplaceOrder {
   @Column({ type: 'int', nullable: true })
   itemCount: number
 
-  @Column({ type: 'float', nullable: true })
+  @Column({ type: 'float', nullable: true, transformer: roundTransformer })
   totalAmount: number
 
   @Column({ nullable: true })
@@ -110,26 +99,26 @@ export class MarketplaceOrder {
   @Column({ nullable: true })
   payTime: Date
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   commissionFee: Number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   serviceFee: Number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   transactionFee: Number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   totalRealeasedAmount: Number
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   voucherAmount: String
 
-  @Column({ nullable: true, type: 'float' })
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
   shippingRebate: Number
 
   @Column({ nullable: true })
-  shippingMode: String 
+  shippingMode: String
 
   @Column({ nullable: true })
   payoutDate: Date

package/server/entities/marketplace-product-variation-price.ts

@@ -1,24 +1,12 @@
-import {
-  CreateDateColumn,
-  UpdateDateColumn,
-  Entity,
-  Index,
-  Column,
-  OneToMany,
-  ManyToOne,
-  PrimaryGeneratedColumn
-} from 'typeorm'
-import { Domain } from '@things-factory/shell'
+import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
+import { Domain, roundTransformer } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { MarketplaceProductVariation } from '../entities'
 
 @Entity()
 @Index(
   'ix_marketplace_product_variation_price_0',
-  (marketplaceProductVariationPrice: MarketplaceProductVariationPrice) => [
-    marketplaceProductVariationPrice.domain,
-    marketplaceProductVariationPrice.name
-  ],
+  (marketplaceProductVariationPrice: MarketplaceProductVariationPrice) => [marketplaceProductVariationPrice.domain, marketplaceProductVariationPrice.name],
   { unique: true }
 )
 export class MarketplaceProductVariationPrice {
@@ -36,28 +24,25 @@ export class MarketplaceProductVariationPrice {
   })
   description: string
 
-  @ManyToOne(
-    type => MarketplaceProductVariation,
-    marketplaceProductVariation => marketplaceProductVariation.marketplaceProductVariationPrices
-  )
+  @ManyToOne(type => MarketplaceProductVariation, marketplaceProductVariation => marketplaceProductVariation.marketplaceProductVariationPrices)
   marketplaceProductVariation: MarketplaceProductVariation
 
   @Column({ nullable: true })
   currency: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   mrpPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   costPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   sellPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   afterTaxCostPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   afterTaxSalesPrice: number
 
   @CreateDateColumn()

package/server/entities/marketplace-product-variation.ts

@@ -1,16 +1,7 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn
-} from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 
 import { MarketplaceProduct, MarketplaceProductVariationPrice } from '../entities'
 import { NoGenerator } from '../utils'
@@ -18,10 +9,7 @@ import { NoGenerator } from '../utils'
 @Entity()
 @Index(
   'ix_marketplace-product-variation_0',
-  (marketplaceProductVariation: MarketplaceProductVariation) => [
-    marketplaceProductVariation.domain,
-    marketplaceProductVariation.id
-  ],
+  (marketplaceProductVariation: MarketplaceProductVariation) => [marketplaceProductVariation.domain, marketplaceProductVariation.id],
   { unique: true }
 )
 export class MarketplaceProductVariation {
@@ -71,10 +59,7 @@ export class MarketplaceProductVariation {
   @ManyToOne(type => MarketplaceProduct, marketplaceProduct => marketplaceProduct.marketplaceProductVariations)
   marketplaceProduct: MarketplaceProduct
 
-  @OneToMany(
-    type => MarketplaceProductVariationPrice,
-    marketplaceProductVariationPrice => marketplaceProductVariationPrice.marketplaceProductVariation
-  )
+  @OneToMany(type => MarketplaceProductVariationPrice, marketplaceProductVariationPrice => marketplaceProductVariationPrice.marketplaceProductVariation)
   marketplaceProductVariationPrices: MarketplaceProductVariationPrice[]
 
   @Column()
@@ -92,22 +77,22 @@ export class MarketplaceProductVariation {
   @Column({ nullable: true })
   description: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   qty: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   reserveQty: number
 
   @Column({ nullable: true })
   type: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   mrpPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   costPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   sellPrice: number
 
   @Column({ nullable: true })
@@ -119,10 +104,10 @@ export class MarketplaceProductVariation {
   @Column({ nullable: true })
   marketplaceStatus: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   afterTaxCostPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   afterTaxSalesPrice: number
 
   @Column({ nullable: true })
@@ -131,7 +116,7 @@ export class MarketplaceProductVariation {
   @Column({ nullable: true })
   primaryUnit: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   primaryUnitValue: number
 
   @Column({

package/server/entities/marketplace-refund-order-item.ts

@@ -1,65 +1,56 @@
-import {
-    Column,
-    CreateDateColumn,
-    Entity,
-    Index,
-    ManyToOne,
-    PrimaryGeneratedColumn,
-    UpdateDateColumn
-  } from 'typeorm'
-  
-  import { User } from '@things-factory/auth-base'
-  import { Domain } from '@things-factory/shell'
-  import { MarketplaceRefundOrder } from '../entities'
-  import { MarketplaceProductVariation } from '../entities'  
-  @Entity()
-  @Index(
-    'ix_marketplace-refund-order-item_0',
-    (marketplaceRefundOrderItem: MarketplaceRefundOrderItem) => [marketplaceRefundOrderItem.domain, marketplaceRefundOrderItem.name],
-    { unique: true }
-  )
-  export class MarketplaceRefundOrderItem {
-      @PrimaryGeneratedColumn('uuid')
-      id: string
-    
-      @ManyToOne(type => Domain)
-      domain: Domain
-
-      @ManyToOne(type => MarketplaceRefundOrder)
-      marketplaceRefundOrder: MarketplaceRefundOrder
-
-      @ManyToOne(type => MarketplaceProductVariation)
-      marketplaceProductVariation: MarketplaceProductVariation
-
-      @Column()
-      name: string
-
-      @Column()
-      orderItemId: string
-
-      @Column({ nullable: true })
-      status: string
-
-      @Column({ nullable: true, type: 'float' })
-      price: number
-
-      @Column({ nullable: true })
-      qty: string
-
-      @CreateDateColumn()
-      createdAt: Date
-    
-      @UpdateDateColumn()
-      updatedAt: Date
-    
-      @ManyToOne(type => User, {
-        nullable: true
-      })
-      creator: User
-    
-      @ManyToOne(type => User, {
-        nullable: true
-      })
-      updater: User    
-  }
-  
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain, roundTransformer } from '@things-factory/shell'
+import { MarketplaceRefundOrder } from '../entities'
+import { MarketplaceProductVariation } from '../entities'
+@Entity()
+@Index(
+  'ix_marketplace-refund-order-item_0',
+  (marketplaceRefundOrderItem: MarketplaceRefundOrderItem) => [marketplaceRefundOrderItem.domain, marketplaceRefundOrderItem.name],
+  { unique: true }
+)
+export class MarketplaceRefundOrderItem {
+  @PrimaryGeneratedColumn('uuid')
+  id: string
+
+  @ManyToOne(type => Domain)
+  domain: Domain
+
+  @ManyToOne(type => MarketplaceRefundOrder)
+  marketplaceRefundOrder: MarketplaceRefundOrder
+
+  @ManyToOne(type => MarketplaceProductVariation)
+  marketplaceProductVariation: MarketplaceProductVariation
+
+  @Column()
+  name: string
+
+  @Column()
+  orderItemId: string
+
+  @Column({ nullable: true })
+  status: string
+
+  @Column({ nullable: true, type: 'float', transformer: roundTransformer })
+  price: number
+
+  @Column({ nullable: true })
+  qty: string
+
+  @CreateDateColumn()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  updatedAt: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  creator: User
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  updater: User
+}