@things-factory/integration-marketplace 5.0.0-alpha.38 → 5.0.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-marketplace",
-  "version": "5.0.0-alpha.38",
+  "version": "5.0.0-alpha.39",
   "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": "^5.0.0-alpha.38",
-    "@things-factory/auth-ui": "^5.0.0-alpha.38",
-    "@things-factory/biz-base": "^5.0.0-alpha.38",
-    "@things-factory/code-ui": "^5.0.0-alpha.38",
-    "@things-factory/context-ui": "^5.0.0-alpha.38",
-    "@things-factory/grist-ui": "^5.0.0-alpha.38",
-    "@things-factory/i18n-base": "^5.0.0-alpha.38",
-    "@things-factory/integration-lmd": "^5.0.0-alpha.38",
-    "@things-factory/integration-ui": "^5.0.0-alpha.38",
-    "@things-factory/more-ui": "^5.0.0-alpha.38",
-    "@things-factory/resource-ui": "^5.0.0-alpha.38",
-    "@things-factory/setting-ui": "^5.0.0-alpha.38",
-    "@things-factory/system-ui": "^5.0.0-alpha.38",
+    "@things-factory/apptool-ui": "^5.0.0-alpha.39",
+    "@things-factory/auth-ui": "^5.0.0-alpha.39",
+    "@things-factory/biz-base": "^5.0.0-alpha.39",
+    "@things-factory/code-ui": "^5.0.0-alpha.39",
+    "@things-factory/context-ui": "^5.0.0-alpha.39",
+    "@things-factory/grist-ui": "^5.0.0-alpha.39",
+    "@things-factory/i18n-base": "^5.0.0-alpha.39",
+    "@things-factory/integration-lmd": "^5.0.0-alpha.39",
+    "@things-factory/integration-ui": "^5.0.0-alpha.39",
+    "@things-factory/more-ui": "^5.0.0-alpha.39",
+    "@things-factory/resource-ui": "^5.0.0-alpha.39",
+    "@things-factory/setting-ui": "^5.0.0-alpha.39",
+    "@things-factory/system-ui": "^5.0.0-alpha.39",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0",
     "querystring": "^0.2.1"
@@ -52,5 +52,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "b5e6badbf7bfb3e509c5d065da635da7c084ffce"
+  "gitHead": "23e58562a4724f157c3bc492cdedb7e32efee6a1"
 }

package/server/controllers/index.ts

@@ -3,6 +3,7 @@ import './shopee'
 import './shopify'
 import './zalora'
 import './woocommerce'
+import './tiktok'
 
 export * from './shopify'
 export * from './store-api'

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

@@ -0,0 +1,15 @@
+export function getStoreOrder() {
+  return {
+    path: '/orders/{id}',
+    method: 'get',
+    denormalize(req) {
+      let { id } = req
+      return {
+        resource: { id }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -63,7 +63,7 @@ export function getStoreOrders() {
         let docRefNo = orderNo
 
         let orderItems = items.map(item => {
-          var { item_id: name, product_id, qty_ordered: qty, price } = item
+          var { item_id: name, product_id, qty_ordered: qty, price, original_price, price, tax_amount, tax_invoiced } = item
 
           return {
             name,
@@ -71,7 +71,11 @@ export function getStoreOrders() {
             qty,
             paidPrice: price,
             orderNo,
-            docRefNo
+            docRefNo,
+            total: price,
+            totalTax: tax_invoiced,
+            subtotal: original_price,
+            subtotalTax: tax_amount
           }
         })
 
@@ -110,17 +114,45 @@ export function getStoreOrders() {
             postCode: postcode,
             city,
             country: country_id === 'MY' ? 'Malaysia' : country_id,
-            collectionCurrency: null,
+            collectionCurrency: order.order_currency_code,
             attentionTo: `${firstname} ${middlename} ${lastname}`
           }
 
           result.orderShipping = orderShipping
+
+          // For SC mapping
+          result.shipping = {
+            address_1: street,
+            postcode: postcode,
+            country: country_id,
+            city,
+            first_name: firstname,
+            last_name: lastname,
+            phone: telephone,
+            email: order.customer_email
+          }
+          let billingAddress = order?.billing_address
+          result.billing = {
+            address_1: billingAddress.street,
+            postcode: billingAddress.postcode,
+            country: billingAddress.country_id,
+            city: billingAddress.city,
+            first_name: billingAddress.firstname,
+            last_name: billingAddress.lastname,
+            phone: billingAddress.telephone,
+            email: billingAddress.email
+          }
+          result.firstName = order.customer_firstname
+          result.lastName = order.customer_lastname
+          result.isSOF = true
         }
 
         return result
       })
 
-      return { results }
+      let more = res.search_criteria.page_size * res.search_criteria.current_page < res.total_count || false
+
+      return { results, more }
     }
   }
 }

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

@@ -0,0 +1,43 @@
+export function getStoreProductCategories() {
+  return {
+    method: 'get',
+    path: '/categories/list',
+    denormalize(req) {
+      var { pagination } = req || {}
+      var { page = 0, limit = 100 } = pagination || {}
+
+      const resource: any = {}
+      const payload: any = {
+        pageSize: limit,
+        currentPage: page
+      }
+      return { resource, payload }
+    },
+    normalize(res) {
+      let results = res.items
+      results = mapCategories(results, [])
+      results = results.map(result => {
+        let { id, name, parent_id, is_active, children_data } = result
+        return {
+          id,
+          name,
+          parent: parent_id,
+          isActive: is_active
+        //   childrenCategories: children_data
+        }
+      })
+      results = results.filter(cat => cat.parent != 0)
+      return { results: results }
+    }
+  }
+}
+
+function mapCategories(results, arr) {
+  for (let result of results) {
+      if (result.children_data?.length > 0) {
+        mapCategories(result.children_data, arr)
+      }
+      arr.push(result)
+  }
+  return arr
+}

package/server/controllers/magento/apis/get-store-products.ts

@@ -21,6 +21,8 @@ export function getStoreProducts() {
       // return res.products
       let { items, total_count } = res
 
+      let parentLinkList = items.map(e => {return {id: e.id, children: e.extension_attributes.configurable_product_links}})?.filter(e => e.children)
+
       let activeMarketplaceDistributors: any[] = []
       if (store?.marketplaceDistributors) {
         activeMarketplaceDistributors = store.marketplaceDistributors.filter(
@@ -32,17 +34,21 @@ export function getStoreProducts() {
 
       for (var i = 0; i < items.length; i++) {
         const product: any = items[i]
-        const stockItems: any[] = await StoreAPI.getStoreStockItem(store, {
-          sku: product.sku,
-          distributors: activeMarketplaceDistributors
-        })
 
         let totalProductQty: number = 0
-        stockItems.map(stockItem => {
-          if (stockItem.sku === product.sku) {
-            totalProductQty += stockItem.qty
-          }
-        })
+
+        try {
+          const stockItems: any[] = await StoreAPI.getStoreStockItem(store, {
+            sku: product.sku,
+            distributors: activeMarketplaceDistributors
+          })
+
+          stockItems.map(stockItem => {
+            if (stockItem.sku === product.sku) {
+              totalProductQty += stockItem.qty
+            }
+          })
+        } catch (e) {}
         const productVariations: any[] = await StoreAPI.getStoreProductVariations(store, { sku: product.sku })
 
         const result = {
@@ -52,6 +58,14 @@ export function getStoreProducts() {
           type: product.type_id,
           hasVariation: false,
           attributes: [],
+          images: product?.custom_attributes?.find(att => att.attribute_code == 'image')?.value
+            ? [
+                `${store.storeURL}pub/media/catalog/product${
+                  product?.custom_attributes?.find(att => att.attribute_code == 'image')?.value
+                }`
+              ]
+            : [],
+          categoryId: product?.custom_attributes?.find(att => att.attribute_code == 'category_ids').value[0],
           variations:
             productVariations.length > 0
               ? productVariations.map(variant => {
@@ -82,7 +96,17 @@ export function getStoreProducts() {
                     sellPrice: product.price,
                     marketplaceStatus: product.status,
                     primaryUnit: 'lbs',
-                    primaryUnitValue: product.weight
+                    primaryUnitValue: product.weight,
+                    length:
+                      product?.custom_attributes?.find(att => att.attribute_code == 'ts_dimensions_length')?.value *
+                      25.4 || 0,
+                    width:
+                      product?.custom_attributes?.find(att => att.attribute_code == 'ts_dimensions_width')?.value *
+                      25.4 || 0,
+                    height:
+                      product?.custom_attributes?.find(att => att.attribute_code == 'ts_dimensions_height')?.value *
+                      25.4 || 0,
+                    weight: product.weight * 453.59237 || 0
                   }
                 ]
         }
@@ -90,7 +114,7 @@ export function getStoreProducts() {
         results.push({ ...result })
       }
 
-      return { results, total: total_count }
+      return { results, total: total_count, parentLinkList }
     }
   }
 }

package/server/controllers/magento/apis/get-store-stock-item.ts

@@ -19,7 +19,7 @@ export function getStoreStockItem() {
         }
       ]
 
-      if (distributors) {
+      if (distributors.length > 0) {
         const distributorsArr = distributors.map(distributor => distributor.name)
 
         filterGroups.push({

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

@@ -9,3 +9,8 @@ export * from './create-order-refund'
 export * from './create-order-ship'
 export * from './update-store-product-stock'
 export * from './update-store-product-variation-stock'
+export * from './get-store-product-categories'
+export * from './update-order-status'
+export * from './get-store-order'
+export * from './update-store-product-price'
+export * from './update-store-product-variation-price'

package/server/controllers/magento/apis/update-order-status.ts

@@ -0,0 +1,81 @@
+import { StoreAPI } from '../../store-api'
+
+export function updateOrderStatus() {
+  return {
+    method: 'post',
+    path: '/{subpath}',
+    denormalize(req) {
+      let { orderId, status, trackingNo, carrier, orderItems, isSOF } = req
+      let pr: any
+      if (status == 'READY_TO_SHIP') {
+        pr = {
+          resource: {
+            subpath: `order/${orderId}/ship`
+          },
+          payload: {
+            items: unmapOrderItems(orderItems),
+            tracks: isSOF && trackingNo ? [
+              {
+                carrier_code: carrier,
+                track_number: trackingNo,
+                title: carrier
+              }
+            ] : [],
+            arguments: {
+              extension_attributes: {
+                source_code: 'default'
+              }
+            }
+          }
+        }
+      } else if (status == 'DELIVERED') {
+        pr = {
+          resource: {
+            subpath: `order/${orderId}/invoice`
+          }
+        }
+      } else if (status == 'REFUND_COMPLETE') {
+        pr = {
+          resource: {
+            subpath: `order/${orderId}/refund`
+          }
+        }
+      } else if (status == 'CANCELLED') {
+        pr = {
+          resource: {
+            subpath: `orders/${orderId}/cancel`
+          }
+        }
+      }
+      return pr
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}
+
+function unmapOrderItems(orderItems) {
+  let itemsList = []
+  let res = orderItems.map(e => {
+    return e.split('-')[0]
+  })
+
+  for (let item of res) {
+    let count = 0
+
+    res.forEach(element => {
+      if (element === item) {
+        count += 1
+      }
+    })
+
+    itemsList.push({
+      order_item_id: item,
+      qty: count
+    })
+  }
+
+  itemsList = itemsList.filter((value, index, self) => index === self.findIndex(t => t.order_item_id === value.order_item_id))
+  return itemsList
+}

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

@@ -0,0 +1,24 @@
+export function updateStoreProductPrice() {
+  return {
+    path: '/products/base-prices',
+    method: 'post',
+    denormalize(req) {
+      let { sellPrice, variationSku } = req
+
+      return {
+        payload: {
+          prices: [
+            {
+              price: sellPrice,
+              sku: variationSku,
+              store_id: 0
+            }
+          ]
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -6,7 +6,7 @@ export function updateStoreProductStock() {
     method: 'post',
     path: '/inventory/source-items',
     denormalize(req) {
-      const { variationSku, qty, distributors } = req[0]
+      const { variationSku, qty, distributors } =  (Array.isArray(req) ? req[0] : req) || {}
 
       let sourceItems: any[] = []
 

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

@@ -0,0 +1,24 @@
+export function updateStoreProductVariationPrice() {
+  return {
+    path: '/products/base-prices',
+    method: 'post',
+    denormalize(req) {
+      let { sellPrice, variationSku } = req
+
+      return {
+        payload: {
+          prices: [
+            {
+              price: sellPrice,
+              sku: variationSku,
+              store_id: 0
+            }
+          ]
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -6,7 +6,7 @@ export function updateStoreProductVariationStock() {
     method: 'post',
     path: '/inventory/source-items',
     denormalize(req) {
-      const { variationSku, qty, distributors } = req[0]
+      const { variationSku, qty, distributors } = (Array.isArray(req) ? req[0] : req) || {}
 
       let sourceItems: any[] = []
 

package/server/controllers/magento/magento.ts

@@ -11,6 +11,7 @@ export type MagentoConfig = {
   oauthConsumerKey: string
   oauthConsumerSecret: string
   shop: string
+  storeId?: string
   accessToken?: string
 }
 
@@ -154,11 +155,11 @@ export class Magento {
   }
 
   async get(path: string, data: any) {
-    const { shop, accessToken } = this.config
+    const { shop, accessToken, storeId } = this.config
 
     const qs = this.objectToMultiarray(data)
 
-    const endpoint = `${shop}/rest/V1${path}${qs ? '?' + qs : ''}`
+    const endpoint = `${shop}/rest${storeId ? `/${storeId}` : ''}/V1${path}${qs ? '?' + qs : ''}`
     debug('endpoint', endpoint)
 
     const response = await fetch(endpoint, {
@@ -176,13 +177,13 @@ export class Magento {
   }
 
   async post(path: string, data: any = {}) {
-    const { shop, accessToken } = this.config
+    const { shop, accessToken, storeId } = this.config
 
     debug('data', data)
 
     const jsondata = JSON.stringify(data)
 
-    const endpoint = `${shop}/rest/V1${path}`
+    const endpoint = `${shop}/rest${storeId ? `/${storeId}` : ''}/V1${path}`
 
     const response = await fetch(endpoint, {
       method: 'post',

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

@@ -27,6 +27,7 @@ export const action = async ({ store, method = 'get', path, request }) => {
     oauthConsumerKey,
     oauthConsumerSecret,
     shop: store.storeURL,
+    storeId: store.storeId,
     accessToken: store.accessToken
   })
 

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

@@ -66,6 +66,12 @@ export class StoreAPI {
   @api
   static getStoreOrder(store, req): any {}
 
+  @api
+  static getStoreOrderPackages(store, req): any {}
+
+  @api
+  static getStoreOrderPackage(store, req): any {}
+
   @api
   static getStoreOrderItems(store, req): any {}
 

package/server/controllers/tiktok/apis/echo.ts

@@ -0,0 +1,14 @@
+export function echo() {
+  return {
+    path: '/echo',
+    denormalize(req) {
+      return { ...req }
+    },
+    normalize(res) {
+      return { ...res }
+    },
+    action({ store, method, path, request, platformAction }) {
+      return { ...request }
+    }
+  }
+}

package/server/controllers/tiktok/apis/get-store-order-document.ts

@@ -0,0 +1,26 @@
+/* https://bytedance.feishu.cn/docs/doccnDyz5Bbk26iOdejbBRBlLrb#ytBXoS */
+
+export function getStoreOrderDocument() {
+  return {
+    method: 'get',
+    path: '/api/fulfillment/shipping_document',
+    denormalize(req) {
+      var { packageId, documentType } = req || {}
+
+      return { payload: { package_id: packageId, document_type: documentType } }
+    },
+    async normalize(res) {
+      const { data } = res
+
+      let result: any[] = [
+        {
+          file: data.doc_url,
+          fileTypeValue: 'AWB',
+          mimeType: 'application/pdf'
+        }
+      ]
+
+      return result
+    }
+  }
+}

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

@@ -0,0 +1,46 @@
+/* https://bytedance.feishu.cn/docs/doccnDyz5Bbk26iOdejbBRBlLrb#ytBXoS */
+
+export function getStoreOrderPackage() {
+  return {
+    method: 'get',
+    path: '/api/fulfillment/detail',
+    denormalize(req) {
+      var { packageId } = req || {}
+
+      return { payload: { package_id: packageId } }
+    },
+    async normalize(res) {
+      const { data } = res
+
+      let result: any = {
+        packageId: data.package_id,
+        orderInfoList: data.order_info_list.map(itm => {
+          return {
+            orderId: itm.order_id,
+            skuList: itm.sku_list.map(sku => {
+              return {
+                skuId: sku.sku_id,
+                skuName: sku.sku_name,
+                skuImage: sku.sku_image,
+                quantity: sku.quantity
+              }
+            })
+          }
+        }),
+        packageStatus: data.package_status,
+        deliveryOption: data.delivery_option,
+        shippingProvider: data.shipping_provider,
+        shippingProviderId: data.shipping_provider_id,
+        trackingNumber: data.tracking_number,
+        orderListIdList: data.order_line_id_list,
+        pickUpType: data.pick_up_type,
+        pickUpStartTime: data.pick_up_start_time,
+        pickupEndTime: data.pick_up_end_time,
+        createTime: data.create_time,
+        updateTime: data.update_time
+      }
+
+      return result
+    }
+  }
+}

package/server/controllers/tiktok/apis/get-store-order-packages.ts

@@ -0,0 +1,43 @@
+/* https://bytedance.feishu.cn/wiki/wikcntMLczW460imZUfYqaa1Dng#jIY8hJ */
+
+import { StoreAPI } from '../../store-api'
+
+export function getStoreOrderPackages() {
+  return {
+    method: 'post',
+    path: '/api/fulfillment/search',
+    denormalize(req) {
+      var { pagination, fromDate, toDate, nextCursor } = req || {}
+      var { page, limit } = pagination || { page: 0, limit: 100 }
+
+      var create_time_from = Math.floor(new Date(fromDate).getTime() / 1000)
+      var create_time_to = Math.floor(new Date(toDate).getTime() / 1000)
+
+      var payload = {
+        page_size: limit,
+        cursor: nextCursor,
+        create_time_from,
+        create_time_to
+      }
+
+      return { payload }
+    },
+    async normalize(res, { store }) {
+      const { data } = res
+
+      var more: boolean = data?.more || false
+      var nextCursor: string = more ? data.next_cursor : null
+      const packageList: any[] = data?.package_list || []
+
+      let results: any[] = []
+      for (let i = 0; i < packageList.length; i++) {
+        const packageObj: any = packageList[i]
+        const packageDetail: any = await StoreAPI.getStoreOrderPackage(store, { packageId: packageObj.package_id })
+
+        results.push({ ...packageDetail })
+      }
+
+      return { results, more, nextCursor }
+    }
+  }
+}