@nuskin/ns-shop 6.0.1 → 6.0.3

package/package.json

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

package/src/salesEventService.js

@@ -1,5 +1,5 @@
 import $ from '@nuskin/nuskinjquery';
-import {RunConfigService, UrlService, events, storage, nuskin} from '@nuskin/ns-util';
+import {RunConfigService, UrlService, events, storage} from '@nuskin/ns-util';
 import axios from 'axios';
 import { UserService } from '@nuskin/ns-account';
 
@@ -1087,13 +1087,7 @@ async function _init(force = true) {
     // init is passed arguments when initiated by $(document).ready(init) below. Need
     // to check for actual boolean true for initialization.
     if (await _initData(force === true)) {
-        if (!nuskin || !nuskin.hasOwnProperty("configuration")) {
-            events.subscribe(events.global.CONFIGURATION_SET, () => {
-                initActiveEvents().catch((err) => {console.error('Error initializing event tickets.', err)});
-            });
-        } else {
-            initActiveEvents().catch((err) => {console.error('Error initializing event tickets.', err)});
-        }
+        initActiveEvents().catch((err) => {console.error('Error initializing event tickets.', err)});
     } else {
         _removeWaitCheck(INITIALIZING);
     }
@@ -1114,9 +1108,11 @@ events.subscribe(events.salesevent.ACTIVE_EVENTS, (/*activeEvents*/) => {
 });
 
 /**
- * Waits for document readiness and market configuration loading and then
- *  initializes tickets for events associated to the current market.
+ * Waits for config to be loaded and then initializes tickets
+ * for events associated to the current market.
  */
-$(document).ready(async function() {
-    await _init(false);
-});
+events.getValue(events.global.CS_CONFIG_SET, async (configs) => {
+    if (configs != null) {
+        await _init(false);
+    }
+})

package/src/shopContext.js

@@ -24,11 +24,13 @@ let setEcom3Cookie = function(value) {
 let getPriceType = (isAdr, _user) => {
     const user = _user || UserService.getUser();
     const isRetail =
-        !AuthenticationService.isLoggedIn() ||
-        !user ||
-        user.priceType == 'RTL' ||
-        user.isCustomer() ||
-        user.isGuest;
+        !getCachedConfigField('showWholeSalePricing') && (
+            !AuthenticationService.isLoggedIn() ||
+            !user ||
+            user.priceType == 'RTL' ||
+            user.isCustomer() ||
+            user.isGuest
+        );
 
     let priceType;