@nuskin/ns-shop 7.0.5-cx1-13272.19 → 7.0.5

package/package.json

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

package/src/salesEventService.js

@@ -1,7 +1,6 @@
 import {RunConfigService, UrlService, events, storage} from '@nuskin/ns-util';
 import axios from 'axios';
 import { UserService } from '@nuskin/ns-account';
-// import CheckoutModeService from './checkout/checkoutModeService';
 
 export default {
     init,
@@ -27,8 +26,6 @@ const ACTIVE_EVENT_TTL = ONE_MINUTE * 14;
 const INITIALIZING = 'initializing';
 const EXTERNAL_INITIALIZING = 'initializing-external';
 
-// let isGuest = false;
-
 // Contains a map of all event tickets that are stored in localStorage.
 let eventTicketInfoMap;
 
@@ -73,7 +70,6 @@ events.subscribe(events.salesevent.INIT_EVENT_TICKET, async (eventName, refresh
 
     if (eventName && await _initData()) {
         if (mktEventConfigMap[eventName]) {
-            // myAlert(`events.salesevent.INIT_EVENT_TICKET, ${eventName}`);
             _initEventTicketInfo(eventName, refresh)
                 .catch((err) => {
                     console.error(`Error initializing event ticket for ${eventName}.`, err)
@@ -230,7 +226,6 @@ async function _initEventTicketInfo(eventName, refreshTicket = false) {
         if (!eventTicketInfo.ticket || refreshTicket) {
             initInfo.refreshTime = Date.now();
             await _getRemoteTicket(eventTicketInfo);
-            // myAlert(`_initEventTicketInfo, ${JSON.stringify(eventTicketInfo)}`);
             useServerWaitTime = true;
         }
         _marketStatusCheck(eventTicketInfo);
@@ -428,7 +423,6 @@ function _getLocalStorageTickets() {
 
     Object.keys(localStorage).forEach(lsKey => {
         if (lsKey.endsWith('-event-ticket')) {
-            // myAlert(`localStorage ticket, ${lsKey}`);
             let ticket = getStorageItem(lsKey);
 
             if (ticket && ticket.eventName && ticket.ticketId && ticket.status && mktEventConfigMap[ticket.eventName]) {
@@ -786,21 +780,11 @@ function getStorageItem(key) {
 }
 
 async function _checkForMissingTicket(eventName) {
-    // myAlert(`_checkForMissingTicket1, ${eventName}`);
-    // myAlert(`_checkForMissingTicket2, ${JSON.stringify(mktEventConfigMap[eventName])}`);
-    // myAlert(`_checkForMissingTicket3, ${JSON.stringify(eventTicketInfoMap[eventName])}`);
     if (mktEventConfigMap[eventName] && !eventTicketInfoMap[eventName]) {
-        // myAlert(`missing ticket for ${eventName}`)
         await _initEventTicketInfo(eventName);
     }
 }
 
-// function myAlert(msg) {
-//     if (isGuest) {
-//         alert(msg);
-//     }
-// }
-
 /**
  * This initializes an interval timer which checks to see if the browser (computer)
  *  went to sleep.  It's intention is to update the wait timer if it has.
@@ -836,10 +820,11 @@ async function _initializePolling() {
                 _checkStatus(eventTicketInfo, false);
             });
 
-            if (window.location.pathname === '/static/checkout/checkout.html') {
-                // check for missing tickets. Only perform on checkout s
+            if (window.location.pathname === '/static/checkout/checkout.html' ||
+                window.location.pathname === '/static/cart/cart.html'
+            ) {
+                // check for missing tickets. Only perform on checkout screen
                 const activeEvents = await _getActiveEvents();
-                // myAlert(`Active Event check, ${JSON.stringify(activeEvents.map(ae => ae.eventName))}`);
 
                 for (const eventInfo of activeEvents) {
                     await _checkForMissingTicket(eventInfo.eventName);
@@ -971,7 +956,7 @@ function _removeWaitCheck(value) {
  */
 async function _loadAwsActiveEvents(country) {
     let activeEventsName = `${ACTIVE_EVENTS}-${country? country: RunConfigService.getRunConfig().country}`,
-        storageObj = null, // getStorageItem(activeEventsName),
+        storageObj = null,
         ttl = storageObj ? storageObj.ttl - Date.now() : ACTIVE_EVENT_TTL,
         eventInfos = {},
         ok = true;
@@ -983,14 +968,11 @@ async function _loadAwsActiveEvents(country) {
      * @param eventNames
      */
     let addEvents = (eventNames) => {
-        // myAlert(`addEvents1 ${JSON.stringify(eventNames)}`)
         eventNames.forEach(_eventName => {
             let eventName = _eventName.eventName || _eventName;
 
-            // myAlert(`addEvents2 ${JSON.stringify(mktEventConfigMap[eventName])}`)
             if (mktEventConfigMap[eventName]) {
                 eventInfos[eventName] = _createEventTicketInfo(eventName);
-                // myAlert(`addEvents3 ${JSON.stringify(eventInfos)}`)
             }
         });
     };
@@ -1000,7 +982,6 @@ async function _loadAwsActiveEvents(country) {
         storageObj = {events: []};
         storage.setItem(activeEventsName, storageObj, {ttl: 250}); // to prevent multiple calls.
         try {
-            // myAlert(`_loadAwsActiveEvents - no storageObj`)
             addEvents(await _getActiveEvents());
         } catch (e) {
             // an error occurred with the call, clear active events
@@ -1042,27 +1023,19 @@ async function initActiveEvents(country = undefined) {
             }
         })
 
-        // myAlert(`initActiveEvents0, ${JSON.stringify(awsEvents)}`)
-        // myAlert(`initActiveEvents1, ${JSON.stringify(eventTicketInfoMap)}`)
         eventTicketInfoMap = Object.assign({}, awsEvents, eventTicketInfoMap);
-        // myAlert(`initActiveEvents2, ${JSON.stringify(eventTicketInfoMap)}`)
         Object.keys(eventTicketInfoMap).forEach(eventName => {
             if (mktEventConfigMap[eventName] && eventTicketInfoMap[eventName].eventName) {
-                // myAlert(`initActiveEvents, ${JSON.stringify(eventTicketInfoMap[eventName])}`)
                 promises.push(_initEventTicketInfo(eventName));
             }
         });
     }
 
     return Promise.all(promises).then(async () => {
-        // myAlert(`Initial Events, ${[Object.keys(activeEventMap)]}`);
 
         events.setValue(events.salesevent.INITIAL_ACTIVE_EVENTS, [Object.keys(activeEventMap)]);
 
-        // If there are event tickets then initialize polling
-        // if (Object.keys(eventTicketInfoMap).length > 0 && !country) {
         await _initializePolling();
-        // }
         _removeWaitCheck(INITIALIZING);
     });
 }
@@ -1118,13 +1091,7 @@ async function _init(force = true) {
  *  If there are, make sure polling is happening, otherwise, stop polling.
  */
 events.subscribe(events.salesevent.ACTIVE_EVENTS, (/*activeEvents*/) => {
-    // if (eventTicketInfoMap) {
-    //     if (Object.keys(eventTicketInfoMap).length > 0) {
     _initializePolling().then(() => console.log('Polling initialized'));
-    //     } else {
-    //         _clearPollingInterval();
-    //     }
-    // }
 });
 
 // persistentCartService needs to wait until the following configMaps are loaded
@@ -1139,7 +1106,6 @@ const isSubset = (array1, array2) => {
 const csConfigCallback = async (configs) => {
     if (configs != null && isSubset(configs, neededConfigMaps)) {
         events.unsubscribe(events.global.CS_CONFIG_SET, csConfigCallback);
-        // isGuest = CheckoutModeService.isGuestCheckout();
         _init(false).then(() => console.log('salesEventService initialized'));
     }
 }