@nuskin/ns-shop 5.11.12 → 5.11.15-app-testing.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.11.12",
+  "version": "5.11.15-app-testing.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/cart/cart.js

@@ -847,7 +847,7 @@ export default function Cart(cartData) {
             nameMap[name] = name;
         });
         Object.keys(nameMap).forEach(eventName => {
-            events.publish(events.salesEvent.INIT_EVENT_TICKET, eventName);
+            events.publish(events.salesevent.INIT_EVENT_TICKET, eventName);
         });
     }
 

package/src/currencyService.js

@@ -1,21 +1,23 @@
-import $ from '@nuskin/nuskinjquery';
-import {RunConfigService} from '@nuskin/ns-util';
+import { RunConfigService, events } from "@nuskin/ns-util";
 
-let CurrencyService = function() {
+import $ from "@nuskin/nuskinjquery";
+
+let CurrencyService = (function() {
     let byCountry = {},
         byCurrencyCode = {},
         runConfig = {};
 
-    function init() {
-        if (!runConfig.hasOwnProperty("country")) {
-            runConfig = RunConfigService.getRunConfig();
-        }
+    function setRunConfig() {
+        runConfig = RunConfigService.getRunConfig();
     }
 
     function getCurrency(country) {
-        init();
+        if (!runConfig) {
+            setRunConfig();
+        }
+
         let currency = byCountry[country],
-            baseUrl = runConfig.assessmentApp ? '' : runConfig.baseUrl;
+            baseUrl = runConfig.assessmentApp ? "" : runConfig.baseUrl;
 
         if (typeof baseUrl === "undefined") {
             baseUrl = "";
@@ -24,7 +26,7 @@ let CurrencyService = function() {
         if (!currency) {
             $.ajax({
                 type: "GET",
-                url: baseUrl + '/content/configuration/currencies.service.' + country + '.json',
+                url: `${baseUrl}/content/configuration/currencies.service.${country}.json`,
                 dataType: "json",
                 async: false,
                 success: function(data) {
@@ -35,7 +37,7 @@ let CurrencyService = function() {
                     }
                 },
                 error: function(xhr) {
-                    console.error("could not get the market's currency! error:"+xhr);
+                    console.error("could not get the market's currency! error:" + xhr);
                 }
             });
         }
@@ -45,23 +47,25 @@ let CurrencyService = function() {
     function setDefaults(currency) {
         if (currency) {
             if (!currency.delimiter) {
-                currency.delimiter = ',';
+                currency.delimiter = ",";
             }
             if (!currency.decimal) {
-                currency.decimal = '.';
+                currency.decimal = ".";
             }
         }
     }
 
     function getCountryKey(_country, _language) {
-        init();
-        let country,
-            language;
+        if (!runConfig) {
+            setRunConfig();
+        }
+
+        let country, language;
 
         country = _country || runConfig.country;
         language = _language || runConfig.language;
-        if (country === 'CA' && language === 'fr') {
-            country = language + '_' + country;
+        if (country === "CA" && language === "fr") {
+            country = language + "_" + country;
         }
 
         return country;
@@ -71,7 +75,7 @@ let CurrencyService = function() {
         // Make sure the amount is a number.
         let initializedNumber = parseFloat(amount);
         if (isNaN(initializedNumber)) {
-            initializedNumber = 0.00;
+            initializedNumber = 0.0;
         }
         return initializedNumber;
     }
@@ -79,12 +83,12 @@ let CurrencyService = function() {
     function applyAccuracyDelimiterDecimal(currency, amount) {
         let p = amount.toFixed(currency.accuracy).split("."),
             chars = p[0].split("").reverse(),
-            newstr = '',
+            newstr = "",
             count = 0;
 
         for (let x = 0; x < chars.length; x++) {
             count++;
-            if (count%3 == 1 && count != 1) {
+            if (count % 3 == 1 && count != 1) {
                 // Add in the delimiter
                 newstr = chars[x] + currency.delimiter + newstr;
             } else {
@@ -103,7 +107,7 @@ let CurrencyService = function() {
     }
 
     function applySymbol(currency, amount) {
-        if (currency.after === 'true'){
+        if (currency.after === "true") {
             amount = amount + currency.symbol;
         } else {
             if (amount < 0) {
@@ -111,29 +115,41 @@ let CurrencyService = function() {
             } else {
                 amount = currency.symbol + amount;
             }
-
         }
         return amount;
     }
 
-    function parseCurrencyStringToFloat(currencyString, thousandsDelimiter, currencySymbol) {
+    function parseCurrencyStringToFloat(
+        currencyString,
+        thousandsDelimiter,
+        currencySymbol
+    ) {
+        if (!runConfig) {
+            setRunConfig();
+        }
 
         if (!thousandsDelimiter) {
             thousandsDelimiter = getCurrency(runConfig.country).delimiter;
         }
+
         if (!currencySymbol) {
-            currencySymbol = getCurrency(runConfig.country).symbol ? getCurrency(runConfig.country).symbol : '';
+            currencySymbol = getCurrency(runConfig.country).symbol
+                ? getCurrency(runConfig.country).symbol
+                : "";
         }
-        /* eslint-disable-next-line */
-        const delimiterEscaped = thousandsDelimiter.replace(/\./g, '\\\.')
-        const charactersToRemove = new RegExp(delimiterEscaped + '|' + currencySymbol, 'g');
+
+        const delimiterEscaped = thousandsDelimiter.replace(/\./g, "\\.");
+        const charactersToRemove = new RegExp(
+            `${delimiterEscaped}|${currencySymbol}`,
+            "g"
+        );
 
         return parseFloat(
             currencyString
-                .replace(charactersToRemove, '')    // remove the delimiters, they confuse parseFloat
-                .replace(',', '.')              // replace any remaining commas with periods. If these exist then we are in a market with non-regular decimals
-                .replace(/[^\d.]/g, '')         // remove extraneous characters
-        )
+                .replace(charactersToRemove, "") // remove the delimiters, they confuse parseFloat
+                .replace(",", ".") // replace any remaining commas with periods. If these exist then we are in a market with non-regular decimals
+                .replace(/[^\d.]/g, "") // remove extraneous characters
+        );
     }
 
     let format = function(amount, country, language) {
@@ -150,12 +166,20 @@ let CurrencyService = function() {
         return formatted;
     };
 
+    /**
+     * RUN_CONFIG_CHANGED is published by ns-util when the runConfig is ready and when it changes.
+     * This will need to trigger setRunConfig so it is updated.
+     */
+    events.subscribe(events.global.RUN_CONFIG_CHANGED, setRunConfig);
+
+    setRunConfig();
+
     return {
         format: format,
         getCurrency: getCurrency,
-        parseCurrencyStringToFloat: parseCurrencyStringToFloat/*,
+        parseCurrencyStringToFloat: parseCurrencyStringToFloat /*,
         getCurrencySymbol: getCurrencySymbol*/
-    }
-}();
+    };
+})();
 
 export default CurrencyService;

package/src/shopContext.js

@@ -41,7 +41,7 @@ let ShopContextService = function() {
                 // hardcoding months to 7 because only one market differentiates between wadwd and wadw in the cart for now -
                 // if that changes will need to make a config
                 if (user &&
-                    AdrService.getAdrMonths(storage.getItem(storage.metadata.ADR_CURRENT_ID)) > 7 &&
+                    AdrService.getAdrMonths(storage.getItem(storage.metadata.ADR_CURRENT_ID)) >= 7 &&
                     ConfigService.getMarketConfig().adpManage.EligibleWADWD) {
                     priceType = PriceType.WADWD;
                 } else {