@things-factory/worksheet-base 4.0.39 → 4.0.43

package/server/controllers/render-invoices.ts

@@ -0,0 +1,154 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { config } from '@things-factory/env'
+import { Invoice, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import { TEMPLATE_TYPE } from '../constants'
+import { DateTimeConverter } from '../utils/datetime-util'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+export async function renderInvoices({ req, timezoneOffSet }, context: any) {
+  try {
+    const domain: Domain = await getRepository(Domain).findOne({
+      where: { id: context.state.domain.id }
+    })
+
+    let result = await Promise.all(
+      req.roIds.map(async roId => {
+        try {
+          const foundReleaseGoods: ReleaseGood = await getRepository(ReleaseGood).findOne({
+            where: { domain, id: roId },
+            relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
+          })
+
+          if (foundReleaseGoods) {
+            const foundInvoice: Invoice = await getRepository(Invoice).findOne({
+              where: { releaseGood: foundReleaseGoods },
+              relations: ['invoiceProducts', 'invoiceProducts.product', 'domain', 'creator', 'updater']
+            })
+
+            const partnerBiz: Bizplace = foundReleaseGoods.bizplace
+
+            const partnerCompanyDomain: Domain = foundReleaseGoods.bizplace.company.domain
+
+            const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+              where: { domain: partnerCompanyDomain, category: TEMPLATE_TYPE.INVOICE_TEMPLATE }
+            })
+
+            const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+            let fullBillingAddress = [
+              foundInvoice.billingAddress1,
+              foundInvoice.billingAddress2,
+              foundInvoice.billingAddress3,
+              foundInvoice.billingAddress4,
+              foundInvoice.billingAddress5
+            ]
+
+            let fullDeliveryAddress = [
+              foundInvoice.deliveryAddress1,
+              foundInvoice.deliveryAddress2,
+              foundInvoice.deliveryAddress3,
+              foundInvoice.deliveryAddress4,
+              foundInvoice.deliveryAddress5
+            ]
+
+            let date = DateTimeConverter.date(
+              new Date((foundInvoice.issuedOn || foundInvoice.createdAt) - timezoneOffSet)
+            )
+            const data = {
+              order_no: foundReleaseGoods.name,
+              ref_no: foundReleaseGoods.refNo,
+              deliver_to: foundInvoice.deliverTo,
+              deliver_to_phone: foundInvoice.deliverToPhone || '',
+              bill_to: foundInvoice.billTo,
+              bill_to_phone: foundInvoice.billToPhone || '',
+              customer_address: partnerBiz.address,
+              delivery_date: date,
+              store_name: foundInvoice.from,
+              billing_address_1: foundInvoice.billingAddress1,
+              billing_address_2: foundInvoice.billingAddress2,
+              billing_address_3: foundInvoice.billingAddress3,
+              billing_address_4: foundInvoice.billingAddress4,
+              billing_address_5: foundInvoice.billingAddress5,
+              billing_postcode: foundInvoice.billingPostcode,
+              billing_city: foundInvoice.billingCity,
+              billing_state: foundInvoice.billingState,
+              billing_country: foundInvoice.billingCountry,
+              full_billing_address: fullBillingAddress
+                .reduce((acc, itm) => {
+                  if (itm && itm.trim() != '') {
+                    acc.push(itm)
+                  }
+
+                  return acc
+                }, [])
+                .join(' '),
+              delivery_address_1: foundInvoice.deliveryAddress1,
+              delivery_address_2: foundInvoice.deliveryAddress2,
+              delivery_address_3: foundInvoice.deliveryAddress3,
+              delivery_address_4: foundInvoice.deliveryAddress4,
+              delivery_address_5: foundInvoice.deliveryAddress5,
+              delivery_postcode: foundInvoice.deliveryPostcode,
+              delivery_city: foundInvoice.deliveryCity,
+              delivery_state: foundInvoice.deliveryState,
+              delivery_country: foundInvoice.deliveryCountry,
+              full_delivery_address: fullDeliveryAddress
+                .reduce((acc, itm) => {
+                  if (itm && itm.trim() != '') {
+                    acc.push(itm)
+                  }
+
+                  return acc
+                }, [])
+                .join(' '),
+              product_list: foundInvoice.invoiceProducts.map((item, idx) => {
+                return {
+                  list_no: idx + 1,
+                  product_sku: item.sku,
+                  product_name: item.name,
+                  product_desc: item.description,
+                  product_qty: item.qty,
+                  product_other_charges: item.otherCharges,
+                  product_paid_price: parseFloat(item.paidPrice || item.unitPrice).toFixed(2),
+                  product_unit_price: parseFloat(item.unitPrice).toFixed(2),
+                  product_total_paid_price: (
+                    parseFloat(item.paidPrice || item.unitPrice) * parseFloat(item.qty)
+                  ).toFixed(2),
+                  product_total_unit_price: (parseFloat(item.unitPrice) * parseFloat(item.qty)).toFixed(2)
+                }
+              })
+            }
+
+            const formData = new FormData()
+            formData.append('template', template)
+            formData.append('jsonString', JSON.stringify(data))
+
+            const response = await fetch(REPORT_API_URL, {
+              method: 'POST',
+              body: formData
+            })
+
+            return await response.text()
+          }
+          return ''
+        } catch (ex) {
+          return ''
+        }
+      })
+    )
+
+    if (result.length <= 0) {
+      throw Error('No invoice found!')
+    }
+    return result.join()
+  } catch (ex) {
+    throw ex
+  }
+}

package/server/controllers/render-ro-do.ts

@@ -143,6 +143,7 @@ export async function renderRODO({ doNo }, context: any) {
         product_type: inventory.packingType,
         product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
         product_batch: inventory.batchId,
+        product_batch_ref: inventory.batchIdRef,
         product_qty: targetInventory.releaseQty,
         product_weight: targetInventory.releaseWeight,
         product_gross_weight: inventory.product.grossWeight,
@@ -159,6 +160,7 @@ export async function renderRODO({ doNo }, context: any) {
         newItem =>
           newItem.product_name === item.product_name &&
           newItem.product_batch === item.product_batch &&
+          newItem.product_batch_ref === item.product_batch_ref &&
           newItem.cross_docking === item.cross_docking &&
           newItem.pallet === item.pallet
       )
@@ -169,6 +171,7 @@ export async function renderRODO({ doNo }, context: any) {
           product_type: item.product_type,
           product_size: item.product_size,
           product_batch: item.product_batch,
+          product_batch_ref: item.product_batch_ref,
           product_qty: item.product_qty,
           product_weight: item.product_weight,
           product_gross_weight: item.product_gross_weight,
@@ -190,6 +193,7 @@ export async function renderRODO({ doNo }, context: any) {
           if (
             ni.product_name === item.product_name &&
             ni.product_batch === item.product_batch &&
+            ni.product_batch_ref === item.product_batch_ref &&
             ni.cross_docking === item.cross_docking &&
             ni.pallet === item.pallet
           ) {
@@ -268,7 +272,8 @@ export async function renderRODO({ doNo }, context: any) {
           : prod.pallet === ''
           ? `${prod.palletQty} PALLET(S)`
           : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
-        inventory_remark: prod?.inventory_remark ? prod.inventory_remark : ''
+        inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
+        batch_id_ref: prod.product_batch_ref
       }
     })
   } //.. make data from do

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -64,7 +64,18 @@ export async function completeBatchPicking(
     await Promise.all(
       uniqueReleaseGoods.map(async releaseGood => {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+
+        let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+          where: { id: releaseGood.id },
+          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
+        })
+
+        if (!foundReleaseGood?.packageId) {
+          foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
+        }
+
+        foundReleaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
+        await sellercraftCtrl.initiateOrderDocument(sellercraft, foundReleaseGood)
       })
     )
   }

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -55,7 +55,10 @@ export async function completePicking(
       'bizplace.company.domain',
       'orderInventories',
       'orderInventories.inventory',
-      'orderInventories.product'
+      'orderInventories.product',
+      'orderProducts',
+      'orderProducts.product',
+      'orderProducts.product.productDetails'
     ]
   })
 
@@ -86,6 +89,11 @@ export async function completePicking(
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+
+      if (!releaseGood?.packageId) {
+        releaseGood = await sellercraftCtrl.packOrder(sellercraft, releaseGood)
+      }
+
       releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
       await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
     } else {
@@ -94,91 +102,100 @@ export async function completePicking(
         where: { orderNo: releaseGood.refNo, domain: companyDomain },
         relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
       })
-      const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-      let eTraxOption: boolean
 
-      if (marketplaceStore.isAutoUpdateShipment) {
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
-      }
+      if (marketplaceOrder) {
+        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+        let eTraxOption: boolean
 
-      if (!marketplaceOrder)
-        throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
-      eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
-
-      // if eTrax option is true
-      if (eTraxOption) {
-        const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-
-        // access every marketplaceOrderItems for shipping information you need
-        // trigger the controller from integration-lmd that trigger the API, build the parameters needed
-        // for etrax didn't support multi awb per order
-        const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping
-        const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
-          where: {
-            domain,
-            platform: 'eTrax'
-          }
-        })
-
-        //Get which transporter to use
-        const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({
-          where: { marketplaceStore: marketplaceOrder.marketplaceStore },
-          relations: ['pickupTransporter', 'deliveryTransporter']
-        })
-
-        const resp = await LastMileAPI.createShipmentRequest(lmd, {
-          orderNo: marketplaceOrder.orderNo,
-          clientId: lmd.clientId,
-          clientType: lmd.clientType,
-          clientName: lmd.clientName,
-          transporterId: marketplaceTransporter.pickupTransporter.transporterId,
-          pickupName: warehouseContactPoint.name,
-          pickupAddress1: warehouseContactPoint.address,
-          pickupAddress2: warehouseContactPoint.address2,
-          pickupPostcode: warehouseContactPoint.postCode,
-          pickupState: warehouseContactPoint.state,
-          pickupCity: warehouseContactPoint.city,
-          pickupPhone: warehouseContactPoint.phone,
-          pickupEmail: warehouseContactPoint.email,
-          name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
-          address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
-          address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
-          postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
-          city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
-          state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
-          phone: marketplaceOrderShipping.phone1 || '',
-          email: marketplaceOrderShipping.email || '',
-          attentionTo: marketplaceOrderShipping.attentionTo,
-          quantity: marketplaceOrderItems.length
-        })
-
-        const delay = (ms: number) => {
-          return new Promise(resolve => setTimeout(resolve, ms))
+        if (marketplaceStore.isAutoUpdateShipment) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
         }
 
-        if (resp.Status === 'SUCCESS') {
-          //Success
-          let awbObtained = false
-          let retry = 0
-          while (!awbObtained) {
-            const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-              where: { releaseOrderId: releaseGood.id },
-              relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
-            })
-            const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping
-            if (orderShipping?.airwayBill) {
-              awbObtained = true
+        if (!marketplaceOrder)
+          throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
+        eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
+
+        // if eTrax option is true
+        if (eTraxOption) {
+          const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+
+          // access every marketplaceOrderItems for shipping information you need
+          // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+          // for etrax didn't support multi awb per order
+          const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping
+          const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+            where: {
+              domain,
+              platform: 'eTrax'
             }
-            await delay(5000)
-            //Timeout after 15sec
-            if (++retry > 3) {
-              break
+          })
+
+          //Get which transporter to use
+          const marketplaceTransporter: MarketplaceTransporter = await tx
+            .getRepository(MarketplaceTransporter)
+            .findOne({
+              where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+              relations: ['pickupTransporter', 'deliveryTransporter']
+            })
+
+          const resp = await LastMileAPI.createShipmentRequest(lmd, {
+            orderNo: marketplaceOrder.orderNo,
+            clientId: lmd.clientId,
+            clientType: lmd.clientType,
+            clientName: lmd.clientName,
+            transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+            pickupName: warehouseContactPoint.name,
+            pickupAddress1: warehouseContactPoint.address,
+            pickupAddress2: warehouseContactPoint.address2,
+            pickupPostcode: warehouseContactPoint.postCode,
+            pickupState: warehouseContactPoint.state,
+            pickupCity: warehouseContactPoint.city,
+            pickupPhone: warehouseContactPoint.phone,
+            pickupEmail: warehouseContactPoint.email,
+            name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
+            address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
+            address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
+            postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
+            city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
+            state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
+            phone: marketplaceOrderShipping.phone1 || '',
+            email: marketplaceOrderShipping.email || '',
+            attentionTo: marketplaceOrderShipping.attentionTo,
+            quantity: marketplaceOrderItems.length
+          })
+
+          const delay = (ms: number) => {
+            return new Promise(resolve => setTimeout(resolve, ms))
+          }
+
+          if (resp.Status === 'SUCCESS') {
+            //Success
+            let awbObtained = false
+            let retry = 0
+            while (!awbObtained) {
+              const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+                where: { releaseOrderId: releaseGood.id },
+                relations: [
+                  'marketplaceStore',
+                  'marketplaceOrderItems',
+                  'marketplaceOrderItems.marketplaceOrderShipping'
+                ]
+              })
+              const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping
+              if (orderShipping?.airwayBill) {
+                awbObtained = true
+              }
+              await delay(5000)
+              //Timeout after 15sec
+              if (++retry > 3) {
+                break
+              }
             }
+          } else {
+            throw resp
+            //Failed
           }
-        } else {
-          throw resp
-          //Failed
         }
       }
     }

package/server/graphql/resolvers/worksheet/unloading/complete-unloading.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -37,7 +37,7 @@ export const completeUnloadingResolver = {
     let putawayWorksheet: Worksheet
 
     const inventories: Inventory[] = await tx.getRepository(Inventory).find({
-      where: { domain, refOrderId: arrivalNotice.id, status: INVENTORY_STATUS.UNLOADED }
+      where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
     })
 
     // search for any active marketplace connection

package/server/routes.ts

@@ -8,6 +8,7 @@ import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
 import { renderRODO } from './controllers/render-ro-do'
 import { renderSeebuuGRN } from './controllers/render-seebuu-grn'
+import { renderInvoices } from './controllers/render-invoices'
 
 process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_document_ro_do/:doNo', async (context, next) => {
@@ -49,4 +50,14 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_manifest/:manifestNo', async (context, next) => {
     context.body = await renderManifest(context.params, context)
   })
+
+  routes.post('/view_invoices/:timezoneOffSet', async (context, next) => {
+    let req = context.request.body || {}
+    let timezoneOffSet = context.params.timezoneOffSet || 0
+
+    let data = await renderInvoices({ req, timezoneOffSet }, context)
+
+    context.type = 'application/json'
+    context.body = data
+  })
 })