@things-factory/operato-mms 3.8.27 → 3.8.28

package/server/routers/etrax-router.ts

@@ -1,17 +1,17 @@
 import Router from 'koa-router'
 import { getRepository } from 'typeorm'
 
+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, StoreAPI } from '@things-factory/integration-marketplace'
+import { MarketplaceStore, MarketplaceTransporter, StoreAPI } from '@things-factory/integration-marketplace'
 import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
-
-//import { MarketplaceOrder, MarketplaceOrderShipping, MarketplaceOrderItem } from "@things-factory/marketplace-base"
+import { Domain } from '@things-factory/shell'
 
 const debug = require('debug')('things-factory:jest.config')
 export const etraxRouter = new Router()
 
 etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
-  const { domain, user } = context.state
   const repo = getRepository(LastMileDelivery)
   const requestBody = context.request.body
   debug('etrax_status_update/context: ', context)
@@ -22,7 +22,6 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
   const extOrderNo = requestBody.ExtOrderNo
   const trackingNo = requestBody.TrackingNo
   const status = requestBody.Status
-  const trackingDate = requestBody.TrackingDate //yyyyMMddHHmmss
   const awbUrl = requestBody.AWBurl
 
   const customerCode = bodySourceID
@@ -63,19 +62,52 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
   if (status === 'TAS') {
     //Update DB if Validate Success
     const orderRepo = getRepository(MarketplaceOrder)
-    const orderItemRepo = getRepository(MarketplaceOrderItem)
     const orderShippingRepo = getRepository(MarketplaceOrderShipping)
 
     let order: MarketplaceOrder = await orderRepo.findOne({
       where: { orderNo: extOrderNo },
-      relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
+      relations: [
+        'domain',
+        'marketplaceStore',
+        'marketplaceOrderItems',
+        'marketplaceOrderItems.marketplaceOrderShipping',
+        'marketplaceOrderItems.marketplaceOrderShipping.fulfillmentCenter'
+      ]
     })
     let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
 
     for (const orderItem of orderItems) {
       if (orderItem.marketplaceOrderShipping !== null) {
-        const orderShipping = orderItem.marketplaceOrderShipping
+        const orderShipping: MarketplaceOrderShipping = orderItem.marketplaceOrderShipping
+        const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
+        const marketplaceStore: MarketplaceStore = order.marketplaceStore
+
         const currentDate: Date = new Date()
+
+        const centerId: string = fulfillmentCenter.centerId
+        const warehouseDomain: Domain = await getRepository(Domain).findOne({ where: { subdomain: centerId } })
+        const customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
+        const customerBizplaceId: string = customerBizplaces.find(
+          customerBizplace => customerBizplace.company.domain.id == order?.domain.id
+        ).id
+
+        const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
+          where: { marketplaceStore },
+          relations: ['pickupTransporter']
+        })
+
+        let patch = {
+          id: orderShipping.releaseOrderId,
+          trackingNo: trackingNo,
+          transporter: marketplaceTransporter?.pickupTransporter.name
+        }
+
+        FulfillmentAPI.updateReleaseGoodDetails(fulfillmentCenter, {
+          customerBizplaceId,
+          releaseOrder: { ...patch },
+          shippingOrder: null
+        })
+
         await orderShippingRepo.update(
           { id: orderShipping.id },
           { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate }
@@ -89,7 +121,7 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
     // to-do update tracking no to every marketplaces
     if (marketplaceStore.platform === 'woocommerce') {
       const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
-      const orderNote = await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note })
+      await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note })
     }
 
     const resp = {
@@ -102,8 +134,5 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
     }
     context.type = 'application/json'
     context.body = JSON.stringify(resp)
-    //let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
-    //await orderItemRepo.save(orderItem)
-    //await orderShippingRepo.save(orderShipping)
   }
 })

package/translations/en.json

@@ -1,11 +1,11 @@
 {
-  "field.variation_id": "variation id",
-  "field.voucher_amt": "voucher amt",
+  "field.variation_id": "variation ID",
+  "field.voucher_amt": "voucher amount",
   "field.shipping_rebate": "shipping rebate",
   "field.shipping_mode": "shipping mode",
   "field.service_fee": "service fee",
   "field.transaction_fee": "transaction fee",
-  "field.total_released_amt": "total release amt",
+  "field.total_released_amt": "total release amount",
   "field.voucher_code": "voucher code",
   "field.comission_fee": "comission fee",
   "field.fulfilment_center": "fulfilment center",
@@ -62,7 +62,7 @@
   "field.ending_on": "ending on",
   "field.eta_date": "eta date",
   "field.from_date": "from date",
-  "field.fulfillment_partner": "fulfillment partner",
+  "field.fulfillment_partner": "fulfilment partner",
   "field.grand_total": "grand total",
   "field.import_cargo": "import cargo",
   "field.isku": "ISKU",
@@ -92,7 +92,7 @@
   "field.packing_type": "packing type",
   "field.paid_price": "paid price",
   "field.pallet_qty": "pallet qty",
-  "field.pay_time": "pay time",
+  "field.payout_date": "payout date",
   "field.payment_fee": "payment fee",
   "field.pickup_date": "pickup date",
   "field.pickup_time_id": "pickup time id",
@@ -127,7 +127,7 @@
   "field.shipping_fee": "shipping fee",
   "field.shipping_provider": "shipping provider",
   "field.sku_name": "sku name",
-  "field.sku": "sku",
+  "field.sku": "SKU",
   "field.sold_stock": "sold stock",
   "field.started_on": "started on",
   "field.starting_on": "starting on",

package/translations/ko.json

@@ -1,11 +1,11 @@
 {
-  "field.variation_id": "[ko] variation id",
-  "field.voucher_amt": "[ko] voucher amt",
+  "field.variation_id": "[ko] variation ID",
+  "field.voucher_amt": "[ko] voucher amount",
   "field.shipping_rebate": "[ko] shipping rebate",
   "field.shipping_mode": "[ko] shipping mode",
   "field.service_fee": "[ko] service fee",
   "field.transaction_fee": "[ko] transaction fee",
-  "field.total_released_amt": "[ko] total release amt",
+  "field.total_released_amt": "[ko] total release amount",
   "field.voucher_code": "[ko] voucher code",
   "field.comission_fee": "[ko] comission fee",
   "field.fulfilment_center": "[ko] fulfilment center",
@@ -62,7 +62,7 @@
   "field.ending_on": "[ko] ending on",
   "field.eta_date": "[ko] eta date",
   "field.from_date": "[ko] from date",
-  "field.fulfillment_partner": "[ko] fulfillment partner",
+  "field.fulfillment_partner": "[ko] fulfilment partner",
   "field.grand_total": "[ko] grand total",
   "field.import_cargo": "[ko] import cargo",
   "field.isku": "[ko] ISKU",
@@ -92,7 +92,7 @@
   "field.packing_type": "[ko] packing type",
   "field.paid_price": "[ko] paid price",
   "field.pallet_qty": "[ko] pallet qty",
-  "field.pay_time": "[ko] pay time",
+  "field.payout_date": "[ko] payout date",
   "field.payment_fee": "[ko] payment fee",
   "field.pickup_date": "[ko] pickup date",
   "field.pickup_time_id": "[ko] pickup time id",
@@ -127,7 +127,7 @@
   "field.shipping_fee": "[ko] shipping fee",
   "field.shipping_provider": "[ko] shipping provider",
   "field.sku_name": "[ko] sku name",
-  "field.sku": "[ko] sku",
+  "field.sku": "[ko] SKU",
   "field.sold_stock": "[ko] sold stock",
   "field.started_on": "[ko] started on",
   "field.starting_on": "[ko] starting on",

package/translations/ms.json

@@ -1,11 +1,11 @@
 {
-  "field.variation_id": "[ms] variation id",
-  "field.voucher_amt": "[ms] voucher amt",
+  "field.variation_id": "[ms] variation ID",
+  "field.voucher_amt": "[ms] voucher amount",
   "field.shipping_rebate": "[ms] shipping rebate",
   "field.shipping_mode": "[ms] shipping mode",
   "field.service_fee": "[ms] service fee",
   "field.transaction_fee": "[ms] transaction fee",
-  "field.total_released_amt": "[ms] total release amt",
+  "field.total_released_amt": "[ms] total release amount",
   "field.voucher_code": "[ms] voucher code",
   "field.comission_fee": "[ms] comission fee",
   "field.fulfilment_center": "[ms] fulfilment center",
@@ -62,7 +62,7 @@
   "field.ending_on": "[ms] ending on",
   "field.eta_date": "[ms] eta date",
   "field.from_date": "[ms] from date",
-  "field.fulfillment_partner": "[ms] fulfillment partner",
+  "field.fulfillment_partner": "[ms] fulfilment partner",
   "field.grand_total": "[ms] grand total",
   "field.import_cargo": "[ms] import cargo",
   "field.isku": "[ms] ISKU",
@@ -92,7 +92,7 @@
   "field.packing_type": "[ms] packing type",
   "field.paid_price": "[ms] paid price",
   "field.pallet_qty": "[ms] pallet qty",
-  "field.pay_time": "[ms] pay time",
+  "field.payout_date": "[ms] payout date",
   "field.payment_fee": "[ms] payment fee",
   "field.pickup_date": "[ms] pickup date",
   "field.pickup_time_id": "[ms] pickup time id",
@@ -127,7 +127,7 @@
   "field.shipping_fee": "[ms] shipping fee",
   "field.shipping_provider": "[ms] shipping provider",
   "field.sku_name": "[ms] sku name",
-  "field.sku": "[ms] sku",
+  "field.sku": "[ms] SKU",
   "field.sold_stock": "[ms] sold stock",
   "field.started_on": "[ms] started on",
   "field.starting_on": "[ms] starting on",

package/translations/zh.json

@@ -1,11 +1,11 @@
 {
-  "field.variation_id": "[zh] variation id",
-  "field.voucher_amt": "[zh] voucher amt",
+  "field.variation_id": "[zh] variation ID",
+  "field.voucher_amt": "[zh] voucher amount",
   "field.shipping_rebate": "[zh] shipping rebate",
   "field.shipping_mode": "[zh] shipping mode",
   "field.service_fee": "[zh] service fee",
   "field.transaction_fee": "[zh] transaction fee",
-  "field.total_released_amt": "[zh] total release amt",
+  "field.total_released_amt": "[zh] total release amount",
   "field.voucher_code": "[zh] voucher code",
   "field.comission_fee": "[zh] comission fee",
   "field.fulfilment_center": "[zh] fulfilment center",
@@ -62,7 +62,7 @@
   "field.ending_on": "[zh] ending on",
   "field.eta_date": "[zh] eta date",
   "field.from_date": "[zh] from date",
-  "field.fulfillment_partner": "[zh] fulfillment partner",
+  "field.fulfillment_partner": "[zh] fulfilment partner",
   "field.grand_total": "[zh] grand total",
   "field.import_cargo": "[zh] import cargo",
   "field.isku": "[zh] ISKU",
@@ -92,7 +92,7 @@
   "field.packing_type": "[zh] packing type",
   "field.paid_price": "[zh] paid price",
   "field.pallet_qty": "[zh] pallet qty",
-  "field.pay_time": "[zh] pay time",
+  "field.payout_date": "[zh] payout date",
   "field.payment_fee": "[zh] payment fee",
   "field.pickup_date": "[zh] pickup date",
   "field.pickup_time_id": "[zh] pickup time id",
@@ -127,7 +127,7 @@
   "field.shipping_fee": "[zh] shipping fee",
   "field.shipping_provider": "[zh] shipping provider",
   "field.sku_name": "[zh] sku name",
-  "field.sku": "[zh] sku",
+  "field.sku": "[zh] SKU",
   "field.sold_stock": "[zh] sold stock",
   "field.started_on": "[zh] started on",
   "field.starting_on": "[zh] starting on",