@things-factory/integration-marketplace 3.7.8 → 3.8.3

package/dist-server/controllers/woocommerce/apis/update-store-product-variation-stock.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-store-product-variation-stock.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/update-store-product-variation-stock.ts"],"names":[],"mappings":";AAAA,0FAA0F;AAC1F,0DAA0D;;;AAE1D,SAAgB,gCAAgC,CAAC,GAAG;IAClD,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,6CAA6C;QACnD,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAE/C,OAAO;gBACL,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC1E,OAAO,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE;aACrD,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAC,KAAK,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC;AAhBD,4EAgBC"}
+{"version":3,"file":"update-store-product-variation-stock.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/update-store-product-variation-stock.ts"],"names":[],"mappings":";AAAA,oGAAoG;AACpG,0DAA0D;;;AAE1D,SAAgB,gCAAgC,CAAC,GAAG;IAClD,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,6CAA6C;QACnD,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAE5C,OAAO;gBACL,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE;gBAC1E,OAAO,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE;aACrD,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AAhBD,4EAgBC"}

package/dist-server/controllers/woocommerce/woocommerce.js

@@ -16,11 +16,11 @@ class Woocommerce {
      * X-WP-Total is to get the total items from the response
      */
     async get(path, data) {
-        const { consumer_key, consumer_secret, storeURL } = this.config;
+        const { consumer_key, consumer_secret, storeURL, queryStringAuth } = this.config;
         const qs = Object.entries(data)
             .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
             .join('&');
-        const endpoint = `${storeURL}/wp-json/wc/v3${path}?consumer_key=${consumer_key}&consumer_secret=${consumer_secret}${qs ? '&' + qs : ''}`;
+        const endpoint = `${storeURL}/wp-json/wc/v3${path}?consumer_key=${consumer_key}&consumer_secret=${consumer_secret}&query_string_auth=${queryStringAuth}&${qs ? '&' + qs : ''}`;
         debug('endpoint', endpoint);
         const response = await (0, node_fetch_1.default)(endpoint, {
             headers: {

package/dist-server/controllers/woocommerce/woocommerce.js.map

@@ -1 +1 @@
-{"version":3,"file":"woocommerce.js","sourceRoot":"","sources":["../../../server/controllers/woocommerce/woocommerce.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"woocommerce.js","sourceRoot":"","sources":["../../../server/controllers/woocommerce/woocommerce.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-marketplace",
-  "version": "3.7.8",
+  "version": "3.8.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,19 +25,19 @@
     "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^3.7.5",
-    "@things-factory/auth-ui": "^3.7.7",
-    "@things-factory/biz-base": "^3.7.5",
-    "@things-factory/code-ui": "^3.7.5",
-    "@things-factory/context-ui": "^3.7.5",
+    "@things-factory/apptool-ui": "^3.8.0",
+    "@things-factory/auth-ui": "^3.8.0",
+    "@things-factory/biz-base": "^3.8.0",
+    "@things-factory/code-ui": "^3.8.0",
+    "@things-factory/context-ui": "^3.8.0",
     "@things-factory/grist-ui": "^3.7.5",
-    "@things-factory/i18n-ui": "^3.7.5",
-    "@things-factory/integration-lmd": "^3.7.7",
-    "@things-factory/integration-ui": "^3.7.5",
-    "@things-factory/more-ui": "^3.7.5",
-    "@things-factory/resource-ui": "^3.7.7",
-    "@things-factory/setting-ui": "^3.7.5",
-    "@things-factory/system-ui": "^3.7.5",
+    "@things-factory/i18n-ui": "^3.8.0",
+    "@things-factory/integration-lmd": "^3.8.0",
+    "@things-factory/integration-ui": "^3.8.0",
+    "@things-factory/more-ui": "^3.8.0",
+    "@things-factory/resource-ui": "^3.8.0",
+    "@things-factory/setting-ui": "^3.8.0",
+    "@things-factory/system-ui": "^3.8.0",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0",
     "querystring": "^0.2.1"
@@ -53,5 +53,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "264acd6ab6f5ded869cbb2fd5cab190167f0739b"
+  "gitHead": "b1c118ec9834b1cb4ccf9e85b70623250a8f6745"
 }

package/server/controllers/lazada/apis/get-store-order-item-transaction-details.ts

@@ -0,0 +1,65 @@
+/* https://open.lazada.com/doc/api.htm?spm=a2o9m.11193531.0.0.4f406bbetGwYgx#/api?cid=9&path=/finance/transaction/details/get */
+
+export function getStoreOrderItemTransactionDetails() {
+  return {
+    method: 'get',
+    path: '/finance/transaction/details/get',
+    denormalize(req) {
+      var { orderItemId, orderCreatedAt } = req
+      let startDate = new Date(orderCreatedAt)
+      let endDate = new Date(orderCreatedAt)
+      endDate.setDate(endDate.getDate() + 14)
+      let currentDate = new Date()
+      if (endDate > currentDate) {
+        endDate = currentDate
+      }
+
+      return {
+        start_time: startDate.toISOString().replace(/T.*/, '').split('-').join('-'),
+        end_time: endDate.toISOString().replace(/T.*/, '').split('-').join('-'),
+        trade_order_line_id: orderItemId
+      }
+    },
+    normalize(res) {
+      let payment_fee = 0
+      let commission_fee = 0
+      let promotional_charges = 0
+      let shipping_fee_paid_by_customer = 0
+      let item_price_credit = 0
+      let orders_marketplace_fees_total = 0
+      let orders_sales_total = 0
+      let orders_marketing_fees_total = 0
+      let orders_logistics_total = 0
+      let promotional_charges_flexi_combo = 0
+      let auto_shipping_subsidy_marketplace = 0
+
+      res.forEach(item => {
+        if (item.fee_name == 'Payment Fee') { payment_fee += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Commission') { commission_fee += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Item Price Credit') { item_price_credit += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Promotional Charges Vouchers') { promotional_charges += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Shipping Fee (Paid By Customer)') { shipping_fee_paid_by_customer += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Promotional Charges Flexi-Combo') { promotional_charges_flexi_combo += parseFloat(item.amount) || 0 }
+        if (item.fee_name == 'Auto. Shipping fee subsidy (by Lazada)') { auto_shipping_subsidy_marketplace += parseFloat(item.amount) || 0 }
+
+        if (item.transaction_type == 'Orders-Lazada Fees') { orders_marketplace_fees_total += parseFloat(item.amount) || 0 }
+        if (item.transaction_type == 'Orders-Sales') { orders_sales_total += parseFloat(item.amount) || 0 }
+        if (item.transaction_type == 'Orders-Marketing Fees') { orders_marketing_fees_total += parseFloat(item.amount) || 0 }
+        if (item.transaction_type == 'Orders-Logistics') { orders_logistics_total += parseFloat(item.amount) || 0 }
+      })
+      return {
+        payment_fee: Math.trunc(payment_fee * 100) / 100,
+        commission_fee: Math.trunc(commission_fee * 100) / 100,
+        promotional_charges: Math.trunc(promotional_charges * 100) / 100,
+        shipping_fee_paid_by_customer: Math.trunc(shipping_fee_paid_by_customer * 100) / 100,
+        item_price_credit: Math.trunc(item_price_credit * 100) / 100,
+        orders_marketplace_fees_total: Math.trunc(orders_marketplace_fees_total * 100) / 100,
+        orders_sales_total: Math.trunc(orders_sales_total * 100) / 100,
+        orders_marketing_fees_total: Math.trunc(orders_marketing_fees_total * 100) / 100,
+        orders_logistics_total: Math.trunc(orders_logistics_total * 100) / 100,
+        promotional_charges_flexi_combo: Math.trunc(promotional_charges_flexi_combo * 100) / 100,
+        auto_shipping_subsidy_marketplace: Math.trunc(auto_shipping_subsidy_marketplace * 100) / 100
+      }
+    }
+  }
+}

package/server/controllers/lazada/apis/get-store-order-items.ts

@@ -20,8 +20,11 @@ export function getStoreOrderItems() {
           orderItemId: item.order_item_id,
           orderCreatedAt: item.created_at
         }
-        const paymentFee = await StoreAPI.getStoreOrderItemPaymentFee(store, req)
-        res[i].payment_fee = paymentFee
+        let transactionDetails = await StoreAPI.getStoreOrderItemTransactionDetails(store, req)
+        res[i] = {
+          ...res[i],
+          ...transactionDetails
+        }
       }
 
       let results = res
@@ -41,12 +44,28 @@ export function getStoreOrderItems() {
               paid_price: item.paid_price,
               item_price: item.item_price,
               payment_fee: item.payment_fee,
+              commission_fee: item.commission_fee,
+              promotional_charges: item.promotional_charges,
+              shipping_fee_paid_by_customer: item.shipping_fee_paid_by_customer,
+              item_price_credit: item.item_price_credit,
+              orders_marketplace_fees_total: item.orders_marketplace_fees_total,
+              orders_sales_total: item.orders_sales_total,
+              orders_marketing_fees_total: item.orders_marketing_fees_total,
+              orders_logistics_total: item.orders_logistics_total,
               qty: 1,
               shipment_provider: item.shipment_provider,
               tracking_code: JSON.stringify(
                 item.tracking_code ? [{ order_item_id: item.order_item_id, tracking_code: item.tracking_code }] : []
               ),
-              status: item.status
+              status: item.status,
+              voucher_platform_lpi: item.voucher_platform_lpi,
+              voucher_seller_lpi: item.voucher_seller_lpi,
+              shipping_fee_discount_platform: item.shipping_fee_discount_platform,
+              shipping_fee_discount_seller: item.shipping_fee_discount_seller,
+              promotional_charges_flexi_combo: item.promotional_charges_flexi_combo,
+              auto_shipping_subsidy_marketplace: item.auto_shipping_subsidy_marketplace,
+              shipping_fee_original: item.shipping_fee_original,
+              tax_amount: item.tax_amount
             }
 
             newItem.push(data)
@@ -58,12 +77,29 @@ export function getStoreOrderItems() {
               qty: existingItem.qty + 1,
               paid_price: item.paid_price + existingItem.paid_price,
               item_price: item.item_price + existingItem.item_price,
+              payment_fee: item.payment_fee + existingItem.payment_fee,
+              commission_fee: item.commission_fee + existingItem.commission_fee,
+              promotional_charges: item.promotional_charges + existingItem.promotional_charges,
+              shipping_fee_paid_by_customer: item.shipping_fee_paid_by_customer + existingItem.shipping_fee_paid_by_customer,
+              item_price_credit: item.item_price_credit + existingItem.item_price_credit,
+              orders_marketplace_fees_total: item.orders_marketplace_fees_total + existingItem.orders_marketplace_fees_total,
+              orders_sales_total: item.orders_sales_total + existingItem.orders_sales_total,
+              orders_marketing_fees_total: item.orders_marketing_fees_total + existingItem.orders_marketing_fees_total,
+              orders_logistics_total: item.orders_logistics_total + existingItem.orders_logistics_total,
               tracking_code: item.tracking_code
                 ? JSON.stringify([
                     ...JSON.parse(existingItem.tracking_code),
                     { order_item_id: item.order_item_id, tracking_code: item.tracking_code }
                   ])
-                : existingItem.tracking_code
+                : existingItem.tracking_code,
+              voucher_platform_lpi: item.voucher_platform_lpi + existingItem.voucher_platform_lpi,
+              voucher_seller_lpi: item.voucher_seller_lpi + existingItem.voucher_seller_lpi,
+              shipping_fee_discount_platform: item.shipping_fee_discount_platform + existingItem.shipping_fee_discount_platform,
+              shipping_fee_discount_seller: item.shipping_fee_discount_seller + existingItem.shipping_fee_discount_seller,
+              promotional_charges_flexi_combo: item.promotional_charges_flexi_combo + existingItem.promotional_charges_flexi_combo,
+              auto_shipping_subsidy_marketplace: item.auto_shipping_subsidy_marketplace + existingItem.auto_shipping_subsidy_marketplace,
+              shipping_fee_original: item.shipping_fee_original + existingItem.shipping_fee_original,
+              tax_amount: item.tax_amount + existingItem.tax_amount
             }
           }
           return newItem
@@ -83,7 +119,23 @@ export function getStoreOrderItems() {
             tracking_code,
             status,
             item_price: originalPrice,
-            payment_fee: paymentFee
+            payment_fee: paymentFee,
+            commission_fee: commissionFee,
+            promotional_charges: promotionalCharges,
+            shipping_fee_paid_by_customer: shippingFeePaidByCustomer,
+            item_price_credit: itemPriceCredit,
+            orders_marketplace_fees_total: ordersMarketplaceFeesTotal,
+            orders_sales_total: ordersSalesTotal,
+            orders_marketing_fees_total: ordersMarketingFeesTotal,
+            orders_logistics_total: ordersLogisticsTotal,
+            voucher_platform_lpi: marketplaceBonus,
+            voucher_seller_lpi: marketplaceBonusSeller,
+            shipping_fee_discount_platform: shippingFeeDiscountMarketplace,
+            shipping_fee_discount_seller: shippingFeeDiscountSeller,
+            promotional_charges_flexi_combo: promotionalChargesFlexiCombo,
+            auto_shipping_subsidy_marketplace: autoShippingSubsidyMarketplace,
+            shipping_fee_original: originalShippingFee,
+            tax_amount: taxAmount
           } = orderItem
           var trackingNo = tracking_code === '' ? null : tracking_code
 
@@ -101,7 +153,23 @@ export function getStoreOrderItems() {
             trackingNo,
             status,
             originalPrice,
-            paymentFee
+            paymentFee,
+            commissionFee,
+            promotionalCharges,
+            shippingFeePaidByCustomer,
+            itemPriceCredit,
+            ordersMarketplaceFeesTotal,
+            ordersSalesTotal,
+            ordersMarketingFeesTotal,
+            ordersLogisticsTotal,
+            marketplaceBonus,
+            marketplaceBonusSeller,
+            shippingFeeDiscountMarketplace,
+            shippingFeeDiscountSeller,
+            promotionalChargesFlexiCombo,
+            autoShippingSubsidyMarketplace,
+            originalShippingFee,
+            taxAmount
           }
         })
 

package/server/controllers/lazada/apis/get-store-order.ts

@@ -64,6 +64,7 @@ export function getStoreOrder() {
         phone2,
         postCode,
         city,
+        state: address3,
         country: country === 'MY' ? 'Malaysia' : country,
         attentionTo: `${first_name} ${last_name}`
       }

package/server/controllers/lazada/apis/get-store-orders.ts

@@ -86,10 +86,11 @@ export function getStoreOrders() {
           address3,
           address4,
           address5,
-          phone,
+          phone1: phone,
           phone2,
           postCode,
           city,
+          state: address3,
           country,
           collectionAmount: shipping_fee,
           collectionCurrency: currency,

package/server/controllers/lazada/apis/index.ts

@@ -21,4 +21,4 @@ export * from './update-store-product-stock'
 export * from './update-store-product-variation-stock'
 export * from './update-store-product'
 export * from './get-store-refund-orders'
-export * from './get-store-order-item-payment-fee'
+export * from './get-store-order-item-transaction-details'

package/server/controllers/lazada/client/lazada.ts

@@ -1,8 +1,11 @@
+import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { Parameter, Endpoint } from './types'
+import { getRepository } from 'typeorm'
+
+import { MarketplaceStore } from '../../../entities'
 import { makeSystemParameters } from './signature'
+import { Endpoint, Parameter } from './types'
 import { xmlize } from './xml'
-import FormData from 'form-data'
 
 export class Lazada {
   endpoint: string
@@ -38,13 +41,13 @@ export class Lazada {
     return await response.json()
   }
 
-  async refreshAccessToken(payload: { refresh_token: string }) {
+  public static async refreshAccessToken(payload: { refresh_token: string }, appKey, appSecret, storeId) {
     /* CONFIRM-ME not qualified */
     const apiPath = '/auth/token/refresh'
 
     const body = {
       ...payload,
-      ...makeSystemParameters(this.appKey, this.appSecret, apiPath, undefined, payload)
+      ...makeSystemParameters(appKey, appSecret, apiPath, undefined, payload)
     }
 
     const response = await fetch(Endpoint.auth + apiPath, {
@@ -55,6 +58,25 @@ export class Lazada {
       body: JSON.stringify(body)
     })
 
+    const repository = getRepository(MarketplaceStore)
+    const store: MarketplaceStore = await repository.findOne({
+      where: { id: storeId }
+    })
+
+    const refreshTokenInfo = await response.json()
+    const { access_token, refresh_token } = refreshTokenInfo
+
+    var patch = {
+      accessToken: access_token,
+      refreshToken: refresh_token,
+      accessInfo: JSON.stringify(refreshTokenInfo, null, 2)
+    }
+
+    await repository.save({
+      ...store,
+      ...patch
+    })
+
     return await response.json()
   }
 
@@ -72,6 +94,10 @@ export class Lazada {
       }
     })
 
+    if (!response.ok) {
+      throw response
+    }
+
     return await response.json()
   }
 
@@ -80,13 +106,13 @@ export class Lazada {
       params.payload = xmlize(params.payload)
     }
 
-    const {   
-      app_key,
-      timestamp,
-      access_token,
-      sign_method,
-      sign 
-    } = makeSystemParameters(this.appKey, this.appSecret, path, accessToken || this.accessToken, params)
+    const { app_key, timestamp, access_token, sign_method, sign } = makeSystemParameters(
+      this.appKey,
+      this.appSecret,
+      path,
+      accessToken || this.accessToken,
+      params
+    )
 
     const body = new FormData()
 
@@ -96,7 +122,7 @@ export class Lazada {
     body.append('sign_method', sign_method)
     body.append('sign', sign)
 
-    for(let key in params) {
+    for (let key in params) {
       body.append(key, params[key])
     }
 
@@ -106,6 +132,10 @@ export class Lazada {
       body
     })
 
+    if (!response.ok) {
+      throw response
+    }
+
     return await response.json()
   }
 }

package/server/controllers/lazada/platform-action.ts

@@ -1,10 +1,29 @@
+import { config } from '@things-factory/env'
+
 import { Lazada } from './client'
 
-import { config } from '@things-factory/env'
 const lazadaConfig = config.get('marketplaceIntegrationLazada', {})
 const { appKey, appSecret } = lazadaConfig
 
 export const action = async ({ store, method = 'get', path, request }) => {
+  try {
+    return await _action({ store, method, path, request })
+  } catch (ex) {
+    if (ex.code === 'IllegalAccessToken') {
+      var refreshStore = await Lazada.refreshAccessToken(
+        { refresh_token: store.refreshToken },
+        appKey,
+        appSecret,
+        store.id
+      )
+      return await _action({ store: refreshStore, method, path, request })
+    } else {
+      throw ex
+    }
+  }
+}
+
+export const _action = async ({ store, method = 'get', path, request }) => {
   const client = new Lazada(store.countryCode, appKey, appSecret)
 
   var response = await client[method == 'post' ? 'post' : 'get'](path, request, store.accessToken)

package/server/controllers/shopee/apis/get-store-order-transaction-details.ts

@@ -0,0 +1,29 @@
+/* https://open.shopee.com/documents?module=4&type=1&id=396&version=1 */
+
+export function getStoreOrderTransactionDetails() {
+  return {
+    method: 'post',
+    path: '/orders/my_income',
+    denormalize(req) {
+      var { orderNo } = req
+
+      return {
+        ordersn: orderNo
+      }
+    },
+    normalize(res) {
+      var { order } = res
+      const result = {
+        voucherAmount: parseFloat(order.income_details.voucher_seller) || null,
+        shippingRebate: parseFloat(order.income_details.shipping_fee_rebate) || null,
+        commissionFee: parseFloat(order.income_details.commission_fee) || null,
+        serviceFee: parseFloat(order.income_details.service_fee) || null,
+        transactionFee: parseFloat(order.income_details.seller_transaction_fee) || null,
+        totalRealeasedAmount: parseFloat(order.income_details.escrow_amount) || null,
+        voucherCode: order.income_details.voucher_code,
+        shippingMode: order.shipping_carrier
+      }
+      return result
+    }
+  }
+}

package/server/controllers/shopee/apis/get-store-order.ts

@@ -1,5 +1,7 @@
 /* https://open.shopee.com/documents?module=4&type=1&id=397 */
 
+import { StoreAPI } from '../../store-api'
+
 export function getStoreOrder() {
   return {
     path: '/orders/detail',
@@ -10,10 +12,10 @@ export function getStoreOrder() {
         ordersn_list: [orderNo]
       }
     },
-    normalize(res) {
-      let results = res.orders.map(order => {
+    normalize(res, { store }) {
+      let results = res.orders.map(async order => {
         if (order.pay_time) {
-          order.pay_time = new Date(order.pay_time)
+          order.pay_time = new Date(order.pay_time * 1000)
         }
         if (order.estimated_shipping_fee) {
           order.estimated_shipping_fee = parseFloat(order.estimated_shipping_fee)
@@ -74,7 +76,7 @@ export function getStoreOrder() {
           }
         })
 
-        const { full_address, zipcode: postCode, phone, country, city, name: attentionTo } = recipient_address
+        const { full_address, zipcode: postCode, phone, country, city, name: attentionTo, state } = recipient_address
 
         var orderShipping = {
           address1: full_address,
@@ -86,15 +88,18 @@ export function getStoreOrder() {
           phone2: null,
           postCode,
           city,
+          state,
           country: country === 'MY' ? 'Malaysia' : country,
           collectionCurrency: null,
           attentionTo,
           trackingNo,
           transporter: shippingProvider,
-          shippingFee: parseFloat(shippingFee),
-          actualShippingFee: parseFloat(actualShippingFee)
+          shippingFee: parseFloat(shippingFee) || null,
+          actualShippingFee: parseFloat(actualShippingFee) || null
         }
 
+        let escrowDetails = await StoreAPI.getStoreOrderTransactionDetails(store, { orderNo })
+
         return {
           name,
           orderNo,
@@ -112,7 +117,8 @@ export function getStoreOrder() {
           orderItems,
           orderShipping,
           buyerUsername,
-          payTime
+          payTime,
+          ...escrowDetails
         }
       })
 

package/server/controllers/shopee/apis/index.ts

@@ -25,4 +25,5 @@ export * from './split-order'
 export * from './update-store-product-stock'
 export * from './update-store-product-variation-stock'
 export * from './get-store-refund-orders'
-export * from './get-store-refund-order-details'
+export * from './get-store-refund-order-details'
+export * from './get-store-order-transaction-details'

package/server/controllers/shopify/apis/get-store-orders.ts

@@ -27,6 +27,9 @@ export function getStoreOrders() {
     },
     async normalize(res, { store }) {
       // return res.orders
+
+      // removed item -> fulfillable_quantity = 0
+
       const linkParams = res.link
       var more: boolean = false
 
@@ -44,6 +47,7 @@ export function getStoreOrders() {
           const fulfillmentStatus = order.fulfillment_status
           let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
 
+          let itemCount: Number = 0
           let result: any
 
           if (fulfillmentStatus != null) {
@@ -81,15 +85,33 @@ export function getStoreOrders() {
           } else {
             let lineItems = []
 
-            order.line_items.map(lineItem => {
-              const refundItems = order.refunds.map(refund => {
-                const refundLineItems = refund.refund_line_items
-                return {
-                  ...refundLineItems
+            const refundItems = order.refunds
+              .reduce((acc, curr) => {
+                const refundLineItems = curr.refund_line_items
+                acc.push(...refundLineItems)
+
+                return acc
+              }, [])
+              .reduce((acc, curr) => {
+                let sum = acc.findIndex(x => x.line_item_id === curr.line_item_id)
+                if (sum >= 0) {
+                  acc[sum].quantity += curr.quantity
+                } else {
+                  acc.push(curr)
                 }
-              })
 
-              const matchedLineItem = refundItems.find(item => item[0].line_item_id == lineItem.id)
+                return acc
+              }, [])
+
+            let filteredLineItems = []
+            if (orderStatus == 'cancelled') {
+              filteredLineItems = order.line_items
+            } else {
+              filteredLineItems = order.line_items.filter(item => item.fulfillable_quantity > 0)
+            }
+
+            filteredLineItems.map(lineItem => {
+              const matchedLineItem = refundItems.find(item => item.line_item_id == lineItem.id)
 
               if (!matchedLineItem) {
                 lineItem = {
@@ -104,6 +126,19 @@ export function getStoreOrders() {
                 }
 
                 lineItems.push(lineItem)
+              } else {
+                lineItem = {
+                  name: lineItem.id.toString(),
+                  qty: orderStatus == 'cancelled' ? lineItem.quantity : lineItem.quantity - matchedLineItem.quantity,
+                  paidPrice: lineItem.price,
+                  docRefNo: lineItem.id,
+                  variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
+                  variationSku: lineItem.sku,
+                  channelSku: lineItem.sku,
+                  variationName: lineItem.name
+                }
+
+                if (lineItem.qty >= 0) lineItems.push(lineItem)
               }
             })
 
@@ -111,7 +146,7 @@ export function getStoreOrders() {
               name: orderId,
               orderNo: order.name,
               currency: order.currency,
-              totalAmount: order.current_total_price,
+              totalAmount: orderStatus == 'cancelled' ? order.total_price : order.current_total_price,
               remark: order.note,
               orderCreatedAt: new Date(order.created_at).toUTCString(),
               orderUpdatedAt: new Date(order.updated_at).toUTCString(),
@@ -132,7 +167,8 @@ export function getStoreOrders() {
               city,
               country,
               first_name,
-              last_name
+              last_name,
+              province: state
             } = order?.shipping_address ? order.shipping_address : order.billing_address
 
             var orderShipping = {
@@ -145,6 +181,7 @@ export function getStoreOrders() {
               phone2: null,
               postCode,
               city,
+              state,
               country: country === 'MY' ? 'Malaysia' : country,
               collectionCurrency: null,
               attentionTo: `${first_name} ${last_name}`
@@ -153,6 +190,9 @@ export function getStoreOrders() {
             result.orderShipping = orderShipping
           }
 
+          itemCount = result.orderItems.length
+          result.itemCount = itemCount
+
           return result
         })