@things-factory/integration-marketplace 3.7.11 → 3.8.11

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.ts

@@ -76,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,
@@ -88,6 +88,7 @@ export function getStoreOrder() {
           phone2: null,
           postCode,
           city,
+          state,
           country: country === 'MY' ? 'Malaysia' : country,
           collectionCurrency: null,
           attentionTo,

package/server/controllers/store-api/index.ts

@@ -1,4 +1,5 @@
 import { getRepository } from 'typeorm'
+
 import { MarketplaceStore } from '../../entities'
 import { api } from './decorators'
 
@@ -80,6 +81,9 @@ export class StoreAPI {
   @api
   static updateStoreProduct(store, req): any {}
 
+  @api
+  static updateOrder(store, req): any {}
+
   @api
   static cancelStoreOrder(store, req): any {}
 
@@ -156,14 +160,23 @@ export class StoreAPI {
   static getStoreRefundOrders(store, req): any {}
 
   @api
-  static getStoreRefundOrderDetails(store, req): any{}
+  static getStoreRefundOrderDetails(store, req): any {}
+
+  @api
+  static getStoreOrderItemPaymentFee(store, req): any {}
 
   @api
-  static getStoreOrderItemPaymentFee(store, req): any{}
+  static getStoreOrderItemTransactionDetails(store, req): any {}
 
   @api
   static updateProductAttribute(store, req): any {}
 
   @api
   static getStoreOrderTransactionDetails(store, req): any {}
+
+  @api
+  static updateStoreProductVariationPrice(store, req): any {}
+
+  @api
+  static updateStoreProductPrice(store, req): any {}
 }

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

@@ -0,0 +1,17 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#retrieve-an-order */
+
+export function getStoreOrder() {
+  return {
+    method: 'get',
+    path: '/orders/{orderId}',
+    denormalize(req) {
+      var { orderId } = req
+      return {
+          resource: { orderId }
+      }
+    },
+    normalize(res) {
+        return res.items
+    }
+  }
+}

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

@@ -17,7 +17,8 @@ export function getStoreOrders() {
 
       var payload = {
         offset: page * limit,
-        limit,
+        per_page: limit,
+        page: page + 1,
         after,
         before
       }
@@ -26,9 +27,15 @@ export function getStoreOrders() {
     },
     async normalize(res, { store }) {
       // return res.orders
-      var { items: orders, totalItems } = res
+      var { items: orders, link } = res
       let results: any[] = []
 
+      var more: boolean = false
+
+      if (link) {
+        more = checkNextPage(link)
+      }
+
       for (var i = 0; i < orders.length; i++) {
         const order = orders[i]
 
@@ -48,8 +55,8 @@ export function getStoreOrders() {
         } = order
 
         let docRefNo = orderNo
-        var orderCreatedAt = new Date(date_created_gmt).toUTCString()
-        var orderUpdatedAt = new Date(date_modified_gmt).toUTCString()
+        var orderCreatedAt = new Date(date_created_gmt)
+        var orderUpdatedAt = new Date(date_modified_gmt)
 
         let orderItems = line_items.map(item => {
           var { id: name, product_id, variation_id, quantity: qty, price } = item
@@ -132,7 +139,18 @@ export function getStoreOrders() {
         })
       }
 
-      return { results }
+      return { results, more }
     }
   }
 }
+
+function checkNextPage(link) {
+  let nextPage: boolean = false
+
+  // If there's a previous link, remove the first part of the string entirely
+  if (link.indexOf(`rel="next"`) > -1) {
+    nextPage = true
+  }
+
+  return nextPage
+}

package/server/controllers/woocommerce/apis/get-store-product-categories.ts

@@ -1,58 +1,16 @@
 /* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#list-all-products  /wp-json/wc/v3/categoriess */
 
-export function getStoreProducts() {
+export function getStoreProductCategories() {
   return {
     method: 'get',
-    path: '/categories',
+    path: '/products/categories',
     denormalize(req) {
-      var { pagination } = req || {}
-      var { page, limit } = pagination || { page: 0, limit: 100 }
-
-      var payload: any = {
-        per_page: limit,
-        offset: page * limit
-      }
-
-      return { payload }
+      return { payload: {} }
     },
-    async normalize(res, { store }) {
-      // return res.products
-
-      let results: any[] = []
-      const totalProducts = res.totalProducts
-
-      for (var i = 0; i < res.products.length; i++) {
-        const product: any = res.products[i]
-        const productVariations: any[] = product.variations
-
-        const result = {
-          itemId: product.id,
-          name: product.name,
-          type: product.type,
-          description: product.description,
-          hasVariation: true,
-          categoryId: product?.categories.length > 0 ? product.categories[0].id : null,
-          attributes: [],
-          variations: productVariations.map(variant => {
-            return {
-              variationId: variant.id,
-              variationSku: variant.sku,
-              channelSku: variant.sku,
-              name: product.name + ' (' + variant.attributes[0].options + ')',
-              qty: variant.stock_quantity,
-              primaryUnit: 'N/A',
-              primaryUnitValue: variant.weight,
-              costPrice: variant.price,
-              sellPrice: variant.sale_price,
-              attributes: variant.attributes
-            }
-          })
-        }
-
-        results.push({ ...result })
-      }
+    normalize(res, { store }) {
+      const { items, totalItems } = res
 
-      return { results, total: totalProducts }
+      return { results: items, total: totalItems }
     }
   }
 }

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

@@ -1,7 +1,17 @@
 export * from './echo'
 export * from './create-order-note'
+export * from './get-store-product-categories'
 export * from './get-store-products'
 export * from './get-store-product-variations'
 export * from './get-store-orders'
 export * from './update-store-product-stock'
 export * from './update-store-product-variation-stock'
+export * from './get-store-product-categories'
+export * from './update-order'
+export * from './update-product-attribute'
+export * from './update-store-product-price'
+export * from './update-store-product-variation-price'
+export * from './get-store-order'
+export * from './update-store-product-price'
+export * from './update-store-product-variant-stock'
+export * from './update-store-product-variant-price'

package/server/controllers/woocommerce/apis/update-order.ts

@@ -0,0 +1,36 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/#update-an-order */
+/* /wp-json/wc/v3/orders/<id> */
+
+import { StoreAPI } from '../../store-api'
+
+export function updateOrder(req) {
+  return {
+    method: 'put',
+    path: '/orders/{orderId}',
+    async denormalize(req, { store }) {
+      var { status, orderId } = req || {}
+
+      const order = await StoreAPI.getStoreOrder(store, { orderId })
+
+      let orderStatus = status
+      if (orderStatus == 'PACKED') {
+        if (order.status == 'pending') {
+          orderStatus = 'on-hold'
+        } else {
+          orderStatus = order.status
+        }
+      }
+      if (orderStatus == 'READY_TO_SHIP') {
+        orderStatus = 'completed'
+      }
+      if (orderStatus == 'CANCELLED') {
+        orderStatus = 'cancelled'
+      }
+
+      return { resource: { orderId: orderId }, payload: { status: orderStatus } }
+    },
+    normalize(res) {
+      return res.items
+    }
+  }
+}

package/server/controllers/woocommerce/apis/update-product-attribute.ts

@@ -0,0 +1,17 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/#update-a-product-attribute */
+/* /wp-json/wc/v3/attributes/<id> */
+
+export function updateProductAttribute(req) {
+  return {
+    method: 'put',
+    path: '/products/attributes/{attributeId}',
+    denormalize(req) {
+      var { name, attributeId } = req || {}
+
+      return { resource: { attributeId: attributeId }, payload: { name } }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/woocommerce/apis/update-store-product-price.ts

@@ -0,0 +1,20 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#update-a-product */
+/* /wp-json/wc/v3/products/<id> */
+
+export function updateStoreProductPrice(req) {
+  return {
+    method: 'put',
+    path: '/products/{itemId}',
+    denormalize(req) {
+      var { costPrice, sellPrice, productId } = req || {}
+
+      return {
+        resource: { itemId: parseInt(productId) },
+        payload: { regular_price: costPrice?.toString(), sale_price: sellPrice?.toString() }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/woocommerce/apis/update-store-product-stock.ts

@@ -6,12 +6,12 @@ export function updateStoreProductStock(req) {
     method: 'put',
     path: '/products/{itemId}',
     denormalize(req) {
-      var { qty, itemId } = req[0] || {}
+      var { qty, itemId } = req || {}
 
       return { resource: { itemId: parseInt(itemId) }, payload: { stock_quantity: qty, manage_stock: true } }
     },
     normalize(res) {
-      return res.items
+      return res
     }
   }
 }

package/server/controllers/woocommerce/apis/update-store-product-variant-price.ts

@@ -0,0 +1,17 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#update-a-product-variation */
+/* /wp-json/wc/v3/products/<product_id>/variations/<id> */
+
+export function updateStoreProductVariantPrice(req) {
+  return {
+    method: 'put',
+    path: '/products/{itemId}/variations/{variantId}',
+    denormalize(req) {
+      var { cost_price, sell_price, product_id, variant_id } = req[0] || {}
+
+      return { resource: { itemId: parseInt(product_id), variantId: parseInt(variant_id) }, payload: { price: cost_price, sale_price: sell_price } }
+    },
+    normalize(res) {
+        return res.items
+    }
+  }
+}

package/server/controllers/woocommerce/apis/update-store-product-variant-stock.ts

@@ -0,0 +1,18 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#update-a-product-variation */
+/* /wp-json/wc/v3/products/<product_id>/variations/<id> */
+
+export function updateStoreProductVariantStock(req) {
+    return {
+      method: 'put',
+      path: '/products/{itemId}/variations/{variantId}',
+      denormalize(req) {
+        var { qty, product_id, variant_id } = req[0] || {}
+  
+        return { resource: { itemId: parseInt(product_id), variantId: parseInt(variant_id) }, payload: { stock_quantity: qty, manage_stock: true } }
+      },
+      normalize(res) {
+          return res.items
+      }
+    }
+  }
+  

package/server/controllers/woocommerce/apis/update-store-product-variation-price.ts

@@ -0,0 +1,20 @@
+/* https://woocommerce.github.io/woocommerce-rest-api-docs/?javascript#update-a-product-variation */
+/* /wp-json/wc/v3/products/<product_id>/variations/<id> */
+
+export function updateStoreProductVariationPrice(req) {
+  return {
+    method: 'put',
+    path: '/products/{itemId}/variations/{variantId}',
+    denormalize(req) {
+      var { costPrice, sellPrice, productId, variationId } = req || {}
+
+      return {
+        resource: { itemId: parseInt(productId), variantId: parseInt(variationId) },
+        payload: { regular_price: costPrice?.toString(), sale_price: sellPrice?.toString() }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}