@things-factory/operato-mms 4.1.3 → 4.1.10

package/server/graphql/resolvers/interface-with-hub/add-release-order.ts

@@ -2,7 +2,12 @@ import { getRepository } from 'typeorm'
 
 import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
 import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '@things-factory/marketplace-base'
 import { Product, ProductBundle } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
@@ -31,7 +36,8 @@ export const addReleaseOrderResolver = {
         relations: [
           'marketplaceOrderItems',
           'marketplaceOrderItems.marketplaceProductVariation',
-          'marketplaceOrderItems.marketplaceOrderShipping',
+          'marketplaceOrderItems.marketplaceOrderShippingItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
           'marketplaceStore'
         ]
       })
@@ -39,17 +45,24 @@ export const addReleaseOrderResolver = {
       let marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
         where: { orderNoRef: marketplaceOrder.orderNo, domain },
         order: { subOrderNoRef: 'ASC' },
-        relations: ['marketplaceOrderItems']
+        relations: [
+          'marketplaceOrderShippingItems',
+          'marketplaceOrderShippingItems.marketplaceOrderItem',
+          'marketplaceOrderShippingItems.product'
+        ]
       })
 
-      for (var j = 0; j < marketplaceOrderShippings.length; j++) {
+      for (let j = 0; j < marketplaceOrderShippings.length; j++) {
         let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
+        let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+          marketplaceOrderShipping.marketplaceOrderShippingItems
 
         if (!marketplaceOrderShipping?.releaseOrderId) {
           const date: Date = new Date()
-          const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
+          const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
+            .getDate()
             .toString()
-            .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
+            .padStart(2, '0')}`
 
           const newReleaseOrder: any = {
             releaseDate,
@@ -83,21 +96,14 @@ export const addReleaseOrderResolver = {
             marketplaceOrderStatus: marketplaceOrder.status,
             airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
             invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
-            orderInventories: marketplaceOrder.marketplaceOrderItems
-              .filter(item => {
-                if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
-                  return item
-                }
-              })
-              .map((orderItem: any) => {
-                const { marketplaceProductVariation: productVariation }: any = orderItem
-                return {
-                  product: {
-                    sku: productVariation.sku
-                  },
-                  releaseQty: orderItem.qty
-                }
-              })
+            orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
+              return {
+                product: {
+                  sku: marketplaceOrderShippingItem.product.sku
+                },
+                releaseQty: marketplaceOrderShippingItem.qty
+              }
+            })
           }
 
           try {
@@ -105,6 +111,16 @@ export const addReleaseOrderResolver = {
               customerBizplaceId,
               releaseOrder: newReleaseOrder
             })
+
+            marketplaceOrderShipping.releaseOrderId = releaseOrder.id
+            marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
+            await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
+
+            if (releaseOrder && releaseOrder?.id) {
+              marketplaceOrder.releaseOrderId = releaseOrder.id
+              marketplaceOrder.fulfillmentCenter = fulfilmentCenter
+              await getRepository(MarketplaceOrder).save(marketplaceOrder)
+            }
           } catch (e) {}
 
           var invoiceProducts = await Promise.all(
@@ -119,10 +135,12 @@ export const addReleaseOrderResolver = {
                 })
               }
 
-              let moi: MarketplaceOrderItem = marketplaceOrder.marketplaceOrderItems.find(
-                moi => moi.marketplaceProductVariation.sku === product.sku
+              let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
+                mosi => mosi.product.sku === product.sku
               )
 
+              let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
+
               return {
                 sku: product.sku,
                 name: product.name,
@@ -135,10 +153,6 @@ export const addReleaseOrderResolver = {
             })
           )
 
-          marketplaceOrderShipping.releaseOrderId = releaseOrder.id
-          marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
-          await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
-
           let newInvoice = {
             invoiceProducts,
             releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -188,12 +202,6 @@ export const addReleaseOrderResolver = {
           } catch (e) {}
         }
       }
-
-      if (releaseOrder && releaseOrder?.id) {
-        marketplaceOrder.releaseOrderId = releaseOrder.id
-        marketplaceOrder.fulfillmentCenter = fulfilmentCenter
-        await getRepository(MarketplaceOrder).save(marketplaceOrder)
-      }
     }
   }
 }

package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts

@@ -2,7 +2,12 @@ import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
 import { FulfillmentAPI } from '@things-factory/integration-fulfillment'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '@things-factory/marketplace-base'
 import { Product, ProductBundle } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
@@ -13,7 +18,8 @@ export const autoAddReleaseOrderResolver = {
     const qb: SelectQueryBuilder<MarketplaceOrder> = createQueryBuilder(MarketplaceOrder, 'MO')
     const marketplaceOrders: MarketplaceOrder[] = await qb
       .leftJoinAndSelect('MO.marketplaceOrderItems', 'MOI')
-      .leftJoinAndSelect('MOI.marketplaceOrderShipping', 'MOS')
+      .leftJoinAndSelect('MOI.marketplaceOrderShippingItems', 'MOSI')
+      .leftJoinAndSelect('MOSI.marketplaceOrderShipping', 'MOS')
       .leftJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
       .leftJoinAndSelect('MO.marketplaceStore', 'MPS')
       .where('MO.domain = :domainId', { domainId: domain.id })
@@ -38,17 +44,25 @@ export const autoAddReleaseOrderResolver = {
 
       const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
         where: { orderNoRef: marketplaceOrder.orderNo, domain },
-        order: { subOrderNoRef: 'ASC' }
+        order: { subOrderNoRef: 'ASC' },
+        relations: [
+          'marketplaceOrderShippingItems',
+          'marketplaceOrderShippingItems.marketplaceOrderItem',
+          'marketplaceOrderShippingItems.product'
+        ]
       })
 
-      for (var j = 0; j < marketplaceOrderShippings.length; j++) {
+      for (let j = 0; j < marketplaceOrderShippings.length; j++) {
         let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
+        let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+          marketplaceOrderShipping.marketplaceOrderShippingItems
 
         if (!marketplaceOrderShipping?.releaseOrderId) {
           const date: Date = new Date()
-          const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
+          const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
+            .getDate()
             .toString()
-            .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
+            .padStart(2, '0')}`
 
           const newReleaseOrder: any = {
             releaseDate,
@@ -82,21 +96,14 @@ export const autoAddReleaseOrderResolver = {
             marketplaceOrderStatus: marketplaceOrder.status,
             airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
             invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
-            orderInventories: marketplaceOrder.marketplaceOrderItems
-              .filter(item => {
-                if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
-                  return item
-                }
-              })
-              .map((orderItem: any) => {
-                const { marketplaceProductVariation: productVariation }: any = orderItem
-                return {
-                  product: {
-                    sku: productVariation.sku
-                  },
-                  releaseQty: orderItem.qty
-                }
-              })
+            orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
+              return {
+                product: {
+                  sku: marketplaceOrderShippingItem.product.sku
+                },
+                releaseQty: marketplaceOrderShippingItem.qty
+              }
+            })
           }
 
           try {
@@ -104,6 +111,16 @@ export const autoAddReleaseOrderResolver = {
               customerBizplaceId,
               releaseOrder: newReleaseOrder
             })
+
+            marketplaceOrderShipping.releaseOrderId = releaseOrder.id
+            marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
+            await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
+
+            if (releaseOrder && releaseOrder?.id) {
+              marketplaceOrder.releaseOrderId = releaseOrder.id
+              marketplaceOrder.fulfillmentCenter = fulfilmentCenter
+              await getRepository(MarketplaceOrder).save(marketplaceOrder)
+            }
           } catch (e) {}
 
           var invoiceProducts = await Promise.all(
@@ -118,10 +135,12 @@ export const autoAddReleaseOrderResolver = {
                 })
               }
 
-              let moi: MarketplaceOrderItem = marketplaceOrder.marketplaceOrderItems.find(
-                moi => moi.marketplaceProductVariation.sku === product.sku
+              let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
+                mosi => mosi.product.sku === product.sku
               )
 
+              let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
+
               return {
                 sku: product.sku,
                 name: product.name,
@@ -134,10 +153,6 @@ export const autoAddReleaseOrderResolver = {
             })
           )
 
-          marketplaceOrderShipping.releaseOrderId = releaseOrder.id
-          marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
-          await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
-
           let newInvoice = {
             invoiceProducts,
             releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -187,12 +202,6 @@ export const autoAddReleaseOrderResolver = {
           } catch (e) {}
         }
       }
-
-      if (releaseOrder && releaseOrder?.id) {
-        marketplaceOrder.releaseOrderId = releaseOrder.id
-        marketplaceOrder.fulfillmentCenter = fulfilmentCenter
-        await getRepository(MarketplaceOrder).save(marketplaceOrder)
-      }
     }
   }
 }

package/server/routers/etrax-router.ts

@@ -5,7 +5,12 @@ import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
 import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { Etrax, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter, StoreAPI } from '@things-factory/integration-marketplace'
-import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+import {
+  MarketplaceOrder,
+  MarketplaceOrderItem,
+  MarketplaceOrderShipping,
+  MarketplaceOrderShippingItem
+} from '@things-factory/marketplace-base'
 import { Domain } from '@things-factory/shell'
 
 const debug = require('debug')('things-factory:jest.config')
@@ -70,15 +75,17 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
         'domain',
         'marketplaceStore',
         'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShipping',
-        'marketplaceOrderItems.marketplaceOrderShipping.fulfillmentCenter'
+        'marketplaceOrderItems.marketplaceOrderShippingItems',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
       ]
     })
     let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
 
     for (const orderItem of orderItems) {
-      if (orderItem.marketplaceOrderShipping !== null) {
-        const orderShipping: MarketplaceOrderShipping = orderItem.marketplaceOrderShipping
+      if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
+        const orderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
+        const orderShipping: MarketplaceOrderShipping = orderShippingItems[0].marketplaceOrderShipping
         const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
         const marketplaceStore: MarketplaceStore = order.marketplaceStore
 
@@ -119,9 +126,28 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
     const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
 
     // to-do update tracking no to every marketplaces
-    if (marketplaceStore.platform === 'woocommerce') {
+    if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
       const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
-      await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note })
+      let orderInfo: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
+        where: {
+          name: order.name
+        },
+        relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
+      })
+      const result = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
+        orderId: order.name,
+        trackingUrl: note,
+        trackingNo,
+        order: orderInfo,
+        note
+      })
+
+      if (marketplaceStore.platform === 'woocommerce') {
+        await StoreAPI.updateOrderStatus(marketplaceStore, {
+          orderId: order.name,
+          status: 'READY_TO_SHIP'
+        })
+      }
     }
 
     const resp = {

package/translations/en.json

@@ -144,6 +144,7 @@
   "field.total_weight": "total weight",
   "field.town": "town",
   "field.tracking_no": "tracking no",
+  "field.tracking_url": "tracking URL",
   "field.type": "type",
   "field.unit": "unit",
   "field.uom_value": "UOM value",

package/translations/ko.json

@@ -143,6 +143,7 @@
   "field.total_weight": "[ko] total weight",
   "field.town": "[ko] town",
   "field.tracking_no": "[ko] tracking no",
+  "field.tracking_url": "[ko] tracking URL",
   "field.type": "[ko] type",
   "field.unit": "[ko] unit",
   "field.uom_value": "[ko] UOM value",

package/translations/ms.json

@@ -143,6 +143,7 @@
   "field.total_weight": "[ms] total weight",
   "field.town": "[ms] town",
   "field.tracking_no": "[ms] tracking no",
+  "field.tracking_url": "[ms] tracking URL",
   "field.type": "[ms] type",
   "field.unit": "[ms] unit",
   "field.uom_value": "[ms] UOM value",

package/translations/zh.json

@@ -143,6 +143,7 @@
   "field.total_weight": "[zh] total weight",
   "field.town": "[zh] town",
   "field.tracking_no": "[zh] tracking no",
+  "field.tracking_url": "[zh] tracking URL",
   "field.type": "[zh] type",
   "field.unit": "[zh] unit",
   "field.uom_value": "[zh] UOM value",