@nuskin/product-components 3.3.7-cx16-8633.3 → 3.3.8

package/.releaserc

@@ -1,6 +1,6 @@
 {
     "branches": [
-      "master", {"name":"CX16-8633", "channel":"prerelease", "prerelease":"cx16-8633"}
+      "master"
     ],
     "plugins": [
         "@semantic-release/npm",

package/CHANGELOG.md

@@ -1,4 +1,12 @@
+## [3.3.8](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7...v3.3.8) (2023-04-06)
+
+
+### Fix
+
+* added waitForConfig in NsPrductMixin #CX16-8633 ([53813b0](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/53813b05400128f0de8e350cd545345684dc8917)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+
 ## [3.3.7-cx16-8633.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7-cx16-8633.2...v3.3.7-cx16-8633.3) (2023-04-05)
+## [3.3.7](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.6...v3.3.7) (2023-04-05)
 
 
 ### Fix
@@ -6,6 +14,9 @@
 * added wait in NsProductMixin #CX16-8633 ([b802a9b](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b802a9b188ef90c4e5568e47031f41ab5ca67efa)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
 
 ## [3.3.7-cx16-8633.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.7-cx16-8633.1...v3.3.7-cx16-8633.2) (2023-04-04)
+* CX24 Batch 2 Fixes ([5eaec1e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/5eaec1e9bb7c7d7979f4da14dcf3732a43c3ed2c))
+
+# [3.4.0-cx24-3706.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.3...v3.4.0-cx24-3706.4) (2023-04-04)
 
 
 ### Fix
@@ -14,11 +25,107 @@
 * trying wait in different place #CX16-8633 ([4c9eb00](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/4c9eb00b16974e5ac93104a1ca30db4503d08e36)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
 
 ## [3.3.7-cx16-8633.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.6...v3.3.7-cx16-8633.1) (2023-04-03)
+* Add to Bag in product offer ([3212ce0](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/3212ce049979b7f2f3c26c5e64ef8a98eb669e9b))
+
+# [3.4.0-cx24-3706.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.2...v3.4.0-cx24-3706.3) (2023-04-04)
 
 
 ### Fix
 
 * unit tests and wait in NsProductMixin #CX16-8633 ([868234a](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/868234a9cf5803efc389a966274ba66a5be87b4d)), closes [#CX16-8633](https://code.tls.nuskin.io/ns-am/ux/product-components/issues/CX16-8633)
+* Add to Bag in product offer ([b6fb956](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b6fb9561044911f58ac680e497a74661c5c14894))
+
+# [3.4.0-cx24-3706.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.4.0-cx24-3706.1...v3.4.0-cx24-3706.2) (2023-04-03)
+
+
+### Fix
+
+* Add to cart only getting first variant ([8e1aed7](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/8e1aed790edd5874c90678985f7a5df70cce951c))
+* Add to cart only getting first variant ([6783f95](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/6783f95a957973de6be6d8b03c1fc4aefd833b8d))
+* Add to cart only getting first variant ([408848e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/408848eec01b1a2fdc462fb05f0b01af64b1f4ff))
+* Add to cart only getting first variant ([718cf0b](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/718cf0b3cc6f3c565fc7e7a65ab19b4b1800ed59))
+* Add to cart only getting first variant ([f29ce7c](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/f29ce7c3667992a7d53586aa868e3293ced34d24))
+* Add to cart only getting first variant ([b85028e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b85028eb2e1c63b6bf6789c70788b2f9c8345740))
+* Add to cart only getting first variant ([f170ed4](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/f170ed4d8435493dde2600eede269679b7bd161b))
+* Add to cart only getting first variant ([8c9c742](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/8c9c7424302c58de1ed64c470ee8c7274ed0b90d))
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([8a64e86](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/8a64e869d499e316029cf14b1249a38eebad50b6))
+* Automated changes by GitLab pipeline [skip ci] ([98f99a7](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/98f99a76a56103cbf5da646af672ae5e5595234e))
+* Automated changes by GitLab pipeline [skip ci] ([041ae4a](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/041ae4ad5d64b36d8c93a6addc4561fd89ce3c11))
+* Automated changes by GitLab pipeline [skip ci] ([0bbb3e5](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/0bbb3e5d8f13aa6edd1b412e4ddd80e9f9cf1215))
+* Automated changes by GitLab pipeline [skip ci] ([2bb503b](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/2bb503b83005d3ce9d875d7bdb0853916a3bf821))
+* Automated changes by GitLab pipeline [skip ci] ([b39ba6f](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b39ba6f6a0ebe36552838467b6d1ec199a64b77c))
+* Automated changes by GitLab pipeline [skip ci] ([e52fd76](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/e52fd760e31424807f48c2622749f506aeb67173))
+* Automated changes by GitLab pipeline [skip ci] ([f7be37d](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/f7be37d15bc0fdd5ee0e8eb205255cecfb807347))
+
+### Update
+
+* Merge CX24-3702 changes ([c49a7c4](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/c49a7c4de483e4aab77b0c148ec03e69f4bbf329))
+
+## [3.3.5-cx24-3702.8](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.7...v3.3.5-cx24-3702.8) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([8e1aed7](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/8e1aed790edd5874c90678985f7a5df70cce951c))
+
+## [3.3.5-cx24-3702.7](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.6...v3.3.5-cx24-3702.7) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([6783f95](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/6783f95a957973de6be6d8b03c1fc4aefd833b8d))
+
+## [3.3.5-cx24-3702.6](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.5...v3.3.5-cx24-3702.6) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([408848e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/408848eec01b1a2fdc462fb05f0b01af64b1f4ff))
+
+## [3.3.5-cx24-3702.5](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.4...v3.3.5-cx24-3702.5) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([718cf0b](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/718cf0b3cc6f3c565fc7e7a65ab19b4b1800ed59))
+
+## [3.3.5-cx24-3702.4](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.3...v3.3.5-cx24-3702.4) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([f29ce7c](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/f29ce7c3667992a7d53586aa868e3293ced34d24))
+
+## [3.3.5-cx24-3702.3](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.2...v3.3.5-cx24-3702.3) (2023-03-29)
+
+
+### Fix
+
+* Add to cart only getting first variant ([b85028e](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/b85028eb2e1c63b6bf6789c70788b2f9c8345740))
+
+## [3.3.5-cx24-3702.2](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5-cx24-3702.1...v3.3.5-cx24-3702.2) (2023-03-25)
+
+
+### Fix
+
+* Add to cart only getting first variant ([f170ed4](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/f170ed4d8435493dde2600eede269679b7bd161b))
+
+## [3.3.5-cx24-3702.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.4...v3.3.5-cx24-3702.1) (2023-03-25)
+
+
+### Fix
+
+* Add to cart only getting first variant ([8c9c742](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/8c9c7424302c58de1ed64c470ee8c7274ed0b90d))
+
+# [3.4.0-cx24-3706.1](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.6...v3.4.0-cx24-3706.1) (2023-04-01)
+
+
+### Update
+
+* added active check to equinox flags ([43c6770](https://code.tls.nuskin.io/ns-am/ux/product-components/commit/43c6770d9080db3de15db197016b3335550c94f3))
 
 ## [3.3.6](https://code.tls.nuskin.io/ns-am/ux/product-components/compare/v3.3.5...v3.3.6) (2023-03-31)
 

package/mixins/NsProductMixin.js

@@ -27,7 +27,6 @@ import { PriceType } from "@nuskin/ns-product-lib";
 import { ProductDataService } from "@nuskin/ns-product";
 import { waitForConfig } from "../services/configHelper";
 
-//const PRODUCT_SMALL_VARIANT = "product-card.selected-variant";
 const PENDING_FAVORITE = "pendingFavorite";
 const KEY_BREADCRUMB_BACK = "breadcrumbBack";
 
@@ -741,13 +740,18 @@ const NsProductMixin = {
      * Sets sales event pricing if there is an active event for this sku, or normal pricing if not
      */
     setProductPricing() {
-      this.product.setPriceAndPvFromType(
-        this.getPriceType(),
-        this.activeSalesEvents,
-        {
-          isEqPromotion: equinoxLocalStorage.isEquinoxEnabled()
-        }
-      );
+      const mixin = this;
+      getConfiguration(["Equinox_Markets"]).then(config => {
+        mixin.product.setPriceAndPvFromType(
+          mixin.getPriceType(),
+          mixin.activeSalesEvents,
+          {
+            isEqPromotion:
+              equinoxLocalStorage.isEquinoxEnabled() &&
+              config.Equinox_Markets.active
+          }
+        );
+      });
 
       // set adr price
       this.adrPriceType = this.isWholesale
@@ -944,11 +948,20 @@ const NsProductMixin = {
           const countryCode = config.Equinox_Markets.country_code;
           if (
             countryCode === country &&
-            equinoxLocalStorage.isEquinoxEnabled()
+            equinoxLocalStorage.isEquinoxEnabled() &&
+            config.Equinox_Markets.active
           ) {
             ProductDataService.getProductData(options.sku)
               .then(productData => {
-                options.product = new ShopProduct(productData.products[0]);
+                let productToAdd = productData.products[0];
+                const productIdentifier =
+                  productData.products[0].equinoxProductId;
+                if (Object.keys(productToAdd.variants).length > 1) {
+                  productToAdd = productData.products[0].variants[options.sku];
+                  productToAdd.equinoxProductId = productIdentifier;
+                  //productToAdd.properties = productData.products[0].properties
+                }
+                options.product = new ShopProduct(productToAdd);
                 options.add = {
                   item: {
                     qty: options.qty

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.3.7-cx16-8633.3",
+  "version": "3.3.8",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {

package/services/NsProductDataService.js

@@ -9,6 +9,7 @@ import { isNullOrEmpty } from "@nuskin/ns-common-lib";
 import { ProductDataService } from "@nuskin/ns-product";
 import { Product, PriceType } from "@nuskin/ns-product-lib";
 import { equinoxLocalStorage } from "@nuskin/ns-util";
+import { getConfiguration } from "@nuskin/configuration-sdk";
 
 class ProductDataBatch {
   constructor(id, skus) {
@@ -263,6 +264,10 @@ if (!NsProductDataService) {
           return;
         }
 
+        const equinoxMarketConfig = (
+          await getConfiguration(["Equinox_Markets"])
+        ).Equinox_Markets;
+
         // product data response has products
         if (productData.count && productData.products.length) {
           const productsToSaveToSession = [];
@@ -270,7 +275,9 @@ if (!NsProductDataService) {
             // do a last quick check to make sure we don't add duplicate products
             if (!this.findProduct(product.sku)) {
               product.setPriceAndPvFromType(this.getPriceType(), null, {
-                isEqPromotion: equinoxLocalStorage.isEquinoxEnabled()
+                isEqPromotion:
+                  equinoxLocalStorage.isEquinoxEnabled() &&
+                  equinoxMarketConfig.active
               });
               this.products.push(product);
               this.$emit("product-changed", product);
@@ -285,14 +292,18 @@ if (!NsProductDataService) {
        * Updates product pricing
        */
       updateProductPricing() {
-        for (const product of this.products) {
-          product.setPriceAndPvFromType(
-            this.getPriceType(),
-            null,
-            equinoxLocalStorage.isEquinoxEnabled()
-          );
-          this.$emit("product-changed", product);
-        }
+        const service = this;
+        getConfiguration(["Equinox_Markets"]).then(config => {
+          for (const product of service.products) {
+            product.setPriceAndPvFromType(
+              service.getPriceType(),
+              null,
+              equinoxLocalStorage.isEquinoxEnabled() &&
+                config.Equinox_Markets.active
+            );
+            service.$emit("product-changed", product);
+          }
+        });
       },
 
       /**
@@ -356,28 +367,38 @@ if (!NsProductDataService) {
        */
       handleProductStatus(productStatusResults) {
         const productsToSaveToSession = [];
-        for (const productStatus of productStatusResults) {
-          const product = this.findProduct(productStatus.SKU);
-          if (product) {
-            if (product.isBase() && productStatus.SKU !== product.sku) {
-              const variant = product.getVariant(productStatus.SKU);
-              if (variant) {
-                variant.availableQuantity = productStatus.availableQuantity;
-                variant.setMarketAttributes(productStatus);
+        const service = this;
+
+        getConfiguration(["Equinox_Markets"]).then(config => {
+          for (const productStatus of productStatusResults) {
+            const product = service.findProduct(productStatus.SKU);
+            if (product) {
+              if (product.isBase() && productStatus.SKU !== product.sku) {
+                const variant = product.getVariant(productStatus.SKU);
+                if (variant) {
+                  variant.availableQuantity = productStatus.availableQuantity;
+                  variant.setMarketAttributes(productStatus);
+                }
+              } else {
+                product.availableQuantity = productStatus.availableQuantity;
+                product.setMarketAttributes(productStatus);
               }
-            } else {
-              product.availableQuantity = productStatus.availableQuantity;
-              product.setMarketAttributes(productStatus);
-            }
 
-            product.addPricingFromStatus(productStatus, this.getPriceType(), {
-              isEqPromotion: equinoxLocalStorage.isEquinoxEnabled()
-            });
-            this.$emit("product-changed", product);
-            productsToSaveToSession.push(product);
+              product.addPricingFromStatus(
+                productStatus,
+                service.getPriceType(),
+                {
+                  isEqPromotion:
+                    equinoxLocalStorage.isEquinoxEnabled() &&
+                    config.Equinox_Markets.active
+                }
+              );
+              service.$emit("product-changed", product);
+              productsToSaveToSession.push(product);
+            }
           }
-        }
-        this.saveProductsToSession(productsToSaveToSession);
+          service.saveProductsToSession(productsToSaveToSession);
+        });
       },
 
       /**