@nuskin/ns-shop 7.1.1-pur-813.6 → 7.1.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 +1 -1
- package/src/order/orderAdapter.js +11 -1
- package/src/shipping/pickupUtil.js +1 -10
package/package.json
CHANGED
|
@@ -136,7 +136,7 @@ const populateItem = (order, salesOrder, shipImmediate, includeSapItems) => {
|
|
|
136
136
|
};
|
|
137
137
|
|
|
138
138
|
const populateAttribution = (salesOrder) => {
|
|
139
|
-
const sponsorId = util.getSponsorId();
|
|
139
|
+
const sponsorId = util.getSponsorId();
|
|
140
140
|
|
|
141
141
|
if (sponsorId) {
|
|
142
142
|
if (sponsorId.match(/^[A-Z]{2}(:?\d{7}|\d{8})$/)) {
|
|
@@ -149,6 +149,16 @@ const populateAttribution = (salesOrder) => {
|
|
|
149
149
|
} else {
|
|
150
150
|
console.error('Invalid sponsorId', sponsorId);
|
|
151
151
|
}
|
|
152
|
+
} else {
|
|
153
|
+
const guestSponsorId = UserService.getUser();
|
|
154
|
+
if(guestSponsorId.sponsorId == 'RETFLOAT' || guestSponsorId.sponsorId == 'NSHOUSE'){
|
|
155
|
+
salesOrder.Shipping.ShippingParty.push({
|
|
156
|
+
Type: "RTL_SELLER",
|
|
157
|
+
ShippingMemberID: 'NSHOUSE',
|
|
158
|
+
ShippingAddress: {
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
}
|
|
152
162
|
}
|
|
153
163
|
}
|
|
154
164
|
|
|
@@ -171,23 +171,14 @@ let PickupUtil = function() {
|
|
|
171
171
|
|
|
172
172
|
function loadShipMethods() {
|
|
173
173
|
const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
|
|
174
|
-
|
|
175
|
-
const postalCode = order.shippingPostalCode;
|
|
176
|
-
const {metapackMarket, metapackZipExclusions} = getCachedConfiguration('Checkout');
|
|
174
|
+
const {metapackMarket} = getCachedConfiguration('Checkout');
|
|
177
175
|
|
|
178
176
|
if (metapackMarket) {
|
|
179
|
-
let includePickupPoints = true;
|
|
180
|
-
for (const zipRegEx of metapackZipExclusions || []) {
|
|
181
|
-
const regEx = new RegExp(zipRegEx);
|
|
182
|
-
includePickupPoints = includePickupPoints && !postalCode.match(regEx);
|
|
183
|
-
}
|
|
184
|
-
|
|
185
177
|
const runConfig = RunConfigService.getRunConfig();
|
|
186
178
|
promise = axios.post(
|
|
187
179
|
getUrl(),
|
|
188
180
|
{
|
|
189
181
|
order,
|
|
190
|
-
pudo: includePickupPoints,
|
|
191
182
|
orderValue: getOrderValue(),
|
|
192
183
|
dangerousGoods: CartService.hasDangerousGoods(),
|
|
193
184
|
language: runConfig.language,
|