@things-factory/integration-marketplace 5.0.0-alpha.51 → 5.0.0-alpha.55

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

@@ -5,22 +5,28 @@ export function getStoreOrders() {
     method: 'get',
     path: '/orders.json',
     denormalize(req) {
-      var { pagination, fromDate, toDate, lastOrderId } = req || {}
+      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId } = req || {}
       var { page = 0, limit = 100 } = pagination || {}
 
-      var created_at_min = new Date(fromDate).toISOString()
-      var created_at_max = new Date(toDate).toISOString()
-      /* Must include only create_time or update_time in the request. */
-      // var update_time_from = lastOneDay
-      // var update_time_to = now
-
       var payload: any = {
         limit,
-        created_at_min,
-        created_at_max,
         status: 'any'
       }
 
+      if (fromCreatedDate && toCreatedDate) {
+        var created_at_min = new Date(fromCreatedDate).toISOString()
+        var created_at_max = new Date(toCreatedDate).toISOString()
+        payload.created_at_min = created_at_min
+        payload.created_at_max = created_at_max
+      }
+
+      if (fromUpdatedDate && toUpdatedDate) {
+        var updated_at_min = new Date(fromUpdatedDate).toISOString()
+        var updated_at_max = new Date(toUpdatedDate).toISOString()
+        payload.updated_at_min = updated_at_min
+        payload.updated_at_max = updated_at_max
+      }
+
       if (lastOrderId) payload.since_id = Number(lastOrderId)
 
       return { payload }
@@ -45,7 +51,9 @@ export function getStoreOrders() {
         .map(order => {
           const orderId = order.id
           const fulfillmentStatus = order.fulfillment_status
+          const paymentStatus = order?.financial_status || ''
           let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
+          let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus)
 
           let itemCount: Number = 0
           let result: any
@@ -63,6 +71,7 @@ export function getStoreOrders() {
               orderUpdatedAt: new Date(order.updated_at).toUTCString(),
               discountValue: order.total_discounts,
               status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
+              sellercraftStatus,
               trackingNo: fulfillment.tracking_number,
               shippingProvider: fulfillment.tracking_company,
               recipientAddress:
@@ -78,7 +87,10 @@ export function getStoreOrders() {
                   variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
                   variationSku: lineItem.sku,
                   channelSku: lineItem.sku,
-                  variationName: lineItem.name
+                  variationName: lineItem.name,
+                  originalPrice: lineItem.price,
+                  total: lineItem.price,
+                  subtotal: lineItem.price
                 }
               })
             }
@@ -122,7 +134,8 @@ export function getStoreOrders() {
                   variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
                   variationSku: lineItem.sku,
                   channelSku: lineItem.sku,
-                  variationName: lineItem.name
+                  variationName: lineItem.name,
+                  originalPrice: lineItem.price
                 }
 
                 lineItems.push(lineItem)
@@ -135,7 +148,8 @@ export function getStoreOrders() {
                   variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
                   variationSku: lineItem.sku,
                   channelSku: lineItem.sku,
-                  variationName: lineItem.name
+                  variationName: lineItem.name,
+                  originalPrice: lineItem.price
                 }
 
                 if (lineItem.qty >= 0) lineItems.push(lineItem)
@@ -153,6 +167,7 @@ export function getStoreOrders() {
               discountValue: order.total_discounts,
               recipientAddress: order.billing_address,
               status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
+              sellercraftStatus,
               reason: order.cancel_reason,
               orderItems: lineItems
             }
@@ -183,11 +198,44 @@ export function getStoreOrders() {
               city,
               state,
               country: country === 'MY' ? 'Malaysia' : country,
-              collectionCurrency: null,
+              collectionCurrency: order.currency,
               attentionTo: `${first_name} ${last_name}`
             }
 
             result.orderShipping = orderShipping
+
+            // For SC mapping
+
+            let shippingAddress = order?.shipping_address
+            let billingAddress = order?.billing_address || shippingAddress
+
+            result.shipping = {
+              address_1: shippingAddress.address1,
+              address_2: shippingAddress.address2,
+              address_3: shippingAddress.province,
+              postcode: shippingAddress.zip,
+              country: shippingAddress.country_code,
+              city: shippingAddress.city,
+              first_name: shippingAddress.first_name,
+              last_name: shippingAddress.last_name,
+              phone: shippingAddress.phone,
+              email: order.email
+            }
+            result.billing = {
+              address_1: billingAddress.address1,
+              address_2: billingAddress.address2,
+              address_3: billingAddress.province,
+              postcode: billingAddress.zip,
+              country: billingAddress.country_code,
+              city: billingAddress.city,
+              first_name: billingAddress.first_name,
+              last_name: billingAddress.last_name,
+              phone: billingAddress.phone,
+              email: order.email
+            }
+            result.isSOF = true
+            result.firstName = order?.customer?.first_name || ''
+            result.lastName = order?.customer?.last_name || ''
           }
 
           itemCount = result.orderItems.length
@@ -211,3 +259,16 @@ function checkNextPage(link) {
 
   return nextPage
 }
+
+function getSellercraftStatus(fulfillmentStatus, paymentStatus) {
+  if (
+    (fulfillmentStatus == 'unfulfilled' || !fulfillmentStatus) &&
+    (paymentStatus == 'pending' || paymentStatus == 'unpaid')
+  )
+    return 'payment_pending'
+  if ((fulfillmentStatus == 'unfulfilled' || !fulfillmentStatus) && paymentStatus == 'paid') return 'processing'
+  if (fulfillmentStatus == 'fulfilled' && paymentStatus == 'paid') return 'shipped'
+  if (paymentStatus == 'refunded') return 'refunded'
+  if (paymentStatus == 'voided') return 'cancelled'
+  if (paymentStatus == 'overdue') return 'cancelled'
+}

package/server/controllers/shopify/apis/get-store-product-variation-stock.ts

@@ -0,0 +1,17 @@
+export function getStoreProductVariationStock() {
+  return {
+    path: '/variants/{variantId}.json',
+    method: 'get',
+    denormalize(req) {
+      let { variantId } = req
+      return {
+        resource: {
+          variantId
+        }
+      }
+    },
+    normalize(res) {
+      return res?.variant?.inventory_quantity
+    }
+  }
+}

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

@@ -9,13 +9,18 @@ export function getStoreProducts() {
     method: 'get',
     path: '/products.json',
     denormalize(req) {
-      var { pagination, pageInfo } = req || {}
+      var { pagination, pageInfo, fromUpdatedDate, toUpdatedDate } = req || {}
       var { page, limit } = pagination || { page: 0, limit: 100 }
 
       var payload: any = {
         limit: limit
       }
 
+      if (fromUpdatedDate && toUpdatedDate) {
+        payload.updated_at_max = toUpdatedDate
+        payload.updated_at_min = fromUpdatedDate
+      }
+
       if (pageInfo) payload.page_info = pageInfo
 
       return { payload }
@@ -72,7 +77,24 @@ export function getStoreProducts() {
           marketplaceStatus: product.status,
           hasVariation: true,
           categoryId: product?.collection_id ? product.collection_id : null,
-          attributes: [],
+          attributes: product?.options?.map(option => {
+            return {
+              native_attribute_id: option.id,
+              attribute_key: option.name,
+              values: option.values
+            }
+          }) || [],
+          sellercraftAttributes: [
+            {
+              native_attribute_id: 'description',
+              attribute_key: 'description',
+              display_name: 'Description',
+              values: [product.body_html]
+            }
+          ],
+          images: product?.images?.map(image => {
+            return image.src
+          }) || [],
           variations: productVariations.map(variant => {
             return {
               variationId: variant.id,
@@ -83,10 +105,14 @@ export function getStoreProducts() {
               inventoryPolicy: variant.inventory_policy,
               inventoryItemId: variant.inventory_item_id,
               locationId: variant.location_id,
+              extraMetadata: {
+                inventoryItemId: variant.inventory_item_id,
+                locationId: variant.location_id,  
+              },
               primaryUnit: variant.weight_unit,
               primaryUnitValue: variant.weight,
               costPrice: variant.price,
-              sellPrice: variant.compare_at_price,
+              sellPrice: variant.compare_at_price || variant.price,
               attributes: [
                 {
                   attributeId: variant.option1,
@@ -101,6 +127,15 @@ export function getStoreProducts() {
                   name: variant.option3
                 }
               ],
+              sellercraftAttributes: product?.options.map(option => {
+                return {
+                  native_attribute_id: option.name,
+                  attribute_key: option.name,
+                  display_name: option.name,
+                  values: [variant[`option${option.position}`]]
+                }
+              }) || [],
+              weight: variant.grams,
               presentmentPrices: variant?.presentment_prices
                 ? variant.presentment_prices.map(presentmentPrice => {
                     return {

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

@@ -7,3 +7,7 @@ export * from './update-store-product-variation-stock'
 export * from './update-order-status'
 export * from './set-store-order-status-ready-to-ship'
 export * from './get-store-order'
+export * from './update-store-product-variation-price'
+export * from './update-store-product-price'
+export * from './update-store-product-stock'
+export * from './get-store-product-variation-stock'

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

@@ -1,15 +1,27 @@
-/* https://shopify.dev/api/admin-rest/2021-10/resources/fulfillment#[post]/admin/api/2021-10/orders/{order_id}/fulfillments/{fulfillment_id}/complete.json */
+/* https://shopify.dev/api/admin-rest/2021-10/resources/fulfillment#[post]/admin/api/2021-10/fulfillments.json */
 
 export function updateOrderStatus() {
   return {
-    path: '/orders/{orderId}/fulfillments/{fulfillmentId}/complete.json',
     method: 'post',
+    path: '/orders/{orderId}/fulfillments.json',
     denormalize(req) {
-      const { orderId, fulfillmentId } = req
+      const { orderId, trackingNo, locations, carrier, status } = req || {}
+
+      if (status != 'READY_TO_SHIP') {
+        throw new Error('Shopify cannot create fulfillment, order status is not READY_TO_SHIP')
+      }
+
       return {
+        payload: {
+          fulfillment: {
+            location_id: locations[0],
+            tracking_number: trackingNo,
+            notify_customer: true,
+            tracking_company: carrier
+          }
+        },
         resource: {
-          orderId: orderId,
-          fulfillmentId: fulfillmentId.toString()
+          orderId
         }
       }
     },

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

@@ -0,0 +1,26 @@
+/*https://shopify.dev/api/admin-rest/2021-10/resources/product-variant#put-variants-variant-id */
+
+export function updateStoreProductPrice() {
+  return {
+    path: '/variants/{variantId}.json',
+    method: 'put',
+    denormalize(req) {
+      let { costPrice, sellPrice, variationId } = req
+
+      return {
+        payload: {
+          variant: {
+            price: costPrice,
+            compare_at_price: sellPrice
+          }
+        },
+        resource: {
+          variantId: variationId
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -0,0 +1,20 @@
+export function updateStoreProductStock() {
+  return {
+    method: 'post',
+    path: '/inventory_levels/adjust.json',
+    denormalize(req) {
+      const { inventoryItemId, locationId: location_id, qty } = (Array.isArray(req) ? req[0] : req) || {}
+
+      return {
+        payload: {
+          inventory_item_id: parseInt(inventoryItemId),
+          location_id,
+          available_adjustment: parseInt(qty)
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+/*https://shopify.dev/api/admin-rest/2021-10/resources/product-variant#put-variants-variant-id */
+
+export function updateStoreProductVariationPrice() {
+  return {
+    path: '/variants/{variantId}.json',
+    method: 'put',
+    denormalize(req) {
+      let { costPrice, sellPrice, variationId } = req
+
+      return {
+        payload: {
+          variant: {
+            price: costPrice,
+            compare_at_price: sellPrice
+          }
+        },
+        resource: {
+          variantId: variationId
+        }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

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

@@ -3,7 +3,7 @@ export function updateStoreProductVariationStock() {
     method: 'post',
     path: '/inventory_levels/adjust.json',
     denormalize(req) {
-      const { inventoryItemId, locationId: location_id, qty } = req[0]
+      const { inventoryItemId, locationId: location_id, qty } = (Array.isArray(req) ? req[0] : req) || {}
 
       return {
         payload: {

package/server/controllers/shopify/shopify.ts

@@ -2,6 +2,8 @@ import fetch from 'node-fetch'
 import crypto from 'crypto'
 import querystring from 'querystring'
 
+import { createPayloadLog } from '@things-factory/integration-base'
+
 const debug = require('debug')('things-factory:integration-marketplace:shopify')
 
 export type ShopifyConfig = {
@@ -77,6 +79,11 @@ export class Shopify {
     var result = await response.json()
     result.link = link
 
+    try {
+      createPayloadLog(shop, path, qs || '', result, {
+        state: { domain: null }
+      })
+    } catch (e) {}
     debug('response result', result)
 
     return result
@@ -101,6 +108,40 @@ export class Shopify {
     })
 
     const result = await response.json()
+    try {
+      createPayloadLog(shop, path, jsondata, result, {
+        state: { domain: null }
+      })
+    } catch (e) {}
+    debug('response result', result)
+
+    return result
+  }
+
+  async put(path: string, data: any = {}) {
+    const { shop, accessToken } = this.config
+
+    debug('data', data)
+
+    const jsondata = JSON.stringify(data)
+
+    const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`
+
+    const response = await fetch(endpoint, {
+      method: 'put',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Shopify-Access-Token': accessToken
+      },
+      body: jsondata
+    })
+
+    const result = await response.json()
+    try {
+      createPayloadLog(shop, path, jsondata, result, {
+        state: { domain: null }
+      })
+    } catch (e) {}
     debug('response result', result)
 
     return result

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

@@ -191,4 +191,7 @@ export class StoreAPI {
 
   @api
   static getStoreOrderPayoutDates(store, req): any {}
+
+  @api
+  static getStoreProductVariationStock(store, req): any {}
 }

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

@@ -20,8 +20,8 @@ export function getStoreOrder() {
     async normalize(res, { store }) {
       const { data } = res
       const orderList = data.order_list
-
       let results: any[] = []
+
       for (let i = 0; i < orderList.length; i++) {
         const order: any = orderList[i]
         const {
@@ -36,6 +36,7 @@ export function getStoreOrder() {
           rts_sla,
           recipient_address: recipientAddress,
           item_list: itemList,
+          order_line_list: orderLineList,
           package_list: packageList,
           delivery_option: deliveryOption
         } = order
@@ -52,13 +53,15 @@ export function getStoreOrder() {
 
         var orderUpdatedAt = new Date(update_time * 1000)
         var orderCreatedAt = new Date(Number(create_time))
-        var slaExpiresAt = new Date(rts_sla * 1000)
+        var slaExpiresAt = Boolean(rts_sla) ? new Date(rts_sla * 1000) : null
         let docRefNo = orderNo
         let isSOF: boolean = false
         if (deliveryOption == 'SEND_BY_SELLER') isSOF = true
 
         let orderItems = itemList.map(item => {
-          var { product_id: name, sku_id, quantity: qty, sku_original_price, sku_sale_price } = item
+          var { sku_id, quantity: qty, sku_original_price, sku_sale_price } = item
+          var matchedOrderLine = orderLineList.find(ol => ol.sku_id == sku_id)
+          var name = matchedOrderLine.order_line_id
 
           return {
             name,

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

@@ -7,16 +7,25 @@ export function getStoreOrders() {
     method: 'post',
     path: '/api/orders/search',
     denormalize(req) {
-      var { pagination, fromDate, toDate, nextCursor } = req || {}
+      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, 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)
+      let payload: any = { page_size: limit }
 
-      var payload: any = {
-        page_size: limit,
-        create_time_from,
-        create_time_to
+      if (fromCreatedDate && toCreatedDate) {
+        const create_time_from = Math.floor(new Date(fromCreatedDate).getTime() / 1000)
+        const create_time_to = Math.floor(new Date(toCreatedDate).getTime() / 1000)
+
+        payload.create_time_from = create_time_from
+        payload.create_time_to = create_time_to
+      }
+
+      if (fromUpdatedDate && toUpdatedDate) {
+        const update_time_from = Math.floor(new Date(fromUpdatedDate).getTime() / 1000)
+        const update_time_to = Math.floor(new Date(toUpdatedDate).getTime() / 1000)
+
+        payload.update_time_from = update_time_from
+        payload.update_time_to = update_time_to
       }
 
       if (nextCursor) payload.cursor = nextCursor
@@ -28,23 +37,16 @@ export function getStoreOrders() {
 
       var more: boolean = data?.more || false
       var nextCursor: string = more ? data.next_cursor : null
-      const orderList: any[] = data?.order_list || []
+      let orderList: any[] = data?.order_list || []
 
       let results: any[] = []
-      let orderIds: any = []
-      for (let i = 0; i < orderList.length; i++) {
-        const order: any = orderList[i]
-        orderIds.push({ ...order })
-
-        if (orderIds.length <= 20) {
-          const orderIdList: any = orderIds.map(orderId => orderId.order_id)
-          const orderDetails: any[] = await StoreAPI.getStoreOrder(store, { orderId: orderIdList })
-          orderDetails.map(orderDetail => {
-            results.push({ ...orderDetail })
-          })
-
-          orderIds = []
-        }
+      while (orderList.length > 0) {
+        let orderIds = orderList.splice(0, orderList.length >= 20 ? 20 : orderList.length)
+        const orderIdList: any = orderIds.map(orderId => orderId.order_id)
+        const orderDetails: any[] = await StoreAPI.getStoreOrder(store, { orderId: orderIdList })
+        orderDetails.map(orderDetail => {
+          results.push({ ...orderDetail })
+        })
       }
 
       return { results, more, nextCursor }

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

@@ -11,11 +11,18 @@ export function getStoreProducts() {
     method: 'post',
     path: '/api/products/search',
     denormalize(req) {
-      var { pagination } = req || {}
+      var { pagination, fromUpdatedDate, toUpdatedDate } = req || {}
       var { page, limit } = pagination || { page: 0, limit: 100 }
 
+      var payload: any = { page_size: limit, page_number: page + 1, search_status: 0 }
+
+      if (fromUpdatedDate && toUpdatedDate) {
+        payload.update_time_from = Math.floor(new Date(fromUpdatedDate).getTime() / 1000)
+        payload.update_time_to = Math.floor(new Date(toUpdatedDate).getTime() / 1000)
+      }
+
       return {
-        payload: { page_size: limit, page_number: page + 1, search_status: 0 },
+        payload,
         resource: {}
       }
     },

package/server/controllers/tiktok/client/tiktok.ts

@@ -92,12 +92,9 @@ export class Tiktok {
     })
 
     if (response.ok) {
-      const result = await response.json()
-      if (result?.code == 0) {
-        return result
-      } else {
-        throw new Error(`(${result.code}) ${result.message}`)
-      }
+      let result = await response.json()
+      result.requiredDocument = true
+      return result
     } else {
       const result = await response.json()
       throw new Error(`(${result.code}) ${result.message}`)

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

@@ -1,3 +1,5 @@
+import { createPayloadLog } from '@things-factory/integration-base'
+
 import { Tiktok } from './client/tiktok'
 
 function substitute(path, obj) {
@@ -47,8 +49,24 @@ export const action = async ({ store, method = 'get', path, request }) => {
   }
 
   if (response.code != 0) {
+    createPayloadLog(
+      store.channelShopId,
+      path,
+      request,
+      response,
+      request?.context ? request.context : { state: { domain: null } }
+    )
+
     throw response
   }
 
+  createPayloadLog(
+    store.channelShopId,
+    path,
+    request,
+    response,
+    request?.context ? request.context : { state: { domain: null } }
+  )
+
   return response
 }

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

@@ -8,11 +8,11 @@ export function getStoreOrders() {
     method: 'get',
     path: '/orders',
     denormalize(req) {
-      var { pagination, fromDate, toDate } = req || {}
+      var { pagination, fromCreatedDate, toCreatedDate } = req || {}
       var { page = 0, limit = 100 } = pagination || {}
 
-      var after = new Date(fromDate).toISOString()
-      var before = new Date(toDate).toISOString()
+      var after = new Date(fromCreatedDate).toISOString()
+      var before = new Date(toCreatedDate).toISOString()
       /* Must include only create_time or update_time in the request. */
       // var update_time_from = lastOneDay
       // var update_time_to = now
@@ -81,7 +81,8 @@ export function getStoreOrders() {
             subtotal,
             subtotal_tax: subtotalTax,
             total,
-            total_tax: totalTax
+            total_tax: totalTax,
+            originalPrice: subtotal
           } = item
 
           return {
@@ -96,7 +97,8 @@ export function getStoreOrders() {
             subtotal,
             subtotalTax,
             total,
-            totalTax
+            totalTax,
+            originalPrice: subtotal
           }
         })