@nuskin/ns-shop 5.18.0 → 5.18.3

package/package.json

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

package/src/cart/cart.js

@@ -1310,9 +1310,6 @@ export default function Cart(cartData) {
                 if (doneSyncingPersistedCart) {
                     publishCartQtyChange(json, referrer);
                 }
-                if (window.ReactNativeWebView) {
-                    window.ReactNativeWebView.postMessage(JSON.stringify({name: 'cart_quantity', payload: json.cartInfo.qty}));
-                }
                 json.pcId = id;
                 json.pcVersion = version;
                 json.pcType = type;

package/src/cart/persistentCartService.js

@@ -1,4 +1,5 @@
 import CartService from './cartService';
+import $ from "@nuskin/nuskinjquery";
 import {ConfigService, events, UrlService, RunConfigService, ShoppingContext, storage} from "@nuskin/ns-util";
 import {Agelocme} from '@nuskin/ns-product-lib';
 import {UserService} from "@nuskin/ns-account";
@@ -865,9 +866,6 @@ const persistCartUpdates = async () => {
     let loadCartType = null;
 
     if (pcActions.hasItems()) {
-        // removeCart = pcActions.hasRemoveCartItem();
-        // loadCartType = pcActions.hasLoadCartItem();
-
         // even though there is no need to process the queue if there is a removeCart
         // or a loadCart action they still need to get marked as processed so they will
         // get removed.
@@ -904,6 +902,11 @@ const persistCartUpdates = async () => {
     if (!(removeCart || loadCartType) && actions.length > 0) {
         await doPersistentUpdates(actions, pcId, pcVersion, pcType);
     }
+    if (removeCart || loadCartType || actions.length > 0) {
+        if (window.ReactNativeWebView) {
+            window.ReactNativeWebView.postMessage(JSON.stringify({name: 'cart_quantity', payload: CartService.getItemCnt()}));
+        }
+    }
     if (pcActions.hasItems()) {
         clearTimeout(timerId);
         timerId = setTimeout(timerCallback, 200);
@@ -1044,18 +1047,18 @@ let documentReady = false;
 if (window.nsPersistentCartInitialized !== true) {
     window.nsPersistentCartInitialized = true;
     // Wait for page to load and them initialize the service
-    // $(document).ready(async function() {
-    documentReady = true;
-    if (!window.ReactNativeWebView) {
-        initPersistentCartService().then(() => console.log('persisted cart loaded'));
-    } else {
-        events.getValue(events.mobile.NATIVE_INITIALIZING, (value) => {
-            if (value === false) {
-                initPersistentCartService().then(() => console.log('persisted cart loaded'));
-            }
-        }, true);
-    }
-    // });
+    $(document).ready(async function() {
+        documentReady = true;
+        if (!window.ReactNativeWebView) {
+            initPersistentCartService().then(() => console.log('persisted cart loaded'));
+        } else {
+            events.getValue(events.mobile.NATIVE_INITIALIZING, (value) => {
+                if (value === false) {
+                    initPersistentCartService().then(() => console.log('persisted cart loaded'));
+                }
+            }, true);
+        }
+    });
 }
 storage.removeItem('pcActivity');
 

package/src/payment/paymentType.js

@@ -59,7 +59,8 @@ let PaymentType = {
     BCAI: 123, // BCA installments
     CENC: 125,
     IDMIR: 128, // MIR card for Russia
-    AMIN: 129
+    AMIN: 129,
+    CBLU: 132  // Carte Bleu
 };
 
 PaymentType.credit = [
@@ -80,7 +81,8 @@ PaymentType.credit = [
     PaymentType.DINE,
     PaymentType.VISD,
     PaymentType.MCD,
-    PaymentType.IDMIR
+    PaymentType.IDMIR,
+    PaymentType.CBLU
 ];
 
 

package/src/receiver.js

@@ -324,6 +324,7 @@ const eventListener = async (message) => {
             }
         } else {
             if (AuthenticationService.isLoggedIn()) {
+                CartService.clearCart();
                 AuthenticationService.logout();
             }
         }