@things-factory/integration-marketplace 3.7.9 → 3.8.10

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
         })
 

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

@@ -1,6 +1,7 @@
 /* https://shopify.dev/docs/admin-api/rest/reference/products/product?api[version]=2020-07#index-2020-07 */
 
 import { URL } from 'url'
+
 import { StoreAPI } from '../../store-api'
 
 export function getStoreProducts() {
@@ -68,6 +69,7 @@ export function getStoreProducts() {
           name: product.title,
           type: product.product_type,
           description: product.body_html,
+          marketplaceStatus: product.status,
           hasVariation: true,
           categoryId: product?.collection_id ? product.collection_id : null,
           attributes: [],
@@ -76,7 +78,7 @@ export function getStoreProducts() {
               variationId: variant.id,
               variationSku: variant.sku,
               channelSku: variant.sku,
-              name: variant.title,
+              name: variant.title == 'Default Title' ? product.title : variant.title,
               qty: variant.inventory_quantity,
               inventoryPolicy: variant.inventory_policy,
               inventoryItemId: variant.inventory_item_id,

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,8 +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 getStoreOrderItemTransactionDetails(store, req): any {}
+
+  @api
+  static updateProductAttribute(store, req): any {}
+
+  @api
+  static getStoreOrderTransactionDetails(store, req): any {}
+
+  @api
+  static updateStoreProductVariationPrice(store, req): any {}
 
   @api
-  static getStoreOrderItemPaymentFee(store, req): any{}
+  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-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
+    }
+  }
+}

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

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

package/server/controllers/woocommerce/woocommerce.ts

@@ -24,13 +24,13 @@ export class Woocommerce {
    * X-WP-Total is to get the total items from the response
    */
   async get(path: string, data: any) {
-    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}${
+    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)

package/server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts

@@ -10,7 +10,7 @@ export const updateMarketplaceSetting = {
       marketplaceSettingPatch.map(async settingPatch => {
         const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOne(settingPatch?.marketplaceStore.id)
         const marketplaceSetting: MarketplaceSetting = await marketplaceSettingRepo.findOne({
-          where: { domain, marketplaceStore }
+          where: { domain, marketplaceStore, category: settingPatch.category }
         })
 
         await marketplaceSettingRepo.save({

package/server/routers/shopify-install-public-router.ts

@@ -1,8 +1,12 @@
 import Router from 'koa-router'
 import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
 import { config } from '@things-factory/env'
 import { getUrlFromContext } from '@things-factory/shell'
+
 import { Shopify } from '../controllers/shopify'
+import { MarketplaceStore } from '../entities'
 
 const debug = require('debug')('things-factory:integration-marketplace:shopify-install-public-router')
 
@@ -121,15 +125,19 @@ shopifyInstallPublicRouter.get('/callback-shopify-install', async (context, next
 })
 
 shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next) => {
-  const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
-  const { apiKey, apiSecret } = shopifyConfig
-
   const { secure } = context
   const { shop: shopUrl } = context.query
   debug('shop', shopUrl)
   if (!shopUrl) {
     context.throw(400, 'shop not found from the request')
   }
+  const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
+    where: { storeURL: shopUrl }
+  })
+
+  if (!marketplaceStore) context.throw(400, 'marketplace store not found')
+
+  const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
   const shop = shopUrl.replace('.myshopify.com', '')
 
   const shopify = new Shopify({ apiKey, apiSecret, shop })
@@ -147,8 +155,6 @@ shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next)
 })
 
 shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (context, next) => {
-  const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
-  const { apiKey, apiSecret } = shopifyConfig
   const { secure } = context
   const { shop: shopUrl, code, state } = context.query
   const stateCookie = context.cookies.get('shopify-install-state')
@@ -162,6 +168,13 @@ shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (conte
     httpOnly: true
   })
 
+  const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
+    where: { storeURL: shopUrl }
+  })
+
+  if (!marketplaceStore) context.throw(400, 'marketplace store not found')
+
+  const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
   const shop = shopUrl.replace('.myshopify.com', '')
 
   const shopify = new Shopify({ apiKey, apiSecret, shop })

package/dist-server/controllers/lazada/apis/get-store-order-item-payment-fee.js

@@ -1,35 +0,0 @@
-"use strict";
-/* https://open.lazada.com/doc/api.htm?spm=a2o9m.11193531.0.0.4f406bbetGwYgx#/api?cid=9&path=/finance/transaction/details/get */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStoreOrderItemPaymentFee = void 0;
-function getStoreOrderItemPaymentFee() {
-    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() + 7);
-            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 filtered = res.filter(item => item.fee_name === 'Payment Fee');
-            let amount = 0;
-            filtered.forEach(item => {
-                amount += parseFloat(item.amount);
-            });
-            return amount;
-        }
-    };
-}
-exports.getStoreOrderItemPaymentFee = getStoreOrderItemPaymentFee;
-//# sourceMappingURL=get-store-order-item-payment-fee.js.map

package/dist-server/controllers/lazada/apis/get-store-order-item-payment-fee.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-store-order-item-payment-fee.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-order-item-payment-fee.ts"],"names":[],"mappings":";AAAA,gIAAgI;;;AAEhI,SAAgB,2BAA2B;IACvC,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,kCAAkC;QACxC,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;YACzC,IAAI,SAAS,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;YACxC,IAAI,OAAO,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;YACtC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YACtC,IAAI,WAAW,GAAG,IAAI,IAAI,CAAA;YAC1B,IAAI,OAAO,GAAG,WAAW,EAAE;gBACvB,OAAO,GAAG,WAAW,CAAA;aACxB;YAED,OAAO;gBACL,UAAU,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1E,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACtE,mBAAmB,EAAE,WAAW;aACjC,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,IAAI,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAA;YAElE,IAAI,MAAM,GAAW,CAAC,CAAA;YACtB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACtB,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACnC,CAAC,CAAC,CAAA;YACF,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;AACH,CAAC;AA9BH,kEA8BG"}

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

@@ -1,34 +0,0 @@
-/* https://open.lazada.com/doc/api.htm?spm=a2o9m.11193531.0.0.4f406bbetGwYgx#/api?cid=9&path=/finance/transaction/details/get */
-
-export function getStoreOrderItemPaymentFee() {
-    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() + 7)
-        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 filtered = res.filter(item => item.fee_name === 'Payment Fee')
-  
-        let amount: number = 0
-        filtered.forEach(item => {
-          amount += parseFloat(item.amount)
-        })
-        return amount
-      }
-    }
-  }
-