@nuskin/ns-shop 7.0.7-cx24-70033.1 → 7.0.7

package/package.json

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

package/src/cart/equinoxCartService.js

@@ -393,7 +393,7 @@ function _assembleChildSkus(requestData, options) {
             if(personalOffer != null && productWithVariant.length > 0 && productWithVariant[0].variantSelected){
                 selectedVariants = productWithVariant[0].variantSelected;
             }
-            if (personalOffer != null && selectedVariants && cs.skuId != selectedVariants[cs.productId] && (cs.type !== "BUNDLE" && cs.type === "OPTIONAL")) return null
+            if (personalOffer != null && selectedVariants && cs.skuId != selectedVariants[cs.productId] && (cs.type !== "BUNDLE" && cs.type !== "OPTIONAL")) return null
             const childSku =
             (personalOffer != null && selectedVariants && selectedVariants[cs.productId] && config.MySite_graphql_active)
                 ? {

package/src/payment/externalPaymentService.js

@@ -142,15 +142,21 @@ const getAdrOverrideId = () => {
 const _doNewExternalPaymentProcess = (order) => {
     // We only redirect if there is a redirect Url.
     if (order.redirectUrl) {
+        const redirectUrl = new URL(order.redirectUrl);
         // The landing page should be the checkout page.
         const protocol = window.location.href.split('://')[0];
         const domain = UrlService.extractDomain();
         const path = encodeURIComponent(CartService.getCheckoutPage({route: 'orderSummary'}));
 
+        // If we are on mynuskin.com we want to keep external payment on mynuskin.com.  For developing localhost we don't want to stay on localhost
+        if (!domain.includes('localhost')) {
+            redirectUrl.hostname = window.location.hostname;
+        }
+
         // Append the landing page URL
         // Example of order.redirectUrl: "redirectUrl":
         //  "https://test.nuskin.com/external-payment/api/v1/redirect?orderId=NS002761827&verify=null&ofsOrderId=0149707745"
-        window.location = `${order.redirectUrl}&landingUrl=${protocol}://${domain}${path}`;
+        window.location = `${redirectUrl.toString()}&landingUrl=${protocol}://${domain}${path}`;
     }
 };
 

package/src/salesEventService.js

@@ -152,7 +152,7 @@ async function getEventStatus(eventsToCheck = []) {
     eventsToCheck.forEach((eventName) => {
         let activeStatus = false;
         const ticketInfo = eventTicketInfoMap[eventName];
-        if (ticketInfo.ticket) {
+        if (ticketInfo && ticketInfo.ticket) {
             const status = _decodeStatus(ticketInfo.ticket.status);
             if ((status.eventStatus === PRE_EVENT && status.preWaitTime <= 30000) ||
                 status.eventStatus === IN_EVENT) {