@things-factory/sales-base 4.1.29 → 4.1.33

package/server/service/invoice/invoice-types.ts

@@ -19,19 +19,19 @@ export class NewInvoice {
   @Field()
   name: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo1: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo2: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo3: string
 
-  @Field()
+  @Field({ nullable: true })
   issuedOn: string
 
-  @Field()
+  @Field({ nullable: true })
   contactPointRefId: string
 
   @Field()
@@ -40,31 +40,31 @@ export class NewInvoice {
   @Field()
   fromContactPhone: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress5: string
 
-  @Field()
+  @Field({ nullable: true })
   fromPostcode: string
 
-  @Field()
+  @Field({ nullable: true })
   fromCity: string
 
-  @Field()
+  @Field({ nullable: true })
   fromState: string
 
-  @Field()
+  @Field({ nullable: true })
   fromCountry: string
 
   @Field()
@@ -76,16 +76,16 @@ export class NewInvoice {
   @Field()
   deliveryAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress5: string
 
   @Field()
@@ -109,16 +109,16 @@ export class NewInvoice {
   @Field()
   billingAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress5: string
 
   @Field()
@@ -133,13 +133,13 @@ export class NewInvoice {
   @Field()
   billingCountry: string
 
-  @Field()
-  paymentDue: String
+  @Field({ nullable: true })
+  paymentDue: string
 
   @Field({ nullable: true })
   description: string
 
-  @Field(type => [NewInvoiceProduct])
+  @Field(type => [NewInvoiceProduct], { nullable: true })
   invoiceProducts: NewInvoiceProduct[]
 
   @Field(type => ObjectRef)
@@ -151,19 +151,19 @@ export class InvoicePatch {
   @Field({ nullable: true })
   name: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo1: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo2: string
 
-  @Field()
+  @Field({ nullable: true })
   refNo3: string
 
-  @Field()
+  @Field({ nullable: true })
   issuedOn: string
 
-  @Field()
+  @Field({ nullable: true })
   contactPointRefId: string
 
   @Field()
@@ -172,31 +172,31 @@ export class InvoicePatch {
   @Field()
   fromContactPhone: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   fromAddress5: string
 
-  @Field()
+  @Field({ nullable: true })
   fromPostcode: string
 
-  @Field()
+  @Field({ nullable: true })
   fromCity: string
 
-  @Field()
+  @Field({ nullable: true })
   fromState: string
 
-  @Field()
+  @Field({ nullable: true })
   fromCountry: string
 
   @Field()
@@ -208,16 +208,16 @@ export class InvoicePatch {
   @Field()
   deliveryAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   deliveryAddress5: string
 
   @Field()
@@ -241,16 +241,16 @@ export class InvoicePatch {
   @Field()
   billingAddress1: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress2: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress3: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress4: string
 
-  @Field()
+  @Field({ nullable: true })
   billingAddress5: string
 
   @Field()
@@ -265,8 +265,8 @@ export class InvoicePatch {
   @Field()
   billingCountry: string
 
-  @Field()
-  paymentDue: String
+  @Field({ nullable: true })
+  paymentDue: string
 
   @Field({ nullable: true })
   description: string

package/server/service/invoice/invoice.ts

@@ -43,26 +43,28 @@ export class Invoice {
   description: string
 
   @OneToMany(type => InvoiceProduct, invoiceProduct => invoiceProduct.invoice)
+  @Field(type => [InvoiceProduct], { nullable: true })
   invoiceProducts: InvoiceProduct[]
 
   @OneToOne(type => ReleaseGood, { nullable: true })
+  @Field(type => ReleaseGood, { nullable: true })
   @JoinColumn()
   releaseGood: ReleaseGood
 
   @Column({ default: '' })
-  @Field()
+  @Field({ nullable: true })
   refNo1: string
 
   @Column({ default: '' })
-  @Field()
+  @Field({ nullable: true })
   refNo2: string
 
   @Column({ default: '' })
-  @Field()
+  @Field({ nullable: true })
   refNo3: string
 
   @Column({ nullable: true })
-  @Field()
+  @Field({ nullable: true })
   issuedOn: Date
 
   @Column({ type: 'uuid', nullable: true })
@@ -201,6 +203,9 @@ export class Invoice {
   @Field()
   billingCountry: string
 
+  @Field({ nullable: true })
+  paymentDue: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

package/server/service/invoice-product/invoice-product-types.ts

@@ -1,7 +1,5 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
-import { ObjectRef } from '@things-factory/shell'
-
 import { InvoiceProduct } from './invoice-product'
 
 @ObjectType()
@@ -30,16 +28,13 @@ export class NewInvoiceProduct {
   @Field({ nullable: true })
   description: string
 
-  @Field(type => ObjectRef)
-  invoice: ObjectRef
-
   @Field(type => ProductInput)
   product: ProductInput
 
   @Field(type => Int)
   qty: number
 
-  @Field(type => Float, { nullable: false })
+  @Field(type => Float, { nullable: true })
   otherCharges: number
 
   @Field(type => Float)
@@ -60,16 +55,13 @@ export class InvoiceProductPatch {
   @Field({ nullable: true })
   description: string
 
-  @Field(type => ObjectRef)
-  invoice: ObjectRef
-
   @Field(type => ProductInput)
   product: ProductInput
 
   @Field(type => Int)
   qty: number
 
-  @Field(type => Float, { nullable: false })
+  @Field(type => Float, { nullable: true })
   otherCharges: number
 
   @Field(type => Float)

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

@@ -103,6 +103,12 @@ export class NewOrderInventory {
 
   @Field(type => Float, { nullable: true })
   returnUomValue: number
+
+  @Field(type => Int, { nullable: true })
+  returnToLocationQty: number
+
+  @Field(type => Float, { nullable: true })
+  returnToLocationUomValue: number
 }
 
 @InputType()

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

@@ -52,6 +52,7 @@ import { TransferOrder } from '../transfer-order/transfer-order'
   ],
   { unique: true }
 )
+
 @Index('ix_order-inventory_4', (orderInventory: OrderInventory) => [
   orderInventory.status,
   orderInventory.batchId,
@@ -62,6 +63,7 @@ import { TransferOrder } from '../transfer-order/transfer-order'
   orderInventory.releaseQty,
   orderInventory.uom
 ])
+
 @ObjectType()
 export class OrderInventory {
   @PrimaryGeneratedColumn('uuid')
@@ -147,9 +149,6 @@ export class OrderInventory {
   @RelationId((orderInventory: OrderInventory) => orderInventory.releaseGood)
   releaseGoodId: string
 
-  @Field({ nullable: true })
-  releaseGoodName: string
-
   @ManyToOne(type => InventoryCheck)
   @Field(type => InventoryCheck, { nullable: true })
   inventoryCheck: InventoryCheck
@@ -254,38 +253,25 @@ export class OrderInventory {
   @Field({ nullable: true })
   releaseUomValue: number
 
-  @Field({ nullable: true })
-  releaseUomValueWithUom: string
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   uom: string
 
+  @Column({ nullable: true, type: 'float' })
   @Field({ nullable: true })
-  productName: string
-
-  @Field({ nullable: true })
-  productSKU: string
-
-  @Field({ nullable: true })
-  productBrand: string
-
-  @Field({ nullable: true })
-  pallet: string
-
-  @Field({ nullable: true })
-  palletId: string
+  returnQty: number
 
+  @Column({ nullable: true, type: 'float' })
   @Field({ nullable: true })
-  extraJsonData: string
+  returnUomValue: number
 
   @Column({ nullable: true, type: 'float' })
   @Field({ nullable: true })
-  returnQty: number
+  returnToLocationQty: number
 
   @Column({ nullable: true, type: 'float' })
   @Field({ nullable: true })
-  returnUomValue: number
+  returnToLocationUomValue: number
 
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -314,20 +300,45 @@ export class OrderInventory {
   @Field({ nullable: true })
   status: string
 
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  pickedByUser: User
+
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  remainQty: number
+  pickedBy: string
 
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  remainUomValue: string
+  pickedAt: Date
 
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  packedByUser: User
+
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  remainUomValueWithUom: string
+  packedBy: string
 
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  isError: boolean
+  packedAt: Date
+
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  loadedByUser: User
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  loadedBy: string
 
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  groupType: string
+  loadedAt: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  shippedAt: Date
 
   @CreateDateColumn()
   @Field()
@@ -350,4 +361,43 @@ export class OrderInventory {
 
   @RelationId((orderInventory: OrderInventory) => orderInventory.updater)
   updaterId: string
+
+  @Field({ nullable: true })
+  remainQty: number
+
+  @Field({ nullable: true })
+  remainUomValue: string
+
+  @Field({ nullable: true })
+  remainUomValueWithUom: string
+
+  @Field({ nullable: true })
+  isError: boolean
+
+  @Field({ nullable: true })
+  groupType: string
+
+  @Field({ nullable: true })
+  releaseUomValueWithUom: string
+
+  @Field({ nullable: true })
+  releaseGoodName: string
+
+  @Field({ nullable: true })
+  productName: string
+
+  @Field({ nullable: true })
+  productSKU: string
+
+  @Field({ nullable: true })
+  productBrand: string
+
+  @Field({ nullable: true })
+  pallet: string
+
+  @Field({ nullable: true })
+  palletId: string
+
+  @Field({ nullable: true })
+  extraJsonData: string
 }

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

@@ -823,7 +823,9 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
         if (foundMarketplaceProductVariations) {
           await Promise.all(
             foundMarketplaceProductVariations.map(async variation => {
-              variation.reserveQty -= oi.releaseQty
+              if (variation.marketplaceProduct.marketplaceStore.reserveEnabled) {
+                variation.reserveQty -= oi.releaseQty
+              }
 
               await tx.getRepository(MarketplaceProductVariation).save(variation)
             })