@nuskin/ns-shop 5.14.15 → 5.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.14.15",
+  "version": "5.15.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

@@ -2,7 +2,7 @@ import newShop from '../newShop';
 import CartItem from './cartItem.js';
 import ShopContext from '../shopContext.js';
 import {AccountManager, UserService} from '@nuskin/ns-account';
-import {AgelocService, events, storage, NUSAnalytics, PersonalOfferStorageService, ConfigService} from '@nuskin/ns-util';
+import {events, storage, NUSAnalytics, PersonalOfferStorageService, ConfigService} from '@nuskin/ns-util';
 import webLoyalty from '@nuskin/ns-loyalty-web';
 import {PriceType} from '@nuskin/ns-product-lib';
 import CurrencyService from '../currencyService';
@@ -214,7 +214,7 @@ export default function Cart(cartData) {
                 } else {
                     currentQty = (currentQty + intQuantity > info.maxQty) ? info.maxQty : currentQty + intQuantity;
                 }
-                
+
                 this.setItemQuantity(currentItem.key, parseInt(currentQty), referrer);
             }
         } else {
@@ -330,7 +330,9 @@ export default function Cart(cartData) {
      * @returns nuskin.newShop.CartItem
      */
     this.getFirstItemBySku = function(sku, options = {cartItems: true}) {
-        let item = this.getItems(options).find(item => item.product.sku === sku || AgelocService.codesSameType(sku, item.product.sku));
+        let item = this.getItems(options).find(
+            (item) => item.product.sku === sku || (item.product.agelocme && item.product.agelocme.code === sku)
+        );
 
         return item ? item.toFlatJson() : null;
     };

package/src/order/orderAdapter.js

@@ -553,8 +553,8 @@ const syncProductItems = (order, sapProducts, adr, includeSapItems) => {
                 order.addOutOfStock(sapItem.LineItem.SKU);
                 order.addOutOfStockTitle(CartService.getItemTitleBySku(sapItem.LineItem.SKU));
             } else {
-                let aSku = sapItem.LineItem.SKU,
-                    existingItem = CartService.getFirstItemBySku(sapItem.LineItem.SKU, includeSapItems ? {all: true} : {cartItems: true}),
+                let existingItem = CartService.getFirstItemBySku(sapItem.LineItem.SKU, includeSapItems ? {all: true} : {cartItems: true}),
+                    aSku = existingItem ? existingItem.sku : sapItem.LineItem.SKU,
                     newItem = {},
                     isAdrItem = !sapItem.LineItem.OneTime,
                     newItemSku = aSku;

package/src/shipping/ShippingService.js

@@ -1,6 +1,7 @@
 import {ConfigService, RunConfigService, UrlService} from '@nuskin/ns-util';
 import {UserService} from '@nuskin/ns-account';
 import {ServiceUtils} from '@nuskin/ns-shop';
+import axios from 'axios';
 
 let baseUrl;
 let awsUrl;
@@ -42,6 +43,7 @@ export default {
     putShippingAddress,
     deleteShippingAddress,
     getShipDays,
+    getVNRegionList,
     getListOfCitiesFromPostalCode
 };
 
@@ -129,6 +131,23 @@ async function getShipDays () {
     return shipDays;
 }
 
+/**
+ * Retrieves region, district, and city data for Vietnam.
+ * @return {Promise<VNRegion[]>}
+ */
+async function getVNRegionList () {
+    if (!baseUrl) {
+        baseUrl = ConfigService.getMarketConfig().siteUrl;
+    }
+    const url = baseUrl + '/static/address-form-assets/vn-regions.json';
+
+    const { data } = await axios.get(url, {
+        headers: { Accept: 'application/json' }
+    });
+
+    return data || [];
+}
+
 /**
  * Retrieves address data matching the given postal code and country. Postal code may
  * resolve down to a region, district, or city.
@@ -249,3 +268,16 @@ function getHeaders(eid) {
  * @property {string} [shippingInstructions]
  * @property {string} [shippingAlias]
  */
+
+/**
+ * @typedef VNRegion
+ * @property {string} value
+ * @property {string} text
+ * @property {VNDistrict[]} districts
+ */
+
+/**
+ * @typedef VNDistrict
+ * @property {string} text
+ * @property {string[]} cities
+ */