@things-factory/integration-marketplace 3.7.11 → 3.8.11

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)
@@ -42,10 +42,14 @@ export class Woocommerce {
     })
 
     const totalItems = response.headers.get('X-WP-Total')
+    const totalPages = response.headers.get('X-WP-TotalPages')
+    const link = response.headers.get('Link')
 
     var result: any = {}
     result.items = await response.json()
     result.totalItems = totalItems
+    result.totalPages = totalPages
+    result.link = link
 
     debug('response result', result)
 

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