@nuskin/ns-product-lib 2.6.0-cx24-3377.13 → 2.6.0-cx24-3464.2
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +15 -79
- package/package.json +1 -1
- package/src/product.js +62 -65
- package/src/productData.js +107 -62
package/CHANGELOG.md
CHANGED
|
@@ -1,99 +1,35 @@
|
|
|
1
|
-
# [2.6.0-cx24-
|
|
1
|
+
# [2.6.0-cx24-3464.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3464.1...v2.6.0-cx24-3464.2) (2023-03-10)
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
### New
|
|
5
5
|
|
|
6
|
-
*
|
|
6
|
+
* Update equinox query for KIT and its mapping ([7df6f96](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7df6f9671c58eddb57c9acfd9d4b79b8dec6a78e))
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
### New
|
|
12
|
-
|
|
13
|
-
* Fix multiple variants not loading properly (CX24-3377) ([b66be37](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b66be37163a64c6fcc0d763b748a653d3fc0ebb9))
|
|
14
|
-
* Fix multiple variants not loading properly (CX24-3377) ([10821f1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/10821f1924f5f0d7b985af15d382948e99592e42))
|
|
15
|
-
|
|
16
|
-
# [2.6.0-cx24-3377.11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.10...v2.6.0-cx24-3377.11) (2023-03-10)
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
### New
|
|
20
|
-
|
|
21
|
-
* Fix multiple variants not loading properly (CX24-3377) ([9f8273b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f8273b5a8ae3aaf40fb417d04e2087b4b0f036b))
|
|
22
|
-
|
|
23
|
-
# [2.6.0-cx24-3377.10](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.9...v2.6.0-cx24-3377.10) (2023-03-09)
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
### New
|
|
27
|
-
|
|
28
|
-
* Fix multiple variants not loading properly (CX24-3377) ([1b08b2a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1b08b2ad4ea7bdceca494f6121f14f74236afb97))
|
|
29
|
-
|
|
30
|
-
# [2.6.0-cx24-3377.9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.8...v2.6.0-cx24-3377.9) (2023-03-09)
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
### New
|
|
34
|
-
|
|
35
|
-
* Fix multiple variants not loading properly (CX24-3377) ([fbeaa05](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fbeaa050c39a486c81979e6034ce1ae19a613ff6))
|
|
36
|
-
|
|
37
|
-
# [2.6.0-cx24-3377.8](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.7...v2.6.0-cx24-3377.8) (2023-03-09)
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
### New
|
|
41
|
-
|
|
42
|
-
* Fix multiple variants not loading properly (CX24-3377) ([e32840a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e32840aabdec5b13c7a6b8dd276adb523689890f))
|
|
43
|
-
|
|
44
|
-
# [2.6.0-cx24-3377.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.6...v2.6.0-cx24-3377.7) (2023-03-09)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
### New
|
|
48
|
-
|
|
49
|
-
* Fix multiple variants not loading properly (CX24-3377) ([15431ae](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/15431aef763e3d70ab8d1485509ec571df3b78f3))
|
|
50
|
-
|
|
51
|
-
# [2.6.0-cx24-3377.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.5...v2.6.0-cx24-3377.6) (2023-03-09)
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
### New
|
|
55
|
-
|
|
56
|
-
* Fix multiple variants not loading properly (CX24-3377) ([d653c88](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d653c887a529d2e93e05028e9eed8064991470ee))
|
|
57
|
-
|
|
58
|
-
# [2.6.0-cx24-3377.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.4...v2.6.0-cx24-3377.5) (2023-03-09)
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
### New
|
|
62
|
-
|
|
63
|
-
* Fix multiple variants not loading properly (CX24-3377) ([d681803](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d681803ccbc2290a0e843e8eb1b191d33ba97cbe))
|
|
64
|
-
|
|
65
|
-
# [2.6.0-cx24-3377.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.3...v2.6.0-cx24-3377.4) (2023-03-09)
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
### New
|
|
69
|
-
|
|
70
|
-
* Fix multiple variants not loading properly (CX24-3377) ([1b37ed5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1b37ed513dbd9a8751b8378d5133582b88fdcb97))
|
|
71
|
-
* Fix multiple variants not loading properly (CX24-3377) ([ae2c91f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ae2c91fa98838e60745009e4b66b8c728fad58b8))
|
|
72
|
-
|
|
73
|
-
# [2.6.0-cx24-3377.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-3377.2...v2.6.0-cx24-3377.3) (2023-03-08)
|
|
8
|
+
### Release
|
|
74
9
|
|
|
10
|
+
* Automated changes by GitLab pipeline [skip ci] ([f8233b3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f8233b37ecf0c805404395c68e0237930e274904))
|
|
11
|
+
* Automated changes by GitLab pipeline [skip ci] ([8aa3e84](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8aa3e84df61f6855ad1544f592f4a2825a92e6fb))
|
|
75
12
|
|
|
76
|
-
###
|
|
13
|
+
### Update
|
|
77
14
|
|
|
78
|
-
*
|
|
79
|
-
*
|
|
80
|
-
*
|
|
15
|
+
* get child skus to be used for add-to-cart #CX24-3464 ([9bf1a82](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9bf1a828a3073dd4118abba088a22b854db78172)), closes [#CX24-3464](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3464)
|
|
16
|
+
* get child skus to be used for add-to-cart #CX24-3464 ([b1b7dc9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b1b7dc9f9ed85aca18fd2ec98d5938131e79aaed)), closes [#CX24-3464](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3464)
|
|
17
|
+
* get child skus to be used for add-to-cart #CX24-3464 ([9cc5a85](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9cc5a85768a9080fd232acb8096eb7cd50e37028)), closes [#CX24-3464](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3464)
|
|
18
|
+
* removed with credentials default ([48f7bdb](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/48f7bdbe9154a82ed48195d0f93f9e4772bf92dc))
|
|
81
19
|
|
|
82
|
-
# [2.6.0-cx24-
|
|
20
|
+
# [2.6.0-cx24-33721.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0-cx24-33721.1...v2.6.0-cx24-33721.2) (2023-03-09)
|
|
83
21
|
|
|
84
22
|
|
|
85
|
-
###
|
|
23
|
+
### Update
|
|
86
24
|
|
|
87
|
-
*
|
|
25
|
+
* removed with credentials default ([48f7bdb](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/48f7bdbe9154a82ed48195d0f93f9e4772bf92dc))
|
|
88
26
|
|
|
89
|
-
# [2.6.0-cx24-
|
|
27
|
+
# [2.6.0-cx24-33721.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.1...v2.6.0-cx24-33721.1) (2023-03-08)
|
|
90
28
|
|
|
91
29
|
|
|
92
30
|
### New
|
|
93
31
|
|
|
94
|
-
*
|
|
95
|
-
* Fix multiple variants not loading properly (CX24-3377) ([2990272](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/29902726ac21a246638586b5645a070bed1b7fa4))
|
|
96
|
-
* Fix multiple variants not loading properly (CX24-3377) ([0cee74b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0cee74bc366a9032966d235e54b731d03333f902))
|
|
32
|
+
* Update equinox query for KIT and its mapping ([7df6f96](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7df6f9671c58eddb57c9acfd9d4b79b8dec6a78e))
|
|
97
33
|
|
|
98
34
|
## [2.5.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0...v2.5.1) (2023-03-07)
|
|
99
35
|
|
package/package.json
CHANGED
package/src/product.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
const { isTrue }
|
|
3
|
+
const { isTrue } = require("@nuskin/ns-common-lib");
|
|
4
4
|
|
|
5
5
|
const ProductUtils = require("./productUtils.js");
|
|
6
6
|
|
|
@@ -8,7 +8,7 @@ const Agelocme = require("./agelocme.js");
|
|
|
8
8
|
const PriceType = require("./models/priceType.js");
|
|
9
9
|
const ProductStatus = require("./models/productStatus.js");
|
|
10
10
|
|
|
11
|
-
const Product = function
|
|
11
|
+
const Product = function(productData) {
|
|
12
12
|
this.priceMap = {};
|
|
13
13
|
this.pvMap = {};
|
|
14
14
|
this.cvMap = {};
|
|
@@ -77,13 +77,13 @@ const Product = function (productData) {
|
|
|
77
77
|
this.inventory = "";
|
|
78
78
|
this.equinoxProductId = "";
|
|
79
79
|
|
|
80
|
-
this.setMarketAttributes = function
|
|
80
|
+
this.setMarketAttributes = function(productStatus) {
|
|
81
81
|
if (productStatus.marketAttributes) {
|
|
82
82
|
this.marketAttributes = productStatus.marketAttributes;
|
|
83
83
|
}
|
|
84
84
|
};
|
|
85
85
|
|
|
86
|
-
this.getAgelocmeKeyPart = function
|
|
86
|
+
this.getAgelocmeKeyPart = function() {
|
|
87
87
|
let keyPart = null;
|
|
88
88
|
if (this.agelocme) {
|
|
89
89
|
keyPart =
|
|
@@ -97,27 +97,27 @@ const Product = function (productData) {
|
|
|
97
97
|
return keyPart;
|
|
98
98
|
};
|
|
99
99
|
|
|
100
|
-
this.getHighlightedSku = function
|
|
100
|
+
this.getHighlightedSku = function() {
|
|
101
101
|
let rv = this.sku;
|
|
102
102
|
if (this.highlightedSku) rv = this.highlightedSku;
|
|
103
103
|
return rv;
|
|
104
104
|
};
|
|
105
105
|
|
|
106
|
-
this.getProductSearchTitle = function
|
|
106
|
+
this.getProductSearchTitle = function() {
|
|
107
107
|
if (this.agelocme && this.agelocme.label) {
|
|
108
108
|
return this.agelocme.label;
|
|
109
109
|
}
|
|
110
110
|
return this.title;
|
|
111
111
|
};
|
|
112
112
|
|
|
113
|
-
this.getProductSearchSku = function
|
|
113
|
+
this.getProductSearchSku = function() {
|
|
114
114
|
if (this.agelocme && this.agelocme.code) {
|
|
115
115
|
return this.agelocme.code;
|
|
116
116
|
}
|
|
117
117
|
return this.getHighlightedSku();
|
|
118
118
|
};
|
|
119
119
|
|
|
120
|
-
this.getDescription = function
|
|
120
|
+
this.getDescription = function() {
|
|
121
121
|
let description = this.longDescr;
|
|
122
122
|
if (!description || description.length === 0) {
|
|
123
123
|
return this.shortDescr;
|
|
@@ -125,7 +125,7 @@ const Product = function (productData) {
|
|
|
125
125
|
return description;
|
|
126
126
|
};
|
|
127
127
|
|
|
128
|
-
this.setFullImage = function
|
|
128
|
+
this.setFullImage = function(fullImage) {
|
|
129
129
|
if (fullImage) {
|
|
130
130
|
this.fullImage = fullImage.replace("http:", "https:");
|
|
131
131
|
} else {
|
|
@@ -133,19 +133,19 @@ const Product = function (productData) {
|
|
|
133
133
|
}
|
|
134
134
|
};
|
|
135
135
|
|
|
136
|
-
this.getFullImage = function
|
|
136
|
+
this.getFullImage = function() {
|
|
137
137
|
return this.fullImage ? this.fullImage.replace("http:", "https:") : "";
|
|
138
138
|
};
|
|
139
139
|
|
|
140
|
-
this.setProductCarouselImages = function
|
|
140
|
+
this.setProductCarouselImages = function(productCarouselImages) {
|
|
141
141
|
this.productCarouselImages = productCarouselImages;
|
|
142
142
|
};
|
|
143
143
|
|
|
144
|
-
this.getProductCarouselImages = function
|
|
144
|
+
this.getProductCarouselImages = function() {
|
|
145
145
|
return this.productCarouselImages;
|
|
146
146
|
};
|
|
147
147
|
|
|
148
|
-
this.setImageAltText = function
|
|
148
|
+
this.setImageAltText = function(altText) {
|
|
149
149
|
if (altText) {
|
|
150
150
|
this.imageAltText = altText;
|
|
151
151
|
} else {
|
|
@@ -153,11 +153,11 @@ const Product = function (productData) {
|
|
|
153
153
|
}
|
|
154
154
|
};
|
|
155
155
|
|
|
156
|
-
this.getImageAltText = function
|
|
156
|
+
this.getImageAltText = function() {
|
|
157
157
|
return this.imageAltText || this.title;
|
|
158
158
|
};
|
|
159
159
|
|
|
160
|
-
this.setThumbnail = function
|
|
160
|
+
this.setThumbnail = function(thumbnail) {
|
|
161
161
|
if (thumbnail) {
|
|
162
162
|
this.thumbnail = thumbnail.replace("http:", "https:");
|
|
163
163
|
} else {
|
|
@@ -165,7 +165,7 @@ const Product = function (productData) {
|
|
|
165
165
|
}
|
|
166
166
|
};
|
|
167
167
|
|
|
168
|
-
this.setThumbnailFromSku = function
|
|
168
|
+
this.setThumbnailFromSku = function(sku) {
|
|
169
169
|
// WARNING: Base URL will need to be handled in the client (call setBaseUrl)
|
|
170
170
|
// eslint-disable-next-line max-len
|
|
171
171
|
// this.thumbnail = `${RunConfigService.getBaseUrl()}/content/products/${ProductUtils.getTokenizedSku(sku)}/jcr:content/fullImage.img.100.100.png`;
|
|
@@ -175,43 +175,43 @@ const Product = function (productData) {
|
|
|
175
175
|
)}/jcr:content/fullImage.img.100.100.png`;
|
|
176
176
|
};
|
|
177
177
|
|
|
178
|
-
this.getThumbnail = function
|
|
178
|
+
this.getThumbnail = function() {
|
|
179
179
|
return this.thumbnail ? this.thumbnail.replace("http:", "https:") : "";
|
|
180
180
|
};
|
|
181
181
|
|
|
182
|
-
this.hasAvailableQuantity = function
|
|
182
|
+
this.hasAvailableQuantity = function(qty = 1) {
|
|
183
183
|
return Math.min(this.maxQuantity, this.availableQuantity) >= qty;
|
|
184
184
|
};
|
|
185
185
|
|
|
186
|
-
this.setPoints = function
|
|
186
|
+
this.setPoints = function(points) {
|
|
187
187
|
this.points = ensureFloatVal(points) || "";
|
|
188
188
|
};
|
|
189
189
|
|
|
190
|
-
this.getPointsFixed = function
|
|
190
|
+
this.getPointsFixed = function() {
|
|
191
191
|
return parseFloat(this.points).toFixed(2);
|
|
192
192
|
};
|
|
193
193
|
|
|
194
|
-
this.setCv = function
|
|
194
|
+
this.setCv = function(cv) {
|
|
195
195
|
this.cv = ensureFloatVal(cv) || "";
|
|
196
196
|
};
|
|
197
197
|
|
|
198
|
-
this.getCvFixed = function
|
|
198
|
+
this.getCvFixed = function() {
|
|
199
199
|
return parseFloat(this.cv).toFixed(2);
|
|
200
200
|
};
|
|
201
201
|
|
|
202
|
-
this.setPv = function
|
|
202
|
+
this.setPv = function(pv) {
|
|
203
203
|
this.pv = ensureFloatVal(pv) || "";
|
|
204
204
|
};
|
|
205
205
|
|
|
206
|
-
this.getPvFixed = function
|
|
206
|
+
this.getPvFixed = function() {
|
|
207
207
|
return parseFloat(this.pv || 0).toFixed(2);
|
|
208
208
|
};
|
|
209
209
|
|
|
210
|
-
this.setPrice = function
|
|
210
|
+
this.setPrice = function(price) {
|
|
211
211
|
this.price = ensureFloatVal(price, true);
|
|
212
212
|
};
|
|
213
213
|
|
|
214
|
-
this.setFormattedPrice = function
|
|
214
|
+
this.setFormattedPrice = function(formattedPrice) {
|
|
215
215
|
this.formattedPrice = formattedPrice;
|
|
216
216
|
};
|
|
217
217
|
|
|
@@ -220,13 +220,13 @@ const Product = function (productData) {
|
|
|
220
220
|
* added to the cart the event pricing needs to be remembered if toggling between
|
|
221
221
|
* pricetypes with event pricing and pricetype without event pricing
|
|
222
222
|
*/
|
|
223
|
-
this.lockEventName = function
|
|
223
|
+
this.lockEventName = function() {
|
|
224
224
|
if (!this.savedEventName && this.eventName) {
|
|
225
225
|
this.savedEventName = this.eventName;
|
|
226
226
|
}
|
|
227
227
|
};
|
|
228
228
|
|
|
229
|
-
this.setPriceAndPvFromType = function
|
|
229
|
+
this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
|
|
230
230
|
// WARNING: priceType needs to be handled client-side
|
|
231
231
|
// const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
|
|
232
232
|
// ? PriceType.WWHL
|
|
@@ -271,11 +271,11 @@ const Product = function (productData) {
|
|
|
271
271
|
return changed;
|
|
272
272
|
};
|
|
273
273
|
|
|
274
|
-
this.getPrice = function
|
|
274
|
+
this.getPrice = function() {
|
|
275
275
|
return this.price ? this.price : 0;
|
|
276
276
|
};
|
|
277
277
|
|
|
278
|
-
this.getPriceFixed = function
|
|
278
|
+
this.getPriceFixed = function() {
|
|
279
279
|
if (typeof this.price === "number") {
|
|
280
280
|
return parseFloat(this.price.toFixed(2));
|
|
281
281
|
} else {
|
|
@@ -283,15 +283,15 @@ const Product = function (productData) {
|
|
|
283
283
|
}
|
|
284
284
|
};
|
|
285
285
|
|
|
286
|
-
this.getOriginalPrice = function
|
|
286
|
+
this.getOriginalPrice = function() {
|
|
287
287
|
return this.priceType ? this.priceMap[this.priceType] : null;
|
|
288
288
|
};
|
|
289
289
|
|
|
290
|
-
this.addPricing = function
|
|
290
|
+
this.addPricing = function(type, price) {
|
|
291
291
|
this.priceMap[type] = price;
|
|
292
292
|
};
|
|
293
293
|
|
|
294
|
-
this.addPricingFromStatus = function
|
|
294
|
+
this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
|
|
295
295
|
let modified = false;
|
|
296
296
|
|
|
297
297
|
if (!priceType) {
|
|
@@ -326,7 +326,7 @@ const Product = function (productData) {
|
|
|
326
326
|
}, this);
|
|
327
327
|
}
|
|
328
328
|
this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
|
|
329
|
-
if
|
|
329
|
+
if(productStatus.childSkus) {
|
|
330
330
|
this.childSkus = productStatus.childSkus;
|
|
331
331
|
}
|
|
332
332
|
this.setPriceAndPvFromType(priceType, null, option);
|
|
@@ -346,15 +346,15 @@ const Product = function (productData) {
|
|
|
346
346
|
return modified;
|
|
347
347
|
};
|
|
348
348
|
|
|
349
|
-
this.addPvWithType = function
|
|
349
|
+
this.addPvWithType = function(type, pv) {
|
|
350
350
|
this.pvMap[type] = pv;
|
|
351
351
|
};
|
|
352
352
|
|
|
353
|
-
this.addCvWithType = function
|
|
353
|
+
this.addCvWithType = function(type, cv) {
|
|
354
354
|
this.cvMap[type] = cv;
|
|
355
355
|
};
|
|
356
356
|
|
|
357
|
-
this.getPricing = function
|
|
357
|
+
this.getPricing = function(type) {
|
|
358
358
|
let retVal = null;
|
|
359
359
|
|
|
360
360
|
if (type) {
|
|
@@ -381,7 +381,7 @@ const Product = function (productData) {
|
|
|
381
381
|
return eventPriceTypes;
|
|
382
382
|
};
|
|
383
383
|
|
|
384
|
-
this.getPvWithType = function
|
|
384
|
+
this.getPvWithType = function(type) {
|
|
385
385
|
let rv = this.pvMap[type];
|
|
386
386
|
if (rv == null) {
|
|
387
387
|
// Assumption: we always have WWHL from the service
|
|
@@ -391,7 +391,7 @@ const Product = function (productData) {
|
|
|
391
391
|
return rv;
|
|
392
392
|
};
|
|
393
393
|
|
|
394
|
-
this.getCvWithType = function
|
|
394
|
+
this.getCvWithType = function(type) {
|
|
395
395
|
let rv = this.cvMap[type];
|
|
396
396
|
if (rv == null) {
|
|
397
397
|
rv = this.cvMap[PriceType.WWHL];
|
|
@@ -399,80 +399,77 @@ const Product = function (productData) {
|
|
|
399
399
|
return rv;
|
|
400
400
|
};
|
|
401
401
|
|
|
402
|
-
this.hasAdrOption = function
|
|
402
|
+
this.hasAdrOption = function() {
|
|
403
403
|
return this.orderTypes["adr"];
|
|
404
404
|
};
|
|
405
405
|
|
|
406
|
-
this.isAdrOnly = function
|
|
406
|
+
this.isAdrOnly = function() {
|
|
407
407
|
return this.hasAdrOption() && !this.hasOrderOption();
|
|
408
408
|
};
|
|
409
409
|
|
|
410
|
-
this.hasMultipleOrderTypes = function
|
|
410
|
+
this.hasMultipleOrderTypes = function() {
|
|
411
411
|
return this.hasOrderOption() && this.hasAdrOption();
|
|
412
412
|
};
|
|
413
413
|
|
|
414
|
-
this.hasOrderOption = function
|
|
414
|
+
this.hasOrderOption = function() {
|
|
415
415
|
return this.orderTypes["order"];
|
|
416
416
|
};
|
|
417
417
|
|
|
418
|
-
this.isDistributor = function
|
|
418
|
+
this.isDistributor = function() {
|
|
419
419
|
return this.custTypes.includes("10");
|
|
420
420
|
};
|
|
421
421
|
|
|
422
|
-
this.isCustomer = function
|
|
422
|
+
this.isCustomer = function() {
|
|
423
423
|
return this.custTypes.includes("20");
|
|
424
424
|
};
|
|
425
425
|
|
|
426
|
-
this.isPreferredCustomer = function
|
|
426
|
+
this.isPreferredCustomer = function() {
|
|
427
427
|
return this.custTypes.includes("30");
|
|
428
428
|
};
|
|
429
429
|
|
|
430
|
-
this.isBase = function
|
|
430
|
+
this.isBase = function() {
|
|
431
431
|
return this.sku.substring(2, 4) === "55";
|
|
432
432
|
};
|
|
433
433
|
|
|
434
|
-
this.isVariant = function
|
|
435
|
-
if (this.equinoxProductId != "") {
|
|
436
|
-
return this.variantSkus().length === 0
|
|
437
|
-
}
|
|
434
|
+
this.isVariant = function() {
|
|
438
435
|
return this.baseSku.length > 0 && this.variantSkus().length === 0;
|
|
439
436
|
};
|
|
440
437
|
|
|
441
|
-
this.setVariant = function
|
|
438
|
+
this.setVariant = function(variantProduct) {
|
|
442
439
|
if (variantProduct && variantProduct.sku) {
|
|
443
440
|
this.variants[variantProduct.sku] = variantProduct;
|
|
444
441
|
}
|
|
445
442
|
};
|
|
446
443
|
|
|
447
|
-
this.getVariant = function
|
|
444
|
+
this.getVariant = function(sku) {
|
|
448
445
|
return this.variants[sku];
|
|
449
446
|
};
|
|
450
447
|
|
|
451
|
-
this.variantSkus = function
|
|
448
|
+
this.variantSkus = function() {
|
|
452
449
|
return Object.keys(this.variants);
|
|
453
450
|
};
|
|
454
451
|
|
|
455
|
-
this.getVariantsList = function
|
|
452
|
+
this.getVariantsList = function() {
|
|
456
453
|
return Object.values(this.variants);
|
|
457
454
|
};
|
|
458
455
|
|
|
459
|
-
this.getMinPrice = function
|
|
456
|
+
this.getMinPrice = function() {
|
|
460
457
|
return this.priceMap[`min-${this.priceType}`];
|
|
461
458
|
};
|
|
462
459
|
|
|
463
|
-
this.getMaxPrice = function
|
|
460
|
+
this.getMaxPrice = function() {
|
|
464
461
|
return this.priceMap[`max-${this.priceType}`];
|
|
465
462
|
};
|
|
466
463
|
|
|
467
|
-
this.getMinPv = function
|
|
464
|
+
this.getMinPv = function() {
|
|
468
465
|
return this.pvMap[`min-${this.priceType}`];
|
|
469
466
|
};
|
|
470
467
|
|
|
471
|
-
this.getMaxPv = function
|
|
468
|
+
this.getMaxPv = function() {
|
|
472
469
|
return this.pvMap[`max-${this.priceType}`];
|
|
473
470
|
};
|
|
474
471
|
|
|
475
|
-
this.toJSON = function
|
|
472
|
+
this.toJSON = function() {
|
|
476
473
|
let retData = {};
|
|
477
474
|
retData.sku = this.sku;
|
|
478
475
|
retData.globalProductID = this.globalProductID;
|
|
@@ -541,11 +538,11 @@ const Product = function (productData) {
|
|
|
541
538
|
return retData;
|
|
542
539
|
};
|
|
543
540
|
|
|
544
|
-
this.setMeCommerceProductData = function
|
|
541
|
+
this.setMeCommerceProductData = function(/*productData*/) {
|
|
545
542
|
console.error("setMeCommerceProductData is deprecated!");
|
|
546
543
|
};
|
|
547
544
|
|
|
548
|
-
this.setBaseUrl = function
|
|
545
|
+
this.setBaseUrl = function(baseUrl) {
|
|
549
546
|
this.thumbnail = ProductUtils.applyBaseUrl(this.thumbnail, baseUrl);
|
|
550
547
|
this.fullImage = ProductUtils.applyBaseUrl(this.fullImage, baseUrl);
|
|
551
548
|
|
|
@@ -557,7 +554,7 @@ const Product = function (productData) {
|
|
|
557
554
|
}
|
|
558
555
|
};
|
|
559
556
|
|
|
560
|
-
this.setProductData = function
|
|
557
|
+
this.setProductData = function(productData) {
|
|
561
558
|
let data;
|
|
562
559
|
|
|
563
560
|
if (productData) {
|
|
@@ -665,7 +662,7 @@ const Product = function (productData) {
|
|
|
665
662
|
? data.pvMap
|
|
666
663
|
: this.pvMap;
|
|
667
664
|
this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, data.orderTypes);
|
|
668
|
-
if
|
|
665
|
+
if(data.childSkus) {
|
|
669
666
|
this.childSkus = data.childSkus;
|
|
670
667
|
}
|
|
671
668
|
this.custTypes = data.custTypes || [];
|
|
@@ -681,7 +678,7 @@ const Product = function (productData) {
|
|
|
681
678
|
}
|
|
682
679
|
};
|
|
683
680
|
|
|
684
|
-
this.isEmpty = function
|
|
681
|
+
this.isEmpty = function() {
|
|
685
682
|
return (
|
|
686
683
|
isFieldEmpty(this.sku) &&
|
|
687
684
|
isFieldEmpty(this.title) &&
|
package/src/productData.js
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
const { getConfiguration } = require('@nuskin/configuration-sdk');
|
|
2
|
+
const { getConfiguration, getCachedConfigurations } = require('@nuskin/configuration-sdk');
|
|
3
3
|
const axios = require("axios");
|
|
4
4
|
const contentstack = require('./contentstack/contentstack');
|
|
5
5
|
const Product = require("./product");
|
|
6
6
|
const CustomerTypes = require('./models/customerTypes');
|
|
7
7
|
const ProductStatus = require("./models/productStatus");
|
|
8
|
+
|
|
9
|
+
const productTypes = {
|
|
10
|
+
kit: 'kit'
|
|
11
|
+
};
|
|
12
|
+
|
|
8
13
|
/** @type {*} */
|
|
9
14
|
const ProductData = {
|
|
10
15
|
/**
|
|
@@ -27,9 +32,23 @@ const ProductData = {
|
|
|
27
32
|
},
|
|
28
33
|
|
|
29
34
|
getProductFromEquinox: async function (skus, locale, config) {
|
|
30
|
-
|
|
35
|
+
|
|
36
|
+
let skuFilter = [];
|
|
37
|
+
|
|
38
|
+
if(Array.isArray(skus)) {
|
|
39
|
+
skus.forEach((sku) => {
|
|
40
|
+
skuFilter.push(`index_key_productId="${sku}" OR index_key_skuId="${sku}"`)
|
|
41
|
+
})
|
|
42
|
+
} else {
|
|
43
|
+
//all featured products
|
|
44
|
+
skuFilter.push(`index_key_productId="${skus}" OR index_key_skuId="${skus}"`)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
const filter = skuFilter.join(" OR ")
|
|
48
|
+
//axios.defaults.withCredentials = true;
|
|
49
|
+
|
|
31
50
|
const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
|
|
32
|
-
const href = `${url}?filter
|
|
51
|
+
const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
|
|
33
52
|
const response = await axios.request({
|
|
34
53
|
method: 'get',
|
|
35
54
|
url: href,
|
|
@@ -40,11 +59,10 @@ const ProductData = {
|
|
|
40
59
|
headers: this.getEquinoxRequestHeaders(),
|
|
41
60
|
responseType: 'json',
|
|
42
61
|
withCredentials: true
|
|
43
|
-
|
|
44
62
|
});
|
|
45
63
|
|
|
46
64
|
if (response.data.product) {
|
|
47
|
-
return this.eqProductMapper(response.data.product, skus);
|
|
65
|
+
return await this.eqProductMapper(response.data.product, skus);
|
|
48
66
|
}
|
|
49
67
|
|
|
50
68
|
return {
|
|
@@ -99,7 +117,7 @@ const ProductData = {
|
|
|
99
117
|
eqProductVariantMapper: function (eqVariant) {
|
|
100
118
|
|
|
101
119
|
let imageURL = eqVariant.properties.imageURL;
|
|
102
|
-
const regex = /\d
|
|
120
|
+
const regex = /\d+\.\d+/
|
|
103
121
|
let thumbnailImage = ''
|
|
104
122
|
|
|
105
123
|
if (imageURL.includes('contentstack')) {
|
|
@@ -255,7 +273,6 @@ const ProductData = {
|
|
|
255
273
|
"variantDropdownLabel": eqVariant.properties.variantSelectLabel || "",
|
|
256
274
|
"variantDropdownPlaceholder": "Select Type",
|
|
257
275
|
"variantsLabel": eqVariant.properties.variantSelectLabel || "",
|
|
258
|
-
"variants": {},
|
|
259
276
|
"groupOffer": false,
|
|
260
277
|
"personalOffer": false,
|
|
261
278
|
"savedEventName": eventName,
|
|
@@ -313,14 +330,17 @@ const ProductData = {
|
|
|
313
330
|
}
|
|
314
331
|
},
|
|
315
332
|
|
|
316
|
-
eqProductMapper: function (productDataResponse, skus) {
|
|
317
|
-
|
|
333
|
+
eqProductMapper: async function (productDataResponse, skus) {
|
|
334
|
+
// console.log(productDataResponse, skus);
|
|
318
335
|
let count = 0;
|
|
319
336
|
let variants = {};
|
|
337
|
+
const products = [];
|
|
320
338
|
|
|
321
|
-
|
|
322
|
-
let
|
|
323
|
-
const
|
|
339
|
+
for (const productData of productDataResponse) {
|
|
340
|
+
let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
|
|
341
|
+
const childSkus = await this.fetchChildSkus(product);
|
|
342
|
+
let imageURL = product.properties.imageURL;
|
|
343
|
+
const regex = /\d+\.\d+/
|
|
324
344
|
let thumbnailImage = ''
|
|
325
345
|
|
|
326
346
|
if (imageURL.includes('contentstack')) {
|
|
@@ -329,9 +349,9 @@ const ProductData = {
|
|
|
329
349
|
thumbnailImage = imageURL.replace(regex, '40.40')
|
|
330
350
|
}
|
|
331
351
|
|
|
332
|
-
if (
|
|
333
|
-
//exclude base product from variants
|
|
334
|
-
|
|
352
|
+
if (productData.sku && productData.sku.length > 1) {
|
|
353
|
+
// exclude base product from variants
|
|
354
|
+
productData.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
|
|
335
355
|
variants[variant.identifier] = this.eqProductVariantMapper(variant);
|
|
336
356
|
return variant;
|
|
337
357
|
});
|
|
@@ -342,20 +362,20 @@ const ProductData = {
|
|
|
342
362
|
eventLabels,
|
|
343
363
|
computedPrice,
|
|
344
364
|
defaultProductPrice
|
|
345
|
-
} = this.getEqProductPromotions(
|
|
346
|
-
const productPrice = eventName ? defaultProductPrice :
|
|
347
|
-
const discountedPrice = eventName ? computedPrice :
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
"sku":
|
|
351
|
-
"globalProductID":
|
|
352
|
-
"title":
|
|
353
|
-
"country":
|
|
365
|
+
} = this.getEqProductPromotions(product);
|
|
366
|
+
const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
|
|
367
|
+
const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
|
|
368
|
+
|
|
369
|
+
product = {
|
|
370
|
+
"sku": product.identifier,
|
|
371
|
+
"globalProductID": productData.identifier,
|
|
372
|
+
"title": productData.properties.name,
|
|
373
|
+
"country": product.properties.market,
|
|
354
374
|
"language": "en",
|
|
355
|
-
"shortDescr":
|
|
356
|
-
"longDescr":
|
|
375
|
+
"shortDescr": productData.properties.description,
|
|
376
|
+
"longDescr": productData.properties.productDetailsDescription,
|
|
357
377
|
"fullImage": imageURL,
|
|
358
|
-
"imageAltText":
|
|
378
|
+
"imageAltText": productData.properties.name,
|
|
359
379
|
"productCarouselImages": [
|
|
360
380
|
{
|
|
361
381
|
"contentType": "img",
|
|
@@ -364,10 +384,10 @@ const ProductData = {
|
|
|
364
384
|
}
|
|
365
385
|
],
|
|
366
386
|
"thumbnail": thumbnailImage,
|
|
367
|
-
"ingredients":
|
|
368
|
-
"benefits":
|
|
369
|
-
"usage":
|
|
370
|
-
"resources":
|
|
387
|
+
"ingredients": productData.properties.ingredients,
|
|
388
|
+
"benefits": productData.properties.benefits,
|
|
389
|
+
"usage": productData.properties.usage,
|
|
390
|
+
"resources": product.properties.resources,
|
|
371
391
|
"videos": "",
|
|
372
392
|
"movie": "",
|
|
373
393
|
"youtube": "",
|
|
@@ -377,49 +397,49 @@ const ProductData = {
|
|
|
377
397
|
"sectionContent": "<div class=\"contentSections\"></div>\n"
|
|
378
398
|
}
|
|
379
399
|
],
|
|
380
|
-
"scanQualified":
|
|
381
|
-
"availableQuantity":
|
|
400
|
+
"scanQualified": productData.properties.scanQualifiedCount,
|
|
401
|
+
"availableQuantity": (product.inventoryProperties) ? product.inventoryProperties.atpQty : 0,
|
|
382
402
|
"maxQuantity": 999,
|
|
383
403
|
"points": "",
|
|
384
|
-
"cv": (
|
|
385
|
-
"pv":
|
|
404
|
+
"cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
|
|
405
|
+
"pv": product.priceFacets.PV,
|
|
386
406
|
"priceType": "WRTL",
|
|
387
407
|
"price": discountedPrice,
|
|
388
408
|
"priceMap": {
|
|
389
409
|
"WRTL": productPrice,
|
|
390
|
-
"WADW-WRTL":
|
|
391
|
-
"WADR":
|
|
392
|
-
"RTL":
|
|
393
|
-
"WADW":
|
|
394
|
-
"WHL":
|
|
395
|
-
"WWHL":
|
|
410
|
+
"WADW-WRTL": product.priceFacets["Regular Price"],
|
|
411
|
+
"WADR": product.priceFacets["Regular Price"],
|
|
412
|
+
"RTL": product.priceFacets["Regular Price"],
|
|
413
|
+
"WADW": product.priceFacets["Wholesale Price"],
|
|
414
|
+
"WHL": product.priceFacets["Wholesale Price"],
|
|
415
|
+
"WWHL": product.priceFacets["Wholesale Price"]
|
|
396
416
|
},
|
|
397
417
|
"cvMap": {
|
|
398
|
-
"WWHL": (
|
|
399
|
-
"WADW": (
|
|
400
|
-
"WHL": (
|
|
418
|
+
"WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
|
|
419
|
+
"WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
|
|
420
|
+
"WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
|
|
401
421
|
},
|
|
402
422
|
"pvMap": {
|
|
403
|
-
"WWHL":
|
|
404
|
-
"WADW":
|
|
405
|
-
"WHL":
|
|
423
|
+
"WWHL": product.priceFacets.PV,
|
|
424
|
+
"WADW": product.priceFacets.PV,
|
|
425
|
+
"WHL": product.priceFacets.PV
|
|
406
426
|
},
|
|
407
|
-
"orderTypes": this._setOrderType(
|
|
408
|
-
|
|
409
|
-
"custTypes": this.switchCustType(
|
|
410
|
-
"division":
|
|
427
|
+
"orderTypes": this._setOrderType(product.properties),
|
|
428
|
+
childSkus,
|
|
429
|
+
"custTypes": this.switchCustType(product.properties.customerTypes),
|
|
430
|
+
"division": productData.properties.division,
|
|
411
431
|
"backOrderDate": null,
|
|
412
432
|
"locallyProduced": false,
|
|
413
433
|
"agelocme": null,
|
|
414
434
|
"count": "",
|
|
415
435
|
"flavor": "",
|
|
416
|
-
"size":
|
|
436
|
+
"size": product.properties.size,
|
|
417
437
|
"shade": "",
|
|
418
|
-
"status": this.switchStatusFromEquinox(
|
|
438
|
+
"status": this.switchStatusFromEquinox(product.properties.productStatus),
|
|
419
439
|
"variantType": "Other",
|
|
420
|
-
"variantDropdownLabel":
|
|
440
|
+
"variantDropdownLabel": product.properties.variantLabel || "",
|
|
421
441
|
"variantDropdownPlaceholder": "Select Type",
|
|
422
|
-
"variantsLabel":
|
|
442
|
+
"variantsLabel": product.properties.variantLabel || "",
|
|
423
443
|
"groupOffer": false,
|
|
424
444
|
"personalOffer": false,
|
|
425
445
|
"savedEventName": eventName,
|
|
@@ -429,7 +449,7 @@ const ProductData = {
|
|
|
429
449
|
"nettoWeight": "",
|
|
430
450
|
"variants": variants,
|
|
431
451
|
"searchScore": 0,
|
|
432
|
-
"isExclusive":
|
|
452
|
+
"isExclusive": product.properties.isExclusive || false,
|
|
433
453
|
"marketAttributes": {
|
|
434
454
|
"discount": true,
|
|
435
455
|
"redeem": true,
|
|
@@ -437,15 +457,15 @@ const ProductData = {
|
|
|
437
457
|
},
|
|
438
458
|
"restrictedMarkets": [],
|
|
439
459
|
"addOns": [],
|
|
440
|
-
"inventory":
|
|
441
|
-
"equinoxProductId":
|
|
460
|
+
"inventory": product.inventory || "", //inventory label
|
|
461
|
+
"equinoxProductId": productData.identifier
|
|
442
462
|
};
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
}
|
|
463
|
+
|
|
464
|
+
products.push(new Product(product));
|
|
465
|
+
}
|
|
446
466
|
|
|
447
467
|
let data = {
|
|
448
|
-
products: this._sortProductsBySku(skus,
|
|
468
|
+
products: this._sortProductsBySku(skus, products),
|
|
449
469
|
count: productDataResponse.length
|
|
450
470
|
};
|
|
451
471
|
return {
|
|
@@ -457,6 +477,31 @@ const ProductData = {
|
|
|
457
477
|
};
|
|
458
478
|
},
|
|
459
479
|
|
|
480
|
+
/**
|
|
481
|
+
*
|
|
482
|
+
* @param {*} product
|
|
483
|
+
*/
|
|
484
|
+
fetchChildSkus: async function(product) {
|
|
485
|
+
if (product.type === productTypes.kit) {
|
|
486
|
+
const config = getCachedConfigurations(['Equinox_Markets']);
|
|
487
|
+
const { skukits } = product.properties;
|
|
488
|
+
|
|
489
|
+
if (!skukits) {
|
|
490
|
+
return [];
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
const kits = skukits.split(',').map(kit => {
|
|
494
|
+
const [sku, qty] = kit.split('~');
|
|
495
|
+
return { sku, qty };
|
|
496
|
+
});
|
|
497
|
+
const skus = kits.map(k => k.sku);
|
|
498
|
+
const products = await this.getProductFromEquinox(skus, 'en_US', config.data);
|
|
499
|
+
console.log(products);
|
|
500
|
+
}
|
|
501
|
+
|
|
502
|
+
return [];
|
|
503
|
+
},
|
|
504
|
+
|
|
460
505
|
/**
|
|
461
506
|
*
|
|
462
507
|
* Map status from equinox to legacy
|