@things-factory/sales-base 3.8.25 → 3.8.29

package/server/graphql/resolvers/purchase-order/create-purchase-order.ts

@@ -1,21 +1,30 @@
+import { FileUpload } from 'graphql-upload'
+import { EntityManager, getRepository, Repository } from 'typeorm'
+
 import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { Bizplace, ContactPoint, getMyBizplace, getOutletBizplace, getPermittedBizplaces } from '@things-factory/biz-base'
-import { Location } from '@things-factory/warehouse-base'
-import { generateId } from '@things-factory/id-rule-base'
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+import {
+  Bizplace,
+  ContactPoint,
+  getMyBizplace,
+  getOutletBizplace,
+  getPermittedBizplaces
+} from '@things-factory/biz-base'
+import { generateId } from '@things-factory/id-rule-base'
 import { Setting } from '@things-factory/setting-base'
+import { Domain } from '@things-factory/shell'
+import { Location } from '@things-factory/warehouse-base'
+
 import {
+  ATTACHMENT_TYPE,
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
-  PURCHASE_ORDER_STATUS,
-  ATTACHMENT_TYPE
+  PURCHASE_ORDER_STATUS
 } from '../../../constants'
-import { ArrivalNotice, PurchaseOrder, OrderProduct, PurchaseOrderOtherCharge } from '../../../entities'
+import { ArrivalNotice, OrderProduct, PurchaseOrder, PurchaseOrderOtherCharge } from '../../../entities'
 import { OrderNoGenerator } from '../../../utils/order-no-generator'
-import { upsertPurchaseOrderProducts} from './index'
-import { generateArrivalNoticeFunction, confirmArrivalNoticeFunction } from '../arrival-notice/index'
+import { confirmArrivalNoticeFunction, generateArrivalNoticeFunction } from '../arrival-notice/index'
+import { upsertPurchaseOrderProducts } from './index'
 
 export const createPurchaseOrder = {
   async createPurchaseOrder(_: any, { purchaseOrder }, context: any) {
@@ -33,7 +42,7 @@ export const createPurchaseOrder = {
 export async function createPurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
@@ -54,24 +63,23 @@ export async function createPurchaseOrderFunction(
     if (!foundPermittedBizplace) throw new Error(`This user does not permitted for this company`)
 
     purchaseOrder.bizplace = foundPermittedBizplace
-  } 
-  else {
+  } else {
     arrError.push(`No bizplace was selected`)
   }
 
-  if(purchaseOrder?.supplier?.id){
-    purchaseOrder.supplier = await getRepository(ContactPoint).findOne({id: purchaseOrder.supplier.id})
-  }else{
+  if (purchaseOrder?.supplier?.id) {
+    purchaseOrder.supplier = await getRepository(ContactPoint).findOne({ id: purchaseOrder.supplier.id })
+  } else {
     arrError.push(`No supplier was selected`)
   }
 
-  if(purchaseOrder?.bufferLocation?.id){
-    purchaseOrder.bufferLocation = await getRepository(Location).findOne({id: purchaseOrder.bufferLocation.id})
-  }else{
+  if (purchaseOrder?.bufferLocation?.id) {
+    purchaseOrder.bufferLocation = await getRepository(Location).findOne({ id: purchaseOrder.bufferLocation.id })
+  } else {
     arrError.push(`No buffer location was selected`)
   }
 
-  if(arrError.length > 0){
+  if (arrError.length > 0) {
     throw new Error(arrError.join(', '))
   }
 
@@ -98,16 +106,9 @@ export async function createPurchaseOrderFunction(
     creator: user,
     updater: user
   })
-  
+
   // // 2. Create purchase order product
-  await upsertPurchaseOrderProducts(
-    domain,
-    purchaseOrder.bizplace,
-    createdPurchaseOrder,
-    orderProducts,
-    user,
-    tx
-  )
+  await upsertPurchaseOrderProducts(domain, purchaseOrder.bizplace, createdPurchaseOrder, orderProducts, user, tx)
 
   // // 3. Create purchase order misc charges
   for await (let oc of otherCharges) {
@@ -122,8 +123,8 @@ export async function createPurchaseOrderFunction(
   }
 
   // // 4. Create Attacments
-  if (file?.length) {
-    const attachments: Attachment[] = file.map(attachment => {
+  if (files?.length) {
+    const attachments: Attachment[] = files.map(attachment => {
       return {
         file: attachment,
         refBy: createdPurchaseOrder.id,
@@ -132,6 +133,6 @@ export async function createPurchaseOrderFunction(
     })
     await createAttachments(_, { attachments }, context)
   }
-  
+
   return createdPurchaseOrder
 }

package/server/graphql/resolvers/purchase-order/update-purchase-order.ts

@@ -1,9 +1,12 @@
-import { Attachment, createAttachments, deleteAttachment } from '@things-factory/attachment-base'
+import { FileUpload } from 'graphql-upload'
+import { EntityManager, getRepository, Repository } from 'typeorm'
+
+import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaces } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
-import { EntityManager, getRepository, Repository } from 'typeorm'
+
 import { ATTACHMENT_TYPE } from '../../../constants'
 import { OrderProduct, PurchaseOrder, PurchaseOrderOtherCharge } from '../../../entities'
 import { getPurchaseOrderFunction, upsertPurchaseOrderProducts } from './index'
@@ -28,7 +31,7 @@ export const updatePurchaseOrder = {
 export async function updatePurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
@@ -100,14 +103,13 @@ export async function updatePurchaseOrderFunction(
   })
 
   // // 6. Remove All Attachment
-  for await (const file of foundAttachments.filter(attachment => !file.find(file => file.id == attachment.id))) {
-    await deleteAttachment(_, { id: file.id }, context)
+  if (foundAttachments?.length) {
+    await deleteAttachmentsByRef(_, { refBys: foundAttachments.map(file => file.refBy) }, context)
   }
 
   // // 7. Add New Attachment
-  const newAttachments = file.filter(attachment => !attachment.id)
-  if (newAttachments.length > 0) {
-    const attachments: Attachment[] = newAttachments.map(attachment => {
+  if (files?.length > 0) {
+    const attachments: Attachment[] = files.map(attachment => {
       return {
         file: attachment,
         refBy: updatePurchaseOrder.id,

package/server/graphql/resolvers/purchase-order/upsert-purchase-order.ts

@@ -1,30 +1,22 @@
-import { Attachment, createAttachments } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint, getMyBizplace, getOutletBizplace, getPermittedBizplaces } from '@things-factory/biz-base'
-import { generateId } from '@things-factory/id-rule-base'
-import { Product } from '@things-factory/product-base'
-import { Setting } from '@things-factory/setting-base'
-import { Domain } from '@things-factory/shell'
-import { Location } from '@things-factory/warehouse-base'
-import { EntityManager, getRepository, Repository } from 'typeorm'
-import {
-  ORDER_NUMBER_RULE_TYPE,
-  ORDER_NUMBER_SETTING_KEY,
-  PURCHASE_ORDER_STATUS,
-  ATTACHMENT_TYPE
-} from '../../../constants'
-import { ArrivalNotice, PurchaseOrder, OrderProduct } from '../../../entities'
-import { OrderNoGenerator } from '../../../utils/order-no-generator'
-import {  updatePurchaseOrderFunction, createPurchaseOrderFunction} from './index'
-import { generateArrivalNoticeFunction, confirmArrivalNoticeFunction } from '../arrival-notice/index'
+import { FileUpload } from 'graphql-upload'
+import { EntityManager } from 'typeorm'
+
+import { PurchaseOrder } from '../../../entities'
+import { createPurchaseOrderFunction, updatePurchaseOrderFunction } from './index'
 
 export const upsertPurchaseOrder = {
-  async upsertPurchaseOrder(_: any, { purchaseOrder, file }, context: any) {
+  async upsertPurchaseOrder(_: any, { purchaseOrder, files }, context: any) {
     try {
       const { tx }: { tx: EntityManager } = context.state
-      const createdPurchaseOrder: PurchaseOrder = await upsertPurchaseOrderFunction(_, purchaseOrder, file, context, tx)
-  
-      return createdPurchaseOrder      
+      const createdPurchaseOrder: PurchaseOrder = await upsertPurchaseOrderFunction(
+        _,
+        purchaseOrder,
+        files,
+        context,
+        tx
+      )
+
+      return createdPurchaseOrder
     } catch (error) {
       throw error
     }
@@ -34,18 +26,15 @@ export const upsertPurchaseOrder = {
 export async function upsertPurchaseOrderFunction(
   _: any,
   purchaseOrder: any,
-  file: Attachment,
+  files: FileUpload[],
   context: any,
   tx?: EntityManager
 ): Promise<PurchaseOrder> {
-  const { domain, user }: { domain: Domain; user: User } = context.state
-  let orderProducts: OrderProduct[] = purchaseOrder.orderProducts
-
-  if(!purchaseOrder.id){
-    purchaseOrder = await createPurchaseOrderFunction(_, purchaseOrder, file, context, tx) 
-  }else{
-    purchaseOrder = await updatePurchaseOrderFunction(_, purchaseOrder, file, context, tx) 
+  if (!purchaseOrder.id) {
+    purchaseOrder = await createPurchaseOrderFunction(_, purchaseOrder, files, context, tx)
+  } else {
+    purchaseOrder = await updatePurchaseOrderFunction(_, purchaseOrder, files, context, tx)
   }
-  
+
   return purchaseOrder
 }

package/server/graphql/types/index.ts

@@ -7,6 +7,7 @@ import * as DeliveryOrder from './delivery-order'
 import * as GoodsReceivalNote from './goods-receival-note'
 import * as InventoryCheck from './inventory-check'
 import * as Invoice from './invoice'
+import * as InvoiceProduct from './invoice-product'
 import * as JobSheet from './job-sheet'
 import * as Manifest from './manifest'
 import * as OrderInventory from './order-inventory'
@@ -29,6 +30,7 @@ export const queries = [
   RetailReplenishmentOrder.Query,
   TransferOrder.Query,
   Invoice.Query,
+  InvoiceProduct.Query,
   InventoryCheck.Query,
   JobSheet.Query,
   PurchaseOrder.Query,
@@ -58,6 +60,7 @@ export const mutations = [
   RetailReplenishmentOrder.Mutation,
   TransferOrder.Mutation,
   Invoice.Mutation,
+  InvoiceProduct.Mutation,
   InventoryCheck.Mutation,
   JobSheet.Mutation,
   PurchaseOrder.Mutation,
@@ -86,6 +89,7 @@ export const types = [
   ...RetailReplenishmentOrder.Types,
   ...TransferOrder.Types,
   ...Invoice.Types,
+  ...InvoiceProduct.Types,
   ...InventoryCheck.Types,
   ...JobSheet.Types,
   ...PurchaseOrder.Types,

package/server/graphql/types/invoice/invoice-patch.ts

@@ -3,12 +3,45 @@ import gql from 'graphql-tag'
 export const InvoicePatch = gql`
   input InvoicePatch {
     name: String
-    customer: String
+    refNo1: String
+    refNo2: String
+    refNo3: String
     issuedOn: String
+    contactPointRefId: String
+    from: String
+    fromContactPhone: String
+    fromAddress1: String
+    fromAddress2: String
+    fromAddress3: String
+    fromAddress4: String
+    fromAddress5: String
+    fromPostcode: String
+    fromCity: String
+    fromState: String
+    fromCountry: String
+    deliverTo: String
+    deliverToPhone: String
+    deliveryAddress1: String
+    deliveryAddress2: String
+    deliveryAddress3: String
+    deliveryAddress4: String
+    deliveryAddress5: String
+    deliveryCity: String
+    deliveryState: String
+    deliveryCountry: String
+    billTo: String
+    billToPhone: String
+    billingAddress1: String
+    billingAddress2: String
+    billingAddress3: String
+    billingAddress4: String
+    billingAddress5: String
+    billingPostcode: String
+    billingCity: String
+    billingState: String
+    billingCountry: String
     paymentDue: String
-    version: String
-    purchaseOrder: String
-    state: String
-    description: String
+    invoiceProducts: [ObjectRef]
+    releaseGood: ObjectRef
   }
 `

package/server/graphql/types/invoice/invoice.ts

@@ -5,12 +5,46 @@ export const Invoice = gql`
     id: String
     domain: Domain
     name: String
-    customer: Bizplace
+    refNo1: String
+    refNo2: String
+    refNo3: String
     issuedOn: String
+    contactPointRefId: String
+    from: String
+    fromContactPhone: String
+    fromAddress1: String
+    fromAddress2: String
+    fromAddress3: String
+    fromAddress4: String
+    fromAddress5: String
+    fromPostcode: String
+    fromCity: String
+    fromState: String
+    fromCountry: String
+    deliverTo: String
+    deliverToPhone: String
+    deliveryAddress1: String
+    deliveryAddress2: String
+    deliveryAddress3: String
+    deliveryAddress4: String
+    deliveryAddress5: String
+    deliveryCity: String
+    deliveryState: String
+    deliveryCountry: String
+    billTo: String
+    billToPhone: String
+    billingAddress1: String
+    billingAddress2: String
+    billingAddress3: String
+    billingAddress4: String
+    billingAddress5: String
+    billingPostcode: String
+    billingCity: String
+    billingState: String
+    billingCountry: String
     paymentDue: String
-    version: String
-    purchaseOrder: PurchaseOrder
-    state: String
+    invoiceProducts: [InvoiceProduct]
+    releaseGood: ReleaseGood
     description: String
     creator: User
     updater: User

package/server/graphql/types/invoice/new-invoice.ts

@@ -2,13 +2,47 @@ import gql from 'graphql-tag'
 
 export const NewInvoice = gql`
   input NewInvoice {
-    name: String!
-    customer: String!
-    issuedOn: String!
-    paymentDue: String!
-    version: String!
-    purchaseOrder: String!
-    state: String!
-    description: String
+    name: String
+    refNo1: String
+    refNo2: String
+    refNo3: String
+    issuedOn: String
+    contactPointRefId: String
+    from: String
+    fromContactPhone: String
+    fromAddress1: String
+    fromAddress2: String
+    fromAddress3: String
+    fromAddress4: String
+    fromAddress5: String
+    fromPostcode: String
+    fromCity: String
+    fromState: String
+    fromCountry: String
+    deliverTo: String
+    deliverToPhone: String
+    deliveryAddress1: String
+    deliveryAddress2: String
+    deliveryAddress3: String
+    deliveryAddress4: String
+    deliveryAddress5: String
+    deliveryCity: String
+    deliveryState: String
+    deliveryCountry: String
+    deliveryPostcode: String
+    billTo: String
+    billToPhone: String
+    billingAddress1: String
+    billingAddress2: String
+    billingAddress3: String
+    billingAddress4: String
+    billingAddress5: String
+    billingPostcode: String
+    billingCity: String
+    billingState: String
+    billingCountry: String
+    paymentDue: String
+    invoiceProducts: [NewInvoiceProduct]
+    releaseGood: ObjectRef
   }
 `

package/server/graphql/types/invoice-product/index.ts

@@ -0,0 +1,20 @@
+import { InvoiceProduct } from './invoice-product'
+import { InvoiceProductList } from './invoice-product-list'
+import { InvoiceProductPatch } from './invoice-product-patch'
+import { NewInvoiceProduct } from './new-invoice-product'
+import { ProductInput } from './product-input'
+
+export const Mutation = `
+  createInvoiceProduct (invoiceProduct: NewInvoiceProduct!): InvoiceProduct
+  updateInvoiceProduct (name: String! patch: InvoiceProductPatch!): InvoiceProduct
+  updateMultipleInvoiceProduct (patches: [InvoiceProductPatch]!): [InvoiceProduct]
+  deleteInvoiceProduct (name: String!): Boolean
+  deleteInvoiceProducts (names: [String]!): Boolean
+`
+
+export const Query = `
+  invoiceProducts(filters: [Filter], pagination: Pagination, sortings: [Sorting]): InvoiceProductList
+  invoiceProduct(name: String!): InvoiceProduct
+`
+
+export const Types = [InvoiceProduct, NewInvoiceProduct, InvoiceProductPatch, InvoiceProductList, ProductInput]

package/server/graphql/types/invoice-product/invoice-product-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const InvoiceProductList = gql`
+  type InvoiceProductList {
+    items: [InvoiceProduct]
+    total: Int
+  }
+`

package/server/graphql/types/invoice-product/invoice-product-patch.ts

@@ -0,0 +1,15 @@
+import gql from 'graphql-tag'
+
+export const InvoiceProductPatch = gql`
+  input InvoiceProductPatch {
+    id: String
+    name: String
+    description: String
+    invoice: ObjectRef
+    product: ObjectRef
+    qty: Int
+    otherCharges: Float
+    unitPrice: Float
+    paidPrice: Float
+  }
+`

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

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag'
+
+export const InvoiceProduct = gql`
+  type InvoiceProduct {
+    id: String
+    sku: String
+    name: String
+    domain: Domain
+    description: String
+    invoice: Invoice
+    product: Product
+    qty: Int
+    otherCharges: Float
+    unitPrice: Float
+    paidPrice: Float
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`

package/server/graphql/types/invoice-product/new-invoice-product.ts

@@ -0,0 +1,15 @@
+import gql from 'graphql-tag'
+
+export const NewInvoiceProduct = gql`
+  input NewInvoiceProduct {
+    sku: String
+    name: String!
+    description: String
+    invoice: ObjectRef
+    product: ProductInput
+    qty: Int
+    otherCharges: Float
+    unitPrice: Float
+    paidPrice: Float
+  }
+`

package/server/graphql/types/invoice-product/product-input.ts

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const ProductInput = gql`
+  input ProductInput {
+    sku: String
+  }
+`

package/server/graphql/types/purchase-order/index.ts

@@ -1,15 +1,12 @@
-import gql from 'graphql-tag'
-
 import { NewPurchaseOrder } from './new-purchase-order'
 import { PurchaseOrder } from './purchase-order'
 import { PurchaseOrderList } from './purchase-order-list'
 import { PurchaseOrderPatch } from './purchase-order-patch'
 
-
 export const Mutation = `
   upsertPurchaseOrder (
     purchaseOrder: PurchaseOrderPatch!
-    file: Upload
+    files: [Upload!]
   ): PurchaseOrder @privilege(category: "order_customer", privilege: "mutation") @transaction
 
   approvePurchaseOrder (

package/server/utils/order-no-generator.ts

@@ -58,6 +58,10 @@ export class OrderNoGenerator {
     return `OP-${uuid()}`
   }
 
+  static invoiceProduct() {
+    return `IP-${uuid()}`
+  }
+
   static orderVas() {
     return `OV-${uuid()}`
   }
@@ -121,4 +125,11 @@ export class OrderNoGenerator {
       currentDate.getMonth() + 1
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
+
+  static invoice() {
+    const currentDate = new Date()
+    return `INV-${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+  }
 }