Refactor : getProducts api method (#177)

* feat: multi currency * feat: multi-currency feature * feat: added multicurrency feature (static) * feat: pdp: multi currency * feat: muti-currency refactor * chore: version upgrade * feat: added feature to update userfields * fix: fixed selected variantby options * fix: cartgetters item price * refactor: getproducts api method
vuestorefront · Jan 28, 2022 · c3f7b59 · c3f7b59
1 parent c12c7b1
commit c3f7b59
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/shopify-api",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "sideEffects": false,
   "main": "lib/index.cjs.js",
   "module": "lib/index.es.js",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@nuxtjs/composition-api": "^0.30.0",
     "@vue-storefront/core": "~2.5.0",
-    "@vue-storefront/shopify-apollo": "^1.0.15",
+    "@vue-storefront/shopify-apollo": "^1.0.16",
     "graphql": "^14.5.8",
     "shopify-buy": "~2.14.0"
   },

diff --git a/packages/api-client/src/api/getProduct/index.ts b/packages/api-client/src/api/getProduct/index.ts
@@ -440,6 +440,7 @@ export default async function getProduct(
             variants(first:250){
               edges{
                 node{
+                  sku
                   availableForSale
                   priceV2{
                     currencyCode

diff --git a/packages/apollo/package.json b/packages/apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/shopify-apollo",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Vue Storefront Shopify Apollo Client",
   "keywords": [
     "apollo",

diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/shopify",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "sideEffects": false,
   "main": "lib/index.cjs.js",
   "module": "lib/index.es.js",
@@ -14,8 +14,8 @@
   "dependencies": {
     "@types/js-cookie": "^2.2.6",
     "@vue-storefront/core": "~2.5.0",
-    "@vue-storefront/shopify-api": "^1.0.15",
-    "@vue-storefront/shopify-apollo": "^1.0.15"
+    "@vue-storefront/shopify-api": "^1.0.16",
+    "@vue-storefront/shopify-apollo": "^1.0.16"
   },
   "peerDependencies": {
     "@nuxtjs/composition-api": "0.29.3"

diff --git a/packages/composables/src/getters/cartGetters.ts b/packages/composables/src/getters/cartGetters.ts
@@ -28,8 +28,8 @@ export const getCartItemImage = (product: any): string => {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const getCartItemPrice = (product: any): AgnosticPrice => {
   return {
-    regular: product?.variant.compareAtPriceV2.amount|| null,
-    special: product?.variant.priceV2.amount|| null
+    regular: product && product?.variant.compareAtPriceV2 != null ? product?.variant.compareAtPriceV2?.amount : null || null,
+    special: product && product?.variant.priceV2 != null ? product?.variant.priceV2.amount : 0 || null
   };
 };
 
@@ -56,9 +56,9 @@ export const getCartItemSku = (product: any): string => product?.variant.sku ||
 export const getCartTotals = (cart): AgnosticTotals => {
   if (cart && cart !== null) {
     return {
-      total: parseFloat(cart.totalPriceV2.amount),
-      subtotal: parseFloat(cart.subtotalPriceV2.amount),
-      special: parseFloat(cart.subtotalPriceV2.amount),
+      total: parseFloat(cart.totalPriceV2?.amount),
+      subtotal: parseFloat(cart.subtotalPriceV2?.amount),
+      special: parseFloat(cart.subtotalPriceV2?.amount),
     };
   }
 };

diff --git a/packages/composables/src/useCart/index.ts b/packages/composables/src/useCart/index.ts
@@ -11,7 +11,6 @@ const params: UseCartFactoryParams<Cart, CartItem, Product> = {
   load: async (context: Context, { customQuery }) => {
     // check if cart is already initiated
     const appKey = context.$shopify.config.app.$config.appKey;
-    console.log('customQuery:', customQuery);
     let existngCartId = context.$shopify.config.app.$cookies.get(appKey + '_cart_id');
     if (existngCartId === undefined || existngCartId === '') {
       existngCartId = await context.$shopify.api.createCart().then((checkout) => {

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/shopify-theme",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "scripts": {
     "dev": "nuxt",
     "build": "nuxt build -m",
@@ -19,7 +19,7 @@
     "@vue-storefront/middleware": "~2.5.0",
     "@vue-storefront/nuxt": "~2.5.0",
     "@vue-storefront/nuxt-theme": "~2.5.0",
-    "@vue-storefront/shopify": "^1.0.15",
+    "@vue-storefront/shopify": "^1.0.16",
     "cookie-universal-nuxt": "^2.1.3",
     "core-js": "^3.19.1",
     "isomorphic-fetch": "^2.2.1",