@nuskin/product-components 3.18.0-td-341.2 → 3.18.0-td-1000.1

package/mixins/NsProductMixin.js

@@ -6,7 +6,6 @@ import {
 import {
   events,
   StringService,
-  csStringService,
   util,
   SitesSessionStorageService,
   ShoppingContext,
@@ -473,32 +472,8 @@ const NsProductMixin = {
         this.loyaltyStatusAndLinks.productOptedInRedeemNotEarn =
           "Save with Nu Skin Rewards";
 
-        const commonStringKeys = [
-          { key: "productDisplayNotOptedinMessage", dflt: "" },
-          {
-            key: "productDisplayOptedinMessage",
-            dflt: "{earnPercentage} Nu Skin enJoy Rewards Available!"
-          },
-          { key: "productOptedInEarnNotRedeem", dflt: "" },
-          {
-            key: "productOptedInRedeemNotEarn",
-            dflt:
-              "This product does not earn rewards points but is available to be redeemed for rewards points."
-          }
-        ];
-
-        try {
-          let loyalityStringsContent = {};
-          if (this.$NsProductAppService.useCSResources) {
-            loyalityStringsContent = await csStringService.getStrings(
-              commonStringKeys
-            );
-          } else {
-            loyalityStringsContent = await StringService.getStrings(
-              commonStringKeys
-            );
-          }
-          this.loyaltyStrings = loyalityStringsContent;
+        StringService.getApplicationStrings("loyalty").then(content => {
+          this.loyaltyStrings = content;
           // Link message to show to non-opted in users
           if (this.loyaltyStrings.productDisplayNotOptedinMessage) {
             this.loyaltyStatusAndLinks.landingPageLinkMessage = this.loyaltyStrings.productDisplayNotOptedinMessage;
@@ -540,14 +515,12 @@ const NsProductMixin = {
             );
             this.userLoyalty = loyaltyData;
           }
+        });
 
-          this.loyaltyStatusAndLinks.landingPage = this.localeReplace(
-            this.loyaltyStatusAndLinks.dashboardPage
-          );
-          this.loyaltyStatusAndLinks.siteUrl = this.siteUrl;
-        } catch (err) {
-          console.warn("Unable to retrieve loyalty strings translations.", err);
-        }
+        this.loyaltyStatusAndLinks.landingPage = this.localeReplace(
+          this.loyaltyStatusAndLinks.dashboardPage
+        );
+        this.loyaltyStatusAndLinks.siteUrl = this.siteUrl;
       }
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/product-components",
-  "version": "3.18.0-td-341.2",
+  "version": "3.18.0-td-1000.1",
   "description": "Nu Skin Product Components",
   "main": "index.js",
   "scripts": {
@@ -29,10 +29,10 @@
     "@nuskin/ns-core-styles": "2.11.2",
     "@nuskin/ns-icon": "^2.12.0",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.19.2",
+    "@nuskin/ns-product-lib": "2.19.7",
     "@nuskin/ns-shop": "7.1.3",
     "@nuskin/product-recommendation": "2.0.1",
-    "axios": "1.6.7",
+    "axios": "1.8.1",
     "lodash": "4.17.21",
     "sass": "^1.19.0",
     "sass-loader": "^8.0.2",
@@ -60,7 +60,7 @@
     "@nuskin/nuskinjquery": "2.3.1",
     "ansi-html": "0.0.8",
     "async": "2.6.4",
-    "axios": "1.6.7",
+    "axios": "1.8.1",
     "decode-uri-component": "0.2.1",
     "eventsource/eventsource": "2.0.2",
     "fast-xml-parser": "4.2.5",

package/services/EQPromotionService.js

@@ -120,9 +120,13 @@ const _equinoxRequest = async options => {
     storeId: storeId
   };
 
+  let orchestrationURL = `${storefrontURL}/orchestrationservices/storefront/${options.endpoint}`;
+  if (storefrontURL && storefrontURL.indexOf("apis") > -1) {
+    orchestrationURL = `${storefrontURL}/${options.endpoint}`;
+  }
   let axiosRequest = {
     method: options.method,
-    url: `${storefrontURL}/orchestrationservices/storefront/${options.endpoint}`,
+    url: orchestrationURL,
     headers: headers,
     withCredentials: options.method !== "DELETE",
     params: equinoxParams

package/services/NsProductAppService.js

@@ -3,11 +3,8 @@ import Vue from "vue";
 import {
   RunConfigService,
   ConfigService,
-  StringService,
-  csStringService
+  StringService
 } from "@nuskin/ns-util";
-import { getConfiguration } from "@nuskin/configuration-sdk";
-import { isEnabled } from "@nuskin/ns-feature-flags";
 
 import { isNullOrEmpty } from "@nuskin/ns-common-lib";
 
@@ -37,8 +34,7 @@ if (!NsProductAppService) {
         showWholeSalePricing: false,
         loadingConfig: true,
         translations: {},
-        loadingTranslations: true,
-        useCSResources: false
+        loadingTranslations: true
       };
     },
     computed: {
@@ -181,37 +177,10 @@ if (!NsProductAppService) {
         ];
 
         try {
-          const configs = await getConfiguration(["Mysite_Product_Offer"]);
-          let url = window.location.href;
-          let isStaticApp = url.match(/\/static\//) !== null;
-          let useCSResources = false;
-          if (
-            configs &&
-            configs.Mysite_Product_Offer &&
-            configs.Mysite_Product_Offer.useCSResources &&
-            Array.isArray(configs.Mysite_Product_Offer.useCSResources)
-          ) {
-            useCSResources = configs.Mysite_Product_Offer.useCSResources.includes(
-              this.runConfig.country
-            );
-          }
-          // For static apps by default use CS resources
-          // For AEM apps use CS resources only if the feature flag is enabled
-          this.useCSResources =
-            useCSResources &&
-            (isStaticApp || (!isStaticApp && isEnabled("td_341")));
-          let commonStrings = {};
-          if (this.useCSResources) {
-            commonStrings = await csStringService.getStrings(
-              commonStringKeys,
-              this.locale
-            );
-          } else {
-            commonStrings = await StringService.getStrings(
-              commonStringKeys,
-              this.locale
-            );
-          }
+          const commonStrings = await StringService.getStrings(
+            commonStringKeys,
+            this.locale
+          );
 
           this.appendTranslations(commonStrings);
         } catch (err) {

package/services/NsProductDataService.js

@@ -9,10 +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,
-  getCachedConfiguration
-} from "@nuskin/configuration-sdk";
+import { getConfiguration } from "@nuskin/configuration-sdk";
 
 class ProductDataBatch {
   constructor(id, skus) {
@@ -272,7 +269,9 @@ if (!NsProductDataService) {
           return;
         }
 
-        const equinoxMarketConfig = getCachedConfiguration("Equinox_Markets");
+        const equinoxMarketConfig = (
+          await getConfiguration(["Equinox_Markets"])
+        ).Equinox_Markets;
 
         // product data response has products
         if (productData.count && productData.products.length) {