@things-factory/operato-mms 5.0.0-alpha.5 → 5.0.0-alpha.50

package/server/routers/etrax-router.ts

@@ -77,17 +77,24 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
         'marketplaceOrderItems',
         'marketplaceOrderItems.marketplaceOrderShippingItems',
         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
-        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
+        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter',
+        'marketplaceOrderItems.marketplaceProductVariation',
       ]
     })
     let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
 
+    const marketplaceStore: MarketplaceStore = order.marketplaceStore
+
+    const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
+      where: { marketplaceStore },
+      relations: ['pickupTransporter']
+    })
+
     for (const orderItem of orderItems) {
       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
 
         const currentDate: Date = new Date()
 
@@ -98,11 +105,6 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
           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,
@@ -117,14 +119,11 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
 
         await orderShippingRepo.update(
           { id: orderShipping.id },
-          { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate }
+          { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: marketplaceTransporter?.pickupTransporter.name || orderShipping.transporter }
         )
       }
     }
 
-    const storeId = order.marketplaceStore.id
-    const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
-
     // to-do update tracking no to every marketplaces
     if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
       const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
@@ -139,17 +138,45 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
         trackingUrl: note,
         trackingNo,
         order: orderInfo,
-        note
+        note,
+        transporter: marketplaceTransporter?.pickupTransporter.name
       })
 
       if (marketplaceStore.platform === 'woocommerce') {
         await StoreAPI.updateOrderStatus(marketplaceStore, {
           orderId: order.name,
-          status: 'READY_TO_SHIP'
+          status: 'DELIVERED'
         })
       }
     }
 
+    try {
+      const updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId: order.name })
+  
+      order.status = updatedOrder.status
+      order.orderUpdatedAt = updatedOrder.orderUpdatedAt
+      order.trackingNo = updatedOrder.trackingNo
+      order.shippingProvider = updatedOrder.shippingProvider
+      await getRepository(MarketplaceOrder).save(order)
+  
+      for (let idx = 0; idx < order.marketplaceOrderItems.length; idx++) {
+        let matchItem = updatedOrder.orderItems.find(
+          i => i.variationId == order.marketplaceOrderItems[idx].marketplaceProductVariation.variationId
+        )
+  
+        if (matchItem) {
+          let targetMarketplaceOrderItem = {
+            ...order.marketplaceOrderItems[idx],
+            shippingProvider: matchItem.shippingProvider,
+            trackingCode: matchItem.trackingNo,
+            status: matchItem.status
+          }
+  
+          await getRepository(MarketplaceOrderItem).save(targetMarketplaceOrderItem)
+        }
+      }
+    } catch(e) {}
+
     const resp = {
       Status: 'SUCCESS',
       Code: 200,

package/translations/en.json

@@ -114,6 +114,7 @@
   "field.required_branch": "required branch",
   "field.required_sender": "required sender",
   "field.required_tracking": "required tracking",
+  "field.reserve_enabled": "reserve enabled",
   "field.reserve_qty": "reserve qty",
   "field.ro_created": "ro created",
   "field.save": "save",
@@ -145,6 +146,7 @@
   "field.town": "town",
   "field.tracking_no": "tracking no",
   "field.tracking_url": "tracking URL",
+  "field.transporter": "transporter",
   "field.type": "type",
   "field.unit": "unit",
   "field.uom_value": "UOM value",

package/translations/ko.json

@@ -1,16 +1,16 @@
 {
-  "field.variation_id": "[ko] variation ID",
-  "field.voucher_amt": "[ko] voucher amount",
+  "field.variation_id": "변수 ID",
+  "field.voucher_amt": "바우처 금액",
   "field.shipping_rebate": "[ko] shipping rebate",
-  "field.shipping_mode": "[ko] shipping mode",
+  "field.shipping_mode": "선적 모드",
   "field.service_fee": "[ko] service fee",
   "field.transaction_fee": "[ko] transaction fee",
   "field.total_released_amt": "[ko] total release amount",
-  "field.voucher_code": "[ko] voucher code",
+  "field.voucher_code": "바우처 코드",
   "field.comission_fee": "[ko] comission fee",
-  "field.fulfilment_center": "[ko] fulfilment center",
-  "button.add_product": "[ko] add product",
-  "button.add": "[ko] add",
+  "field.fulfilment_center": "풀필먼트센터",
+  "button.add_product": "상품 추가",
+  "button.add": "추가",
   "button.airway_bill": "[ko] airway bill",
   "button.auto_link": "[ko] auto link",
   "button.back": "[ko] back",
@@ -45,15 +45,15 @@
   "field.address_id": "[ko] address id",
   "field.assigned_warehouse_sku": "[ko] assigned warehouse sku",
   "field.auto_shipping_fee_subsidy_by_lazada": "[ko] auto shipping fee subsidy (by lazada)",
-  "field.available_to_purchase": "[ko] available to purchase",
-  "field.available": "[ko] available",
+  "field.available_to_purchase": "구매 가능",
+  "field.available": "가능",
   "field.batch_id": "[ko] batch no",
   "field.branch_id": "[ko] branch id",
   "field.branch": "[ko] branch",
-  "field.buyer_username": "[ko] buyer username",
-  "field.channel_sku": "[ko] channel sku",
-  "field.city": "[ko] city",
-  "field.country": "[ko] country",
+  "field.buyer_username": "구매자 이름",
+  "field.channel_sku": "채널 SKU",
+  "field.city": "도시",
+  "field.country": "국가",
   "field.commission_fee": "[ko] commission fee",
   "field.criteria": "[ko] criteria",
   "field.date": "[ko] date",
@@ -69,7 +69,7 @@
   "field.is_splitted": "[ko] splitted",
   "field.item_count": "[ko] item count",
   "field.item_price_credit": "[ko] item price credit",
-  "field.item": "[ko] item",
+  "field.item": "항목",
   "field.last_updated": "[ko] last updated",
   "field.lazada_bonus": "[ko] lazada bonus",
   "field.lazada_bonus_lzd_cofund": "[ko] lazada bonus - LZD co-fund",
@@ -114,6 +114,7 @@
   "field.required_branch": "[ko] required branch",
   "field.required_sender": "[ko] required sender",
   "field.required_tracking": "[ko] required tracking",
+  "field.reserve_enabled": "[ko] reserve enabled",
   "field.reserve_qty": "[ko] reserve qty",
   "field.ro_created": "[ko] ro created",
   "field.save": "[ko] save",
@@ -144,6 +145,7 @@
   "field.town": "[ko] town",
   "field.tracking_no": "[ko] tracking no",
   "field.tracking_url": "[ko] tracking URL",
+  "field.transporter": "[ko] transporter",
   "field.type": "[ko] type",
   "field.unit": "[ko] unit",
   "field.uom_value": "[ko] UOM value",
@@ -358,8 +360,8 @@
   "title.stock_replenishment_detail": "[ko] stock replenishment detail",
   "title.stock_replenishment_list": "[ko] stock replenishment list",
   "title.stock_replenishment": "[ko] stock replenishment",
-  "title.sync_marketplace_order": "[ko] sync marketplace order",
-  "title.uploaded_images": "[ko] uploaded images",
-  "title.vas": "[ko] vas",
-  "title.warehouse_products": "[ko] warehouse products"
-}
+  "title.sync_marketplace_order": "마켓플레이스 주문 동기화",
+  "title.uploaded_images": "업로드된 이미지",
+  "title.vas": "VAS",
+  "title.warehouse_products": "창고 상품"
+}

package/translations/ms.json

@@ -114,6 +114,7 @@
   "field.required_branch": "[ms] required branch",
   "field.required_sender": "[ms] required sender",
   "field.required_tracking": "[ms] required tracking",
+  "field.reserve_enabled": "[ms] reserve enabled",
   "field.reserve_qty": "[ms] reserve qty",
   "field.ro_created": "[ms] ro created",
   "field.save": "[ms] save",
@@ -144,6 +145,7 @@
   "field.town": "[ms] town",
   "field.tracking_no": "[ms] tracking no",
   "field.tracking_url": "[ms] tracking URL",
+  "field.transporter": "[ms] transporter",
   "field.type": "[ms] type",
   "field.unit": "[ms] unit",
   "field.uom_value": "[ms] UOM value",

package/translations/zh.json

@@ -114,6 +114,7 @@
   "field.required_branch": "[zh] required branch",
   "field.required_sender": "[zh] required sender",
   "field.required_tracking": "[zh] required tracking",
+  "field.reserve_enabled": "[zh] reserve enabled",
   "field.reserve_qty": "[zh] reserve qty",
   "field.ro_created": "[zh] ro created",
   "field.save": "[zh] save",
@@ -144,6 +145,7 @@
   "field.town": "[zh] town",
   "field.tracking_no": "[zh] tracking no",
   "field.tracking_url": "[zh] tracking URL",
+  "field.transporter": "[zh] transporter",
   "field.type": "[zh] type",
   "field.unit": "[zh] unit",
   "field.uom_value": "[zh] UOM value",

package/config.development.js

@@ -1,88 +0,0 @@
-module.exports = {
-  domainType: 'company',
-  ormconfig: {
-    name: 'default',
-    type: 'sqlite',
-    database: 'db.sqlite',
-    synchronize: false,
-    logging: true,
-    logger: 'debug'
-    // name: 'default',
-    // type: 'postgres',
-    // database: 'postgres',
-    // username: 'postgres',
-    // password: 'abcd1234',
-    // host: 'localhost',
-    // port: 15432,
-    // synchronize: true,
-    // logging: true
-  },
-  oauth2: {
-    platforms: [
-      {
-        name: 'Operato Hub',
-        apiURL: 'http://operato-m.localhost:3000/api'
-      }
-    ]
-  },
-  useVirtualHostBasedDomain: false,
-  port: 5000,
-  uploads: 'uploads',
-  attachmentsPath: 'attachments',
-  SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
-  logger: {
-    file: {
-      filename: 'logs/application-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      zippedArchive: true,
-      maxSize: '200m',
-      maxFiles: '1m',
-      level: 'info'
-    }
-  },
-  fulfillmentIntegrationOperato: {
-    host: 'operatohub.com',
-    platform: 'operato',
-    application: 'Operato MMS',
-    appKey: '480d19cbfb0655357878119559d47333',
-    appSecret: 'dc5078bc17d50a18ef6fc3188934bbbd',
-    callback: 'https://www.myoperato.com/callback-operato'
-  },
-  marketplaceIntegrationShopee: {
-    platform: 'shopee',
-    isUAT: false,
-    application: 'Operato MMS',
-    partnerId: 846025,
-    partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
-  },
-  marketplaceIntegrationLazada: {
-    platform: 'lazada',
-    application: 'operato-mms',
-    appKey: '120961',
-    appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
-    callback: 'https://myoperato.com/lazada-callback'
-  },
-  notification: {
-    fcm: {
-      serviceAccount: {
-        project_id: 'operato',
-        private_key:
-          '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
-        client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
-      },
-      appConfig: {
-        apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
-        projectId: 'operato',
-        messagingSenderId: 79537064975,
-        appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
-      },
-      serverKey:
-        'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
-    },
-    vapidKey: {
-      subject: 'mailto:heartyoh@hatiolab.com',
-      publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
-      privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
-    }
-  }
-}