@things-factory/operato-mms 4.1.2 → 4.1.8

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",