@things-factory/integration-marketplace 5.0.14 → 6.0.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/controllers/lazada/client/lazada.js +2 -2
- package/dist-server/controllers/lazada/client/lazada.js.map +1 -1
- package/dist-server/controllers/magento/apis/create-order-ship.js +1 -1
- package/dist-server/controllers/magento/apis/create-order-ship.js.map +1 -1
- package/dist-server/controllers/shopee/index.js +10 -1
- package/dist-server/controllers/shopee/index.js.map +1 -1
- package/dist-server/controllers/shopee/platform-action.js +33 -1
- package/dist-server/controllers/shopee/platform-action.js.map +1 -1
- package/dist-server/controllers/shopee/refresh-access-token.js +2 -1
- package/dist-server/controllers/shopee/refresh-access-token.js.map +1 -1
- package/dist-server/controllers/shopee/shopee.js +81 -0
- package/dist-server/controllers/shopee/shopee.js.map +1 -1
- package/dist-server/controllers/shopify/apis/get-store-orders.js +45 -30
- package/dist-server/controllers/shopify/apis/get-store-orders.js.map +1 -1
- package/dist-server/controllers/shopify/apis/get-store-products.js +5 -10
- package/dist-server/controllers/shopify/apis/get-store-products.js.map +1 -1
- package/dist-server/controllers/shopify/shopify.js +15 -19
- package/dist-server/controllers/shopify/shopify.js.map +1 -1
- package/dist-server/controllers/store-api/index.js +32 -4
- package/dist-server/controllers/store-api/index.js.map +1 -1
- package/dist-server/controllers/tiktok/apis/get-store-order.js +20 -18
- package/dist-server/controllers/tiktok/apis/get-store-order.js.map +1 -1
- package/dist-server/controllers/tiktok/apis/get-store-orders.js +1 -1
- package/dist-server/controllers/tiktok/apis/get-store-orders.js.map +1 -1
- package/dist-server/controllers/tiktok/apis/update-order-status.js +4 -4
- package/dist-server/controllers/tiktok/apis/update-order-status.js.map +1 -1
- package/dist-server/controllers/tiktok/platform-action.js +14 -3
- package/dist-server/controllers/tiktok/platform-action.js.map +1 -1
- package/dist-server/engine/connector/lazada-connector.js +5 -5
- package/dist-server/engine/connector/lazada-connector.js.map +1 -1
- package/dist-server/engine/task/marketplace-api.js +4 -4
- package/dist-server/engine/task/marketplace-api.js.map +1 -1
- package/dist-server/entities/marketplace-distributor.js +3 -4
- package/dist-server/entities/marketplace-distributor.js.map +1 -1
- package/dist-server/entities/marketplace-setting.js +3 -4
- package/dist-server/entities/marketplace-setting.js.map +1 -1
- package/dist-server/entities/marketplace-store.js +3 -4
- package/dist-server/entities/marketplace-store.js.map +1 -1
- package/dist-server/entities/marketplace-transporter.js +6 -6
- package/dist-server/entities/marketplace-transporter.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/create-marketplace-distributor.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/create-marketplace-distributor.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributor.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributor.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributors.js +3 -2
- package/dist-server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributors.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/marketplace-distributor-query.js +8 -6
- package/dist-server/graphql/resolvers/marketplace-distributor/marketplace-distributor-query.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/update-marketplace-distributor.js +4 -2
- package/dist-server/graphql/resolvers/marketplace-distributor/update-marketplace-distributor.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-distributor/update-multiple-marketplace-distributor.js +6 -3
- package/dist-server/graphql/resolvers/marketplace-distributor/update-multiple-marketplace-distributor.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/create-marketplace-setting.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-setting/create-marketplace-setting.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/delete-marketplace-setting.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-setting/delete-marketplace-setting.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/delete-marketplace-settings.js +2 -1
- package/dist-server/graphql/resolvers/marketplace-setting/delete-marketplace-settings.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/marketplace-setting-query.js +7 -5
- package/dist-server/graphql/resolvers/marketplace-setting/marketplace-setting-query.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js +8 -2
- package/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/update-multiple-marketplace-setting.js +6 -3
- package/dist-server/graphql/resolvers/marketplace-setting/update-multiple-marketplace-setting.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/create-marketplace-store.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-store/create-marketplace-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/delete-marketplace-store.js +4 -4
- package/dist-server/graphql/resolvers/marketplace-store/delete-marketplace-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/delete-marketplace-stores.js +4 -3
- package/dist-server/graphql/resolvers/marketplace-store/delete-marketplace-stores.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/lazada/deactivate-lazada-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/lazada/deactivate-lazada-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/lazada/generate-lazada-access-token.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/lazada/generate-lazada-access-token.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/lazada/get-lazada-auth-url.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/magento/activate-magento-store.js +4 -2
- package/dist-server/graphql/resolvers/marketplace-store/magento/activate-magento-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/magento/deactivate-magento-store.js +3 -4
- package/dist-server/graphql/resolvers/marketplace-store/magento/deactivate-magento-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/magento/get-magento-auth-url.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-store/magento/get-magento-auth-url.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/marketplace-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/marketplace-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/marketplace-stores.js +1 -2
- package/dist-server/graphql/resolvers/marketplace-store/marketplace-stores.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/shopee/deactivate-shopee-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/shopee/deactivate-shopee-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/shopee/generate-shopee-access-token.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-store/shopee/generate-shopee-access-token.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/shopee/get-shopee-auth-url.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/shopify/deactivate-shopify-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/shopify/deactivate-shopify-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/shopify/get-shopify-auth-url.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/shopify/get-shopify-auth-url.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/update-marketplace-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/update-marketplace-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/update-multiple-marketplace-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/update-multiple-marketplace-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/woocommerce/deactivate-woocommerce-store.js +4 -4
- package/dist-server/graphql/resolvers/marketplace-store/woocommerce/deactivate-woocommerce-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/woocommerce/get-woocommerce-auth-url.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-store/woocommerce/get-woocommerce-auth-url.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/zalora/deactivate-zalora-store.js +3 -3
- package/dist-server/graphql/resolvers/marketplace-store/zalora/deactivate-zalora-store.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/zalora/generate-zalora-access-token.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-store/zalora/generate-zalora-access-token.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/create-marketplace-transporter.js +4 -4
- package/dist-server/graphql/resolvers/marketplace-transporter/create-marketplace-transporter.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporter.js +2 -2
- package/dist-server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporter.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporters.js +2 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporters.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/marketplace-transporter-query.js +10 -6
- package/dist-server/graphql/resolvers/marketplace-transporter/marketplace-transporter-query.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/update-marketplace-transporter.js +5 -2
- package/dist-server/graphql/resolvers/marketplace-transporter/update-marketplace-transporter.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-transporter/update-multiple-marketplace-transporter.js +6 -3
- package/dist-server/graphql/resolvers/marketplace-transporter/update-multiple-marketplace-transporter.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/accept-store-order-cancellation.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/cancel-store-order.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/get-store-order-document.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/get-store-order-items.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/get-store-order.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/get-store-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/reject-store-order-cancellation.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/set-store-order-status-packed-by-marketplace.js.map +1 -1
- package/dist-server/graphql/resolvers/store-order/set-store-order-status-ready-to-ship.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/create-store-product-variations.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/create-store-product.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/delete-store-product.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/get-store-product-brands.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/get-store-product-categories.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/get-store-product-category-attributes.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/get-store-product.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/get-store-products.js.map +1 -1
- package/dist-server/graphql/resolvers/store-product/update-store-product.js.map +1 -1
- package/dist-server/routers/magento-private-router.js +7 -8
- package/dist-server/routers/magento-private-router.js.map +1 -1
- package/dist-server/routers/shopify-install-private-router.js +8 -9
- package/dist-server/routers/shopify-install-private-router.js.map +1 -1
- package/dist-server/routers/shopify-install-public-router.js +2 -3
- package/dist-server/routers/shopify-install-public-router.js.map +1 -1
- package/dist-server/routers/shopify-private-router.js +6 -7
- package/dist-server/routers/shopify-private-router.js.map +1 -1
- package/dist-server/routers/shopify-public-router.js +7 -8
- package/dist-server/routers/shopify-public-router.js.map +1 -1
- package/dist-server/routers/woocommerce-router.js +6 -6
- package/dist-server/routers/woocommerce-router.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -16
- package/server/controllers/lazada/client/lazada.ts +2 -1
- package/server/controllers/magento/apis/create-order-ship.ts +1 -1
- package/server/controllers/shopee/apis2/create-shipping-document.ts +27 -0
- package/server/controllers/shopee/apis2/echo.ts +14 -0
- package/server/controllers/shopee/apis2/get-logistics-param.ts +66 -0
- package/server/controllers/shopee/apis2/get-shipping-document-result.ts +21 -0
- package/server/controllers/shopee/apis2/get-store-logistics.ts +23 -0
- package/server/controllers/shopee/apis2/get-store-order-by-batch.ts +97 -0
- package/server/controllers/shopee/apis2/get-store-order-document.ts +39 -0
- package/server/controllers/shopee/apis2/get-store-order-payout-dates.ts +33 -0
- package/server/controllers/shopee/apis2/get-store-order-transaction-details.ts +28 -0
- package/server/controllers/shopee/apis2/get-store-order.ts +93 -0
- package/server/controllers/shopee/apis2/get-store-orders.ts +40 -0
- package/server/controllers/shopee/apis2/get-store-product-variations.ts +17 -0
- package/server/controllers/shopee/apis2/get-store-product.ts +105 -0
- package/server/controllers/shopee/apis2/get-store-products.ts +28 -0
- package/server/controllers/shopee/apis2/get-store-refund-order-details.ts +39 -0
- package/server/controllers/shopee/apis2/get-store-refund-orders.ts +37 -0
- package/server/controllers/shopee/apis2/get-tracking-number.ts +17 -0
- package/server/controllers/shopee/apis2/index.ts +20 -0
- package/server/controllers/shopee/apis2/init-logistics.ts +39 -0
- package/server/controllers/shopee/apis2/update-store-product-stock.ts +26 -0
- package/server/controllers/shopee/apis2/update-store-product-variation-stock.ts +28 -0
- package/server/controllers/shopee/index.ts +11 -2
- package/server/controllers/shopee/platform-action.ts +36 -0
- package/server/controllers/shopee/refresh-access-token.ts +78 -0
- package/server/controllers/shopee/shopee.ts +95 -0
- package/server/controllers/shopify/apis/get-store-orders.ts +46 -30
- package/server/controllers/shopify/apis/get-store-products.ts +3 -8
- package/server/controllers/shopify/shopify.ts +15 -15
- package/server/controllers/store-api/index.ts +14 -2
- package/server/controllers/tiktok/apis/get-store-order.ts +26 -24
- package/server/controllers/tiktok/apis/get-store-orders.ts +1 -1
- package/server/controllers/tiktok/apis/update-order-status.ts +4 -4
- package/server/controllers/tiktok/platform-action.ts +14 -14
- package/server/engine/connector/lazada-connector.ts +5 -4
- package/server/engine/task/marketplace-api.ts +4 -3
- package/server/graphql/resolvers/marketplace-distributor/create-marketplace-distributor.ts +2 -2
- package/server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributor.ts +4 -3
- package/server/graphql/resolvers/marketplace-distributor/delete-marketplace-distributors.ts +6 -3
- package/server/graphql/resolvers/marketplace-distributor/marketplace-distributor-query.ts +13 -9
- package/server/graphql/resolvers/marketplace-distributor/update-marketplace-distributor.ts +5 -5
- package/server/graphql/resolvers/marketplace-distributor/update-multiple-marketplace-distributor.ts +7 -3
- package/server/graphql/resolvers/marketplace-setting/create-marketplace-setting.ts +3 -3
- package/server/graphql/resolvers/marketplace-setting/delete-marketplace-setting.ts +4 -4
- package/server/graphql/resolvers/marketplace-setting/delete-marketplace-settings.ts +9 -7
- package/server/graphql/resolvers/marketplace-setting/marketplace-setting-query.ts +11 -8
- package/server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts +9 -3
- package/server/graphql/resolvers/marketplace-setting/update-multiple-marketplace-setting.ts +32 -29
- package/server/graphql/resolvers/marketplace-store/create-marketplace-store.ts +3 -2
- package/server/graphql/resolvers/marketplace-store/delete-marketplace-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/delete-marketplace-stores.ts +6 -3
- package/server/graphql/resolvers/marketplace-store/lazada/deactivate-lazada-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/lazada/generate-lazada-access-token.ts +2 -2
- package/server/graphql/resolvers/marketplace-store/lazada/get-lazada-auth-url.ts +1 -1
- package/server/graphql/resolvers/marketplace-store/magento/activate-magento-store.ts +5 -3
- package/server/graphql/resolvers/marketplace-store/magento/deactivate-magento-store.ts +4 -4
- package/server/graphql/resolvers/marketplace-store/magento/get-magento-auth-url.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/marketplace-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/marketplace-stores.ts +3 -3
- package/server/graphql/resolvers/marketplace-store/shopee/deactivate-shopee-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/shopee/generate-shopee-access-token.ts +3 -3
- package/server/graphql/resolvers/marketplace-store/shopee/get-shopee-auth-url.ts +1 -1
- package/server/graphql/resolvers/marketplace-store/shopify/deactivate-shopify-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/shopify/get-shopify-auth-url.ts +4 -4
- package/server/graphql/resolvers/marketplace-store/update-marketplace-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/update-multiple-marketplace-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/woocommerce/deactivate-woocommerce-store.ts +5 -5
- package/server/graphql/resolvers/marketplace-store/woocommerce/get-woocommerce-auth-url.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/zalora/deactivate-zalora-store.ts +4 -3
- package/server/graphql/resolvers/marketplace-store/zalora/generate-zalora-access-token.ts +2 -2
- package/server/graphql/resolvers/marketplace-transporter/create-marketplace-transporter.ts +7 -5
- package/server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporter.ts +4 -4
- package/server/graphql/resolvers/marketplace-transporter/delete-marketplace-transporters.ts +9 -7
- package/server/graphql/resolvers/marketplace-transporter/marketplace-transporter-query.ts +17 -12
- package/server/graphql/resolvers/marketplace-transporter/update-marketplace-transporter.ts +8 -5
- package/server/graphql/resolvers/marketplace-transporter/update-multiple-marketplace-transporter.ts +32 -29
- package/server/graphql/resolvers/store-order/accept-store-order-cancellation.ts +1 -1
- package/server/graphql/resolvers/store-order/cancel-store-order.ts +1 -1
- package/server/graphql/resolvers/store-order/get-store-order-document.ts +1 -1
- package/server/graphql/resolvers/store-order/get-store-order-items.ts +1 -1
- package/server/graphql/resolvers/store-order/get-store-order.ts +1 -1
- package/server/graphql/resolvers/store-order/get-store-orders.ts +1 -1
- package/server/graphql/resolvers/store-order/reject-store-order-cancellation.ts +1 -1
- package/server/graphql/resolvers/store-order/set-store-order-status-packed-by-marketplace.ts +1 -1
- package/server/graphql/resolvers/store-order/set-store-order-status-ready-to-ship.ts +1 -1
- package/server/graphql/resolvers/store-product/create-store-product-variations.ts +1 -1
- package/server/graphql/resolvers/store-product/create-store-product.ts +1 -1
- package/server/graphql/resolvers/store-product/delete-store-product.ts +1 -1
- package/server/graphql/resolvers/store-product/get-store-product-brands.ts +1 -1
- package/server/graphql/resolvers/store-product/get-store-product-categories.ts +1 -1
- package/server/graphql/resolvers/store-product/get-store-product-category-attributes.ts +1 -1
- package/server/graphql/resolvers/store-product/get-store-product.ts +1 -1
- package/server/graphql/resolvers/store-product/get-store-products.ts +1 -1
- package/server/graphql/resolvers/store-product/update-store-product.ts +1 -1
- package/server/routers/magento-private-router.ts +3 -4
- package/server/routers/shopify-install-private-router.ts +4 -5
- package/server/routers/shopify-install-public-router.ts +1 -2
- package/server/routers/shopify-private-router.ts +6 -6
- package/server/routers/shopify-public-router.ts +6 -5
- package/server/routers/woocommerce-router.ts +4 -3
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { In } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { getRepository } from '@things-factory/shell'
|
|
4
|
+
|
|
2
5
|
import { MarketplaceTransporter } from '../../../entities'
|
|
3
6
|
|
|
4
7
|
export const deleteMarketplaceTransporters = {
|
|
5
|
-
async deleteMarketplaceTransporters(_: any, { names }, context:
|
|
8
|
+
async deleteMarketplaceTransporters(_: any, { names }, context: ResolverContext) {
|
|
6
9
|
const { domain, user } = context.state
|
|
7
10
|
|
|
8
|
-
await getRepository(MarketplaceTransporter).delete({
|
|
9
|
-
|
|
10
|
-
|
|
11
|
+
await getRepository(MarketplaceTransporter).delete({
|
|
12
|
+
domain,
|
|
13
|
+
name: In(names)
|
|
11
14
|
})
|
|
12
|
-
|
|
15
|
+
|
|
13
16
|
return true
|
|
14
17
|
}
|
|
15
18
|
}
|
|
16
|
-
|
|
@@ -1,22 +1,24 @@
|
|
|
1
|
-
import { convertListParams,
|
|
2
|
-
|
|
3
|
-
import { MarketplaceTransporter as MarketplaceTransporterEntity
|
|
1
|
+
import { convertListParams, getRepository, ListParam } from '@things-factory/shell'
|
|
2
|
+
|
|
3
|
+
import { MarketplaceStore, MarketplaceTransporter as MarketplaceTransporterEntity } from '../../../entities'
|
|
4
4
|
|
|
5
5
|
export const Query = {
|
|
6
|
-
async marketplaceTransporter(_: any, { marketplaceStoreId }, context:
|
|
7
|
-
const { domain, tx }
|
|
8
|
-
const marketplaceStore: MarketplaceStore = await tx
|
|
6
|
+
async marketplaceTransporter(_: any, { marketplaceStoreId }, context: ResolverContext) {
|
|
7
|
+
const { domain, tx } = context.state
|
|
8
|
+
const marketplaceStore: MarketplaceStore = await tx
|
|
9
|
+
.getRepository(MarketplaceStore)
|
|
10
|
+
.findOneBy({ id: marketplaceStoreId })
|
|
9
11
|
|
|
10
12
|
const marketplaceTransporter = await tx.getRepository(MarketplaceTransporterEntity).findOne({
|
|
11
|
-
where: { domain, marketplaceStore },
|
|
13
|
+
where: { domain: { id: domain.id }, marketplaceStore: { id: marketplaceStore.id } },
|
|
12
14
|
relations: ['marketplaceStore', 'deliveryTransporter', 'pickupTransporter']
|
|
13
15
|
})
|
|
14
16
|
|
|
15
17
|
return marketplaceTransporter
|
|
16
18
|
},
|
|
17
19
|
|
|
18
|
-
async marketplaceTransporters(_: any, params: ListParam, context:
|
|
19
|
-
const { tx }
|
|
20
|
+
async marketplaceTransporters(_: any, params: ListParam, context: ResolverContext) {
|
|
21
|
+
const { tx } = context.state
|
|
20
22
|
|
|
21
23
|
const convertedParams = convertListParams(params)
|
|
22
24
|
const [items, total] = await tx.getRepository(MarketplaceTransporterEntity).findAndCount({
|
|
@@ -31,7 +33,8 @@ export const Query = {
|
|
|
31
33
|
export const MarketplaceTransporter = {
|
|
32
34
|
async domain(marketplaceTransporter) {
|
|
33
35
|
return (
|
|
34
|
-
await getRepository(MarketplaceTransporterEntity).findOne(
|
|
36
|
+
await getRepository(MarketplaceTransporterEntity).findOne({
|
|
37
|
+
where: { id: marketplaceTransporter.id },
|
|
35
38
|
relations: ['domain']
|
|
36
39
|
})
|
|
37
40
|
)?.domain
|
|
@@ -39,7 +42,8 @@ export const MarketplaceTransporter = {
|
|
|
39
42
|
|
|
40
43
|
async creator(marketplaceTransporter) {
|
|
41
44
|
return (
|
|
42
|
-
await getRepository(MarketplaceTransporterEntity).findOne(
|
|
45
|
+
await getRepository(MarketplaceTransporterEntity).findOne({
|
|
46
|
+
where: { id: marketplaceTransporter.id },
|
|
43
47
|
relations: ['creator']
|
|
44
48
|
})
|
|
45
49
|
)?.creator
|
|
@@ -47,7 +51,8 @@ export const MarketplaceTransporter = {
|
|
|
47
51
|
|
|
48
52
|
async updater(marketplaceTransporter) {
|
|
49
53
|
return (
|
|
50
|
-
await getRepository(MarketplaceTransporterEntity).findOne(
|
|
54
|
+
await getRepository(MarketplaceTransporterEntity).findOne({
|
|
55
|
+
where: { id: marketplaceTransporter.id },
|
|
51
56
|
relations: ['updater']
|
|
52
57
|
})
|
|
53
58
|
)?.updater
|
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
import { CourierService } from '@things-factory/integration-lmd'
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { MarketplaceTransporter } from '../../../entities'
|
|
4
4
|
|
|
5
5
|
export const updateMarketplaceTransporter = {
|
|
6
|
-
async updateMarketplaceTransporter(_: any, { marketplaceStoreId, deliveryTransporter }, context:
|
|
6
|
+
async updateMarketplaceTransporter(_: any, { marketplaceStoreId, deliveryTransporter }, context: ResolverContext) {
|
|
7
7
|
const { domain, user, tx } = context.state
|
|
8
8
|
const marketplaceTransporterRepo = tx.getRepository(MarketplaceTransporter)
|
|
9
9
|
|
|
10
10
|
const marketplaceTransporter: MarketplaceTransporter = await marketplaceTransporterRepo.findOne({
|
|
11
|
-
where: {
|
|
11
|
+
where: {
|
|
12
|
+
domain: { id: domain.id },
|
|
13
|
+
marketplaceStore: { id: marketplaceStoreId }
|
|
14
|
+
},
|
|
12
15
|
relations: ['deliveryTransporter', 'pickupTransporter']
|
|
13
16
|
})
|
|
14
17
|
|
|
15
18
|
return await marketplaceTransporterRepo.save({
|
|
16
19
|
...marketplaceTransporter,
|
|
17
|
-
deliveryTransporter: await tx.getRepository(CourierService).
|
|
18
|
-
pickupTransporter: await tx.getRepository(CourierService).
|
|
20
|
+
deliveryTransporter: await tx.getRepository(CourierService).findOneBy({ id: deliveryTransporter }),
|
|
21
|
+
pickupTransporter: await tx.getRepository(CourierService).findOneBy({ id: deliveryTransporter }),
|
|
19
22
|
updater: user
|
|
20
23
|
})
|
|
21
24
|
}
|
package/server/graphql/resolvers/marketplace-transporter/update-multiple-marketplace-transporter.ts
CHANGED
|
@@ -1,46 +1,49 @@
|
|
|
1
|
-
import { getRepository } from '
|
|
1
|
+
import { getRepository } from '@things-factory/shell'
|
|
2
|
+
|
|
2
3
|
import { MarketplaceTransporter } from '../../../entities'
|
|
3
4
|
|
|
4
5
|
export const updateMultipleMarketplaceTransporter = {
|
|
5
|
-
async updateMultipleMarketplaceTransporter(_: any, { patches }, context:
|
|
6
|
+
async updateMultipleMarketplaceTransporter(_: any, { patches }, context: ResolverContext) {
|
|
6
7
|
const { domain, user } = context.state
|
|
7
|
-
|
|
8
|
+
|
|
8
9
|
let results = []
|
|
9
10
|
const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
|
|
10
11
|
const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
|
|
11
12
|
const marketplaceTransporterRepo = getRepository(MarketplaceTransporter)
|
|
12
13
|
|
|
13
14
|
if (_createRecords.length > 0) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
15
|
+
for (let i = 0; i < _createRecords.length; i++) {
|
|
16
|
+
const newRecord = _createRecords[i]
|
|
17
|
+
|
|
18
|
+
const result = await marketplaceTransporterRepo.save({
|
|
19
|
+
...newRecord,
|
|
20
|
+
domain: domain,
|
|
21
|
+
creator: user,
|
|
22
|
+
updater: user
|
|
23
|
+
})
|
|
24
|
+
|
|
25
|
+
results.push({ ...result, cuFlag: '+' })
|
|
26
|
+
}
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
if (_updateRecords.length > 0) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
30
|
+
for (let i = 0; i < _updateRecords.length; i++) {
|
|
31
|
+
const newRecord = _updateRecords[i]
|
|
32
|
+
const marketplaceTransporter = await marketplaceTransporterRepo.findOneBy({
|
|
33
|
+
domain: { id: domain.id },
|
|
34
|
+
id: newRecord.id
|
|
35
|
+
})
|
|
36
|
+
|
|
37
|
+
const result = await marketplaceTransporterRepo.save({
|
|
38
|
+
...marketplaceTransporter,
|
|
39
|
+
...newRecord,
|
|
40
|
+
updater: user
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
results.push({ ...result, cuFlag: 'M' })
|
|
44
|
+
}
|
|
41
45
|
}
|
|
42
|
-
|
|
46
|
+
|
|
43
47
|
return results
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
|
-
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const acceptStoreOrderCancellation = {
|
|
4
|
-
async acceptStoreOrderCancellation(_: any, { storeId, orderId }, context:
|
|
4
|
+
async acceptStoreOrderCancellation(_: any, { storeId, orderId }, context: ResolverContext) {
|
|
5
5
|
// only in Shopee, to accept buyer order cancellation
|
|
6
6
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
7
7
|
return await StoreAPI.acceptStoreOrderCancellation(store, orderId)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const cancelStoreOrder = {
|
|
4
|
-
async cancelStoreOrder(_: any, { storeId, cancelInformation }, context:
|
|
4
|
+
async cancelStoreOrder(_: any, { storeId, cancelInformation }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.cancelStoreOrder(store, cancelInformation)
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreOrderDocument = {
|
|
4
|
-
async getStoreOrderDocument(_: any, { storeId, docType, orderItemId }, context:
|
|
4
|
+
async getStoreOrderDocument(_: any, { storeId, docType, orderItemId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreOrderDocument(store, { docType, orderItemId })
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreOrderItems = {
|
|
4
|
-
async getStoreOrderItems(_: any, { storeId, orderId }, context:
|
|
4
|
+
async getStoreOrderItems(_: any, { storeId, orderId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreOrderItems(store, { orderId })
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreOrder = {
|
|
4
|
-
async getStoreOrder(_: any, { storeId, orderId }, context:
|
|
4
|
+
async getStoreOrder(_: any, { storeId, orderId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreOrder(store, { orderId })
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreOrders = {
|
|
4
|
-
async getStoreOrders(_: any, { storeId }, context:
|
|
4
|
+
async getStoreOrders(_: any, { storeId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreOrders(store, {
|
|
7
7
|
pagination: {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const rejectStoreOrderCancellation = {
|
|
4
|
-
async rejectStoreOrderCancellation(_: any, { storeId, orderId }, context:
|
|
4
|
+
async rejectStoreOrderCancellation(_: any, { storeId, orderId }, context: ResolverContext) {
|
|
5
5
|
// only in Shopee, to reject buyer order cancellation
|
|
6
6
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
7
7
|
return await StoreAPI.rejectStoreOrderCancellation(store, orderId)
|
package/server/graphql/resolvers/store-order/set-store-order-status-packed-by-marketplace.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const setStoreOrderStatusPackedByMarketplace = {
|
|
4
|
-
async setStoreOrderStatusPackedByMarketplace(_: any, { storeId, deliveryInformation }, context:
|
|
4
|
+
async setStoreOrderStatusPackedByMarketplace(_: any, { storeId, deliveryInformation }, context: ResolverContext) {
|
|
5
5
|
// set status to packed by marketplace (Lazada)
|
|
6
6
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
7
7
|
return await StoreAPI.setStoreOrderStatusPackedByMarketplace(store, deliveryInformation)
|
|
@@ -2,7 +2,7 @@ import { config } from '@things-factory/env'
|
|
|
2
2
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
3
3
|
|
|
4
4
|
export const setStoreOrderStatusReadyToShip = {
|
|
5
|
-
async setStoreOrderStatusReadyToShip(_: any, { storeId, deliveryInformation }, context:
|
|
5
|
+
async setStoreOrderStatusReadyToShip(_: any, { storeId, deliveryInformation }, context: ResolverContext) {
|
|
6
6
|
// set status to ready to ship (Lazada)
|
|
7
7
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
8
8
|
return await StoreAPI.setStoreOrderStatusReadyToShip(store, deliveryInformation)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const createStoreProductVariations = {
|
|
4
|
-
async createStoreProductVariations(_: any, { storeId, itemId, variations }, context:
|
|
4
|
+
async createStoreProductVariations(_: any, { storeId, itemId, variations }, context: ResolverContext) {
|
|
5
5
|
// only in Shopee
|
|
6
6
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
7
7
|
return await StoreAPI.createStoreProductVariations(store, { itemId, variations })
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const createStoreProduct = {
|
|
4
|
-
async createStoreProduct(_: any, { storeId, productInformation }, context:
|
|
4
|
+
async createStoreProduct(_: any, { storeId, productInformation }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.createStoreProduct(store, productInformation)
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const deleteStoreProduct = {
|
|
4
|
-
async deleteStoreProduct(_: any, { storeId, itemList }, context:
|
|
4
|
+
async deleteStoreProduct(_: any, { storeId, itemList }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.deleteStoreProduct(store, itemList)
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreProductBrands = {
|
|
4
|
-
async getStoreProductBrands(_: any, { storeId }, context:
|
|
4
|
+
async getStoreProductBrands(_: any, { storeId }, context: ResolverContext) {
|
|
5
5
|
// only in Lazada
|
|
6
6
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
7
7
|
return await StoreAPI.getStoreProductBrands(store, {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreProductCategories = {
|
|
4
|
-
async getStoreProductCategories(_: any, { storeId }, context:
|
|
4
|
+
async getStoreProductCategories(_: any, { storeId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreProductCategories(store)
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreProductCategoryAttributes = {
|
|
4
|
-
async getStoreProductCategoryAttributes(_: any, { storeId, categoryId, isCrossBorder }, context:
|
|
4
|
+
async getStoreProductCategoryAttributes(_: any, { storeId, categoryId, isCrossBorder }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreProductCategoryAttributes(store, {
|
|
7
7
|
categoryId,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreProduct = {
|
|
4
|
-
async getStoreProduct(_: any, { storeId, itemId }, context:
|
|
4
|
+
async getStoreProduct(_: any, { storeId, itemId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreProduct(store, itemId)
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const getStoreProducts = {
|
|
4
|
-
async getStoreProducts(_: any, { storeId }, context:
|
|
4
|
+
async getStoreProducts(_: any, { storeId }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.getStoreProducts(store, {
|
|
7
7
|
pagination: {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { StoreAPI } from '../../../controllers/store-api'
|
|
2
2
|
|
|
3
3
|
export const updateStoreProduct = {
|
|
4
|
-
async updateStoreProduct(_: any, { storeId, productInformation }, context:
|
|
4
|
+
async updateStoreProduct(_: any, { storeId, productInformation }, context: ResolverContext) {
|
|
5
5
|
var store = await StoreAPI.getMarketplaceStore(storeId)
|
|
6
6
|
return await StoreAPI.updateStoreProduct(store, productInformation)
|
|
7
7
|
}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
2
|
import fetch from 'node-fetch'
|
|
3
|
-
import { getRepository } from 'typeorm'
|
|
4
3
|
import { v4 as uuidv4 } from 'uuid'
|
|
5
4
|
|
|
6
5
|
import { config } from '@things-factory/env'
|
|
7
|
-
import { getRedirectSubdomainPath } from '@things-factory/shell'
|
|
6
|
+
import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
|
|
8
7
|
|
|
9
8
|
import { Magento } from '../controllers/magento'
|
|
10
9
|
import { MarketplaceSetting, MarketplaceStore } from '../entities'
|
|
@@ -129,7 +128,7 @@ magentoPrivateRouter.get(
|
|
|
129
128
|
// need to get or save marketplace-store here
|
|
130
129
|
var marketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
131
130
|
where: {
|
|
132
|
-
domain,
|
|
131
|
+
domain: { id: domain.id },
|
|
133
132
|
storeId: oauthVerifier,
|
|
134
133
|
platform: 'magento'
|
|
135
134
|
}
|
|
@@ -168,7 +167,7 @@ magentoPrivateRouter.get(
|
|
|
168
167
|
|
|
169
168
|
marketplaceSettingCategories.forEach(async category => {
|
|
170
169
|
const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
|
|
171
|
-
where: { marketplaceStore, domain, category }
|
|
170
|
+
where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: domain.id }, category }
|
|
172
171
|
})
|
|
173
172
|
|
|
174
173
|
if (!foundMarketplaceSetting) {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
|
-
import { getRepository } from 'typeorm'
|
|
3
2
|
import { v4 as uuidv4 } from 'uuid'
|
|
4
3
|
|
|
5
4
|
import { config } from '@things-factory/env'
|
|
6
|
-
import { getRedirectSubdomainPath } from '@things-factory/shell'
|
|
5
|
+
import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
|
|
7
6
|
|
|
8
7
|
import { MarketplaceSetting, MarketplaceStore } from '../entities'
|
|
9
8
|
import { STORE_STATUS } from '../graphql/constants'
|
|
@@ -32,7 +31,7 @@ shopifyInstallPrivateRouter.get(
|
|
|
32
31
|
// need to get or save marketplace-store here
|
|
33
32
|
var marketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
34
33
|
where: {
|
|
35
|
-
domain,
|
|
34
|
+
domain: { id: domain.id },
|
|
36
35
|
storeId: shop,
|
|
37
36
|
platform: 'shopify'
|
|
38
37
|
}
|
|
@@ -40,7 +39,7 @@ shopifyInstallPrivateRouter.get(
|
|
|
40
39
|
|
|
41
40
|
if (!marketplaceStore) {
|
|
42
41
|
marketplaceStore = await getRepository(MarketplaceStore).save({
|
|
43
|
-
domain,
|
|
42
|
+
domain: { id: domain.id },
|
|
44
43
|
platform: 'shopify',
|
|
45
44
|
name: 'shopify-' + shop,
|
|
46
45
|
storeId: shop,
|
|
@@ -71,7 +70,7 @@ shopifyInstallPrivateRouter.get(
|
|
|
71
70
|
|
|
72
71
|
marketplaceSettingCategories.forEach(async category => {
|
|
73
72
|
const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
|
|
74
|
-
where: { marketplaceStore, domain, category }
|
|
73
|
+
where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: domain.id }, category }
|
|
75
74
|
})
|
|
76
75
|
|
|
77
76
|
if (!foundMarketplaceSetting) {
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
2
|
import fetch from 'node-fetch'
|
|
3
|
-
import { getRepository } from 'typeorm'
|
|
4
3
|
|
|
5
4
|
import { config } from '@things-factory/env'
|
|
6
|
-
import { getUrlFromContext } from '@things-factory/shell'
|
|
5
|
+
import { getRepository, getUrlFromContext } from '@things-factory/shell'
|
|
7
6
|
|
|
8
7
|
import { Shopify } from '../controllers/shopify'
|
|
9
8
|
import { MarketplaceStore } from '../entities'
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
|
-
import { getRepository } from 'typeorm'
|
|
3
2
|
import { v4 as uuidv4 } from 'uuid'
|
|
4
|
-
|
|
5
|
-
import { getUrlFromContext } from '@things-factory/shell'
|
|
3
|
+
|
|
6
4
|
import { VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
|
|
7
|
-
import {
|
|
5
|
+
import { config } from '@things-factory/env'
|
|
6
|
+
import { getRepository, getUrlFromContext } from '@things-factory/shell'
|
|
8
7
|
|
|
9
|
-
import {
|
|
8
|
+
import { Shopify } from '../controllers/shopify'
|
|
9
|
+
import { MarketplaceSetting, MarketplaceStore } from '../entities'
|
|
10
10
|
import { STORE_STATUS } from '../graphql/constants'
|
|
11
11
|
|
|
12
12
|
const shopifyConfig = config.get('marketplaceIntegrationShopify', {})
|
|
@@ -32,7 +32,7 @@ shopifyPrivateRouter.get(
|
|
|
32
32
|
// need to get or save marketplace-store here
|
|
33
33
|
var marketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
34
34
|
where: {
|
|
35
|
-
domain,
|
|
35
|
+
domain: { id: domain.id },
|
|
36
36
|
storeId: shop,
|
|
37
37
|
platform: 'shopify'
|
|
38
38
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
|
|
2
|
-
import { config } from '@things-factory/env'
|
|
3
|
-
import { getRedirectSubdomainPath } from '@things-factory/shell'
|
|
4
1
|
import Router from 'koa-router'
|
|
5
2
|
import fetch from 'node-fetch'
|
|
6
|
-
import { getRepository } from 'typeorm'
|
|
7
3
|
import { v4 as uuidv4 } from 'uuid'
|
|
4
|
+
|
|
5
|
+
import { User, VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
|
|
6
|
+
import { config } from '@things-factory/env'
|
|
7
|
+
import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
|
|
8
|
+
|
|
8
9
|
import { StoreAPI } from '../controllers/store-api'
|
|
9
10
|
import { MarketplaceSetting, MarketplaceStore } from '../entities'
|
|
10
11
|
import { STORE_STATUS } from '../graphql/constants'
|
|
@@ -75,7 +76,7 @@ shopifyPublicRouter.get('/callback-shopify', async (context, next) => {
|
|
|
75
76
|
status: STORE_STATUS.ACTIVE
|
|
76
77
|
}
|
|
77
78
|
|
|
78
|
-
var user = await getRepository(User).
|
|
79
|
+
var user = await getRepository(User).findOneBy({ id: userId })
|
|
79
80
|
|
|
80
81
|
store = await getRepository(MarketplaceStore).save({
|
|
81
82
|
...store,
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
|
-
import { getRepository } from 'typeorm'
|
|
3
2
|
import { v4 as uuidv4 } from 'uuid'
|
|
4
3
|
|
|
4
|
+
import { getRepository } from '@things-factory/shell'
|
|
5
|
+
|
|
5
6
|
import { MarketplaceSetting, MarketplaceStore } from '../entities'
|
|
6
7
|
import { STORE_STATUS } from '../graphql/constants'
|
|
7
8
|
|
|
@@ -39,7 +40,7 @@ async function saveWoocommerceAccessInfo(accessInfo: WoocommerAccessInfo): Promi
|
|
|
39
40
|
consumer_secret: accessSecret
|
|
40
41
|
} = accessInfo
|
|
41
42
|
|
|
42
|
-
let marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).
|
|
43
|
+
let marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOneBy({ id: marketplaceStoreId })
|
|
43
44
|
marketplaceStore.accessKey = accessKey
|
|
44
45
|
marketplaceStore.accessSecret = accessSecret
|
|
45
46
|
marketplaceStore.accessInfo = JSON.stringify(accessInfo, null, 2)
|
|
@@ -50,7 +51,7 @@ async function saveWoocommerceAccessInfo(accessInfo: WoocommerAccessInfo): Promi
|
|
|
50
51
|
|
|
51
52
|
marketplaceSettingCategories.forEach(async category => {
|
|
52
53
|
const foundMarketplaceSetting: MarketplaceSetting = await getRepository(MarketplaceSetting).findOne({
|
|
53
|
-
where: { marketplaceStore, domain: marketplaceStore.domain, category }
|
|
54
|
+
where: { marketplaceStore: { id: marketplaceStore.id }, domain: { id: marketplaceStore.domain.id }, category }
|
|
54
55
|
})
|
|
55
56
|
|
|
56
57
|
if (!foundMarketplaceSetting) {
|