@nuskin/ns-shop 7.3.0-pa-20.1 → 7.3.0-td-924.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nuskin/ns-shop",
|
|
3
|
-
"version": "7.3.0-
|
|
3
|
+
"version": "7.3.0-td-924.1",
|
|
4
4
|
"description": "The description that will amaze and astound your audience when they read it",
|
|
5
5
|
"main": "src/shop.js",
|
|
6
6
|
"scripts": {
|
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
"@nuskin/ns-common-lib": "1.4.7",
|
|
27
27
|
"@nuskin/ns-feature-flags": "1.4.7",
|
|
28
28
|
"@nuskin/ns-loyalty-web": "1.5.6",
|
|
29
|
-
"@nuskin/ns-product-lib": "2.
|
|
29
|
+
"@nuskin/ns-product-lib": "2.20.0-td-1000.1",
|
|
30
30
|
"@nuskin/nuskinjquery": "2.3.1",
|
|
31
31
|
"@nuskin/order-model": "3.1.3",
|
|
32
|
-
"@nuskin/product-lib": "2.
|
|
33
|
-
"axios": "1.
|
|
32
|
+
"@nuskin/product-lib": "2.4.0-td-1000.1",
|
|
33
|
+
"axios": "1.8.1",
|
|
34
34
|
"decimal.js": "10.4.3",
|
|
35
35
|
"jp-conversion": "0.0.7",
|
|
36
36
|
"lodash": "4.17.21",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@babel/preset-env": "^7.23.8",
|
|
41
|
-
"@nuskin/configuration-sdk": "
|
|
41
|
+
"@nuskin/configuration-sdk": "3.0.0",
|
|
42
42
|
"@nuskin/exclusive-offer-sdk": "1.2.4",
|
|
43
43
|
"@nuskin/ns-account": "5.9.2",
|
|
44
44
|
"@nuskin/ns-jsanalyzer": "1.0.1",
|
|
45
|
-
"@nuskin/ns-product": "3.
|
|
45
|
+
"@nuskin/ns-product": "3.51.0-td-1000.1",
|
|
46
46
|
"@nuskin/ns-util": "4.6.1",
|
|
47
47
|
"axios-mock-adapter": "1.22.0",
|
|
48
48
|
"babel-cli": "6.26.0",
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"moment": "2.29.4",
|
|
91
91
|
"json5": "2.2.3",
|
|
92
92
|
"ip": "2.0.1",
|
|
93
|
-
"axios": "1.
|
|
93
|
+
"axios": "1.8.1",
|
|
94
94
|
"merge": "2.1.1",
|
|
95
95
|
"glob-parent": "6.0.2",
|
|
96
96
|
"follow-redirects": "1.15.5",
|
package/src/cart/cartService.js
CHANGED
|
@@ -296,7 +296,12 @@ async function getEquinoxRequestConfiguration() {
|
|
|
296
296
|
const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
|
|
297
297
|
|
|
298
298
|
// Use MySite_API_Base_URLs if it is in MySite or MSCART
|
|
299
|
-
const
|
|
299
|
+
const isMysite = cartType === shoppingContextCartTypes.storefront || window.location.hostname.includes(".mynuskin.com");
|
|
300
|
+
const baseURL = isMysite ? config.MySite_API_Base_URLs : config.API_Base_URLs;
|
|
301
|
+
|
|
302
|
+
let mySiteKongURL = baseURL.includes(isMysite ? "storefront" : "apis")
|
|
303
|
+
? baseURL
|
|
304
|
+
: `${baseURL}/orchestrationservices/storefront`;
|
|
300
305
|
|
|
301
306
|
const equinoxMarket = {
|
|
302
307
|
market_name: config.market_name,
|
|
@@ -335,7 +340,7 @@ async function _equinoxRequest(options) {
|
|
|
335
340
|
|
|
336
341
|
let axiosRequest = {
|
|
337
342
|
method: options.method,
|
|
338
|
-
url: `${mySiteKongURL}
|
|
343
|
+
url: `${mySiteKongURL}/${options.endpoint}`,
|
|
339
344
|
headers:{...defaultHeaders, ... options.headers },
|
|
340
345
|
withCredentials: (options.method !== "DELETE"),
|
|
341
346
|
params: (options.params) ? options.params : defaultEquinoxParams
|
package/src/order/order.js
CHANGED
|
@@ -56,7 +56,6 @@ newShop.Order = function(orderData){
|
|
|
56
56
|
let errorResponseInfo;
|
|
57
57
|
let paymentAuthorizationObject;
|
|
58
58
|
let giftReceipt;
|
|
59
|
-
let dropShip;
|
|
60
59
|
let externalPaymentAdrNumber;
|
|
61
60
|
|
|
62
61
|
let redirectUrl;
|
|
@@ -118,7 +117,6 @@ newShop.Order = function(orderData){
|
|
|
118
117
|
errorResponseInfo = orderData.errorResponseInfo;
|
|
119
118
|
paymentAuthorizationObject = orderData.paymentAuthorizationObject;
|
|
120
119
|
giftReceipt = orderData.giftReceipt;
|
|
121
|
-
dropShip = orderData.dropShip;
|
|
122
120
|
externalPaymentAdrNumber = orderData.externalPaymentAdrNumber;
|
|
123
121
|
redirectUrl = orderData.redirectUrl;
|
|
124
122
|
proxyLaunchUrl = orderData.proxyLaunchUrl;
|
|
@@ -274,7 +272,6 @@ newShop.Order = function(orderData){
|
|
|
274
272
|
order.externalPaymentAdrNumber = externalPaymentAdrNumber;
|
|
275
273
|
order.paymentAuthorizationObject = paymentAuthorizationObject;
|
|
276
274
|
order.giftReceipt = giftReceipt;
|
|
277
|
-
order.dripShip = dropShip;
|
|
278
275
|
order.redirectUrl = redirectUrl;
|
|
279
276
|
order.proxyLaunchUrl = proxyLaunchUrl;
|
|
280
277
|
order.proxyReenterUrl = proxyReenterUrl;
|
|
@@ -694,14 +691,6 @@ newShop.Order = function(orderData){
|
|
|
694
691
|
giftReceipt = _giftReceipt;
|
|
695
692
|
}
|
|
696
693
|
},
|
|
697
|
-
dropShip: {
|
|
698
|
-
get: function() {
|
|
699
|
-
return dropShip;
|
|
700
|
-
},
|
|
701
|
-
set: function(_dropShip) {
|
|
702
|
-
dropShip = _dropShip;
|
|
703
|
-
}
|
|
704
|
-
},
|
|
705
694
|
externalPaymentAdrNumber: {
|
|
706
695
|
get: function() {
|
|
707
696
|
return externalPaymentAdrNumber;
|
|
@@ -1027,9 +1027,6 @@ const populateSalesOrder = (action, adr) => {
|
|
|
1027
1027
|
}
|
|
1028
1028
|
addToCustomList(salesOrder.Custom, "", "SENDER", order.distributorName);
|
|
1029
1029
|
addToCustomList(salesOrder.Custom, "", "ZZUSE_PTS", order.shippingPayWithPoints ? "X" : "NA");
|
|
1030
|
-
if (order.dropShip) {
|
|
1031
|
-
addToCustomList(salesOrder.Custom, "FLAG", "DROPSHIP", "TRUE");
|
|
1032
|
-
}
|
|
1033
1030
|
if (user && user.isGuest) {
|
|
1034
1031
|
addToCustomList(salesOrder.Custom, "FLAG", "GUEST", "TRUE");
|
|
1035
1032
|
}
|