From bf80e3b4b90c237d5231eb9473e110d052ca76cd Mon Sep 17 00:00:00 2001 From: cond0r Date: Fri, 28 May 2021 10:35:36 +0300 Subject: [PATCH] Fixes --- components/product/ProductView/ProductView.tsx | 5 ++--- framework/shopify/utils/normalize.ts | 2 -- framework/shopify/utils/queries/get-product-query.ts | 1 - tsconfig.json | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx index c588be601..6322b58cd 100644 --- a/components/product/ProductView/ProductView.tsx +++ b/components/product/ProductView/ProductView.tsx @@ -148,9 +148,8 @@ const ProductView: FC = ({ product }) => { loading={loading} disabled={variant?.availableForSale === false} > - {variant?.isInStock === false && - variant?.availableForSale === false - ? 'Sold Out' + {variant?.availableForSale === false + ? 'Not Available' : 'Add To Cart'} diff --git a/framework/shopify/utils/normalize.ts b/framework/shopify/utils/normalize.ts index 876a9a208..5c60e8abf 100644 --- a/framework/shopify/utils/normalize.ts +++ b/framework/shopify/utils/normalize.ts @@ -62,7 +62,6 @@ const normalizeProductVariants = ({ edges }: ProductVariantConnection) => { compareAtPriceV2, requiresShipping, availableForSale, - quantityAvailable, }, }) => { return { @@ -73,7 +72,6 @@ const normalizeProductVariants = ({ edges }: ProductVariantConnection) => { listPrice: +compareAtPriceV2?.amount, requiresShipping, availableForSale, - isInStock: Number(quantityAvailable) > 0, options: selectedOptions.map(({ name, value }: SelectedOption) => { const options = normalizeProductOption({ id, diff --git a/framework/shopify/utils/queries/get-product-query.ts b/framework/shopify/utils/queries/get-product-query.ts index e9875bb42..bdef35d07 100644 --- a/framework/shopify/utils/queries/get-product-query.ts +++ b/framework/shopify/utils/queries/get-product-query.ts @@ -34,7 +34,6 @@ const getProductQuery = /* GraphQL */ ` title sku availableForSale - quantityAvailable requiresShipping selectedOptions { name diff --git a/tsconfig.json b/tsconfig.json index 1a6c28831..9e712fb18 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,8 +22,8 @@ "@components/*": ["components/*"], "@commerce": ["framework/commerce"], "@commerce/*": ["framework/commerce/*"], - "@framework": ["framework/vendure"], - "@framework/*": ["framework/vendure/*"] + "@framework": ["framework/bigcommerce"], + "@framework/*": ["framework/bigcommerce/*"] } }, "include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],