@nuskin/ns-shop 6.8.0 → 6.8.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/orderService.js +21 -9
package/package.json
CHANGED
|
@@ -80,9 +80,9 @@ const syncRedirectUrls = (salesOrderResponse, order) => {
|
|
|
80
80
|
* @param order
|
|
81
81
|
*/
|
|
82
82
|
const syncSalesOrderResponse = (salesOrderResponse, order) => {
|
|
83
|
-
order.availablePayments = salesOrderResponse.availablePayments;
|
|
84
|
-
order.addressTypeList = salesOrderResponse.addressTypeList;
|
|
85
|
-
order.orderProcessingState = salesOrderResponse.orderProcessingState;
|
|
83
|
+
if (salesOrderResponse.availablePayments) order.availablePayments = salesOrderResponse.availablePayments;
|
|
84
|
+
if (salesOrderResponse.addressTypeList) order.addressTypeList = salesOrderResponse.addressTypeList;
|
|
85
|
+
if (salesOrderResponse.orderProcessingState) order.orderProcessingState = salesOrderResponse.orderProcessingState;
|
|
86
86
|
};
|
|
87
87
|
|
|
88
88
|
/**
|
|
@@ -217,8 +217,10 @@ const adrShipImmediateSimulate = (adr) => {
|
|
|
217
217
|
if (data && data.messages) {
|
|
218
218
|
order.messages = data.messages;
|
|
219
219
|
}
|
|
220
|
-
if (data && data.SalesOrderResponse
|
|
220
|
+
if (data && data.SalesOrderResponse) {
|
|
221
221
|
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
222
|
+
}
|
|
223
|
+
if (data && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
|
|
222
224
|
await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
|
|
223
225
|
} else {
|
|
224
226
|
console.log("SAP Error while calling simulate...");
|
|
@@ -230,9 +232,11 @@ const adrShipImmediateSimulate = (adr) => {
|
|
|
230
232
|
console.log(err);
|
|
231
233
|
let data;
|
|
232
234
|
if (err && err.response) data = err.response.data;
|
|
235
|
+
if (data.SalesOrderResponse) {
|
|
236
|
+
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
237
|
+
}
|
|
233
238
|
if (data && data.messages) {
|
|
234
239
|
if ((data.messages[0].type === 'OrderException') && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
|
|
235
|
-
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
236
240
|
await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
|
|
237
241
|
} else if (data.messages[0].type === 'ProductDiscontinuedException') {
|
|
238
242
|
handleDiscontinuedSku(order, adr, data.messages);
|
|
@@ -352,8 +356,10 @@ const adrSimulate = (adr) => {
|
|
|
352
356
|
if (data && data.messages) {
|
|
353
357
|
order.messages = data.messages;
|
|
354
358
|
}
|
|
355
|
-
if (data && data.AdrResponse
|
|
359
|
+
if (data && data.AdrResponse) {
|
|
356
360
|
syncSalesOrderResponse(data.AdrResponse, order);
|
|
361
|
+
}
|
|
362
|
+
if (data && data.AdrResponse && data.AdrResponse.ADRDetail && data.AdrResponse.ADRDetail.SalesOrderDetail) {
|
|
357
363
|
await OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
|
|
358
364
|
} else {
|
|
359
365
|
console.log("SAP Error while calling simulate...");
|
|
@@ -365,9 +371,11 @@ const adrSimulate = (adr) => {
|
|
|
365
371
|
console.log(err);
|
|
366
372
|
let data;
|
|
367
373
|
if (err && err.response) data = err.response.data;
|
|
374
|
+
if (data && data.AdrResponse) {
|
|
375
|
+
syncSalesOrderResponse(data.AdrResponse, order);
|
|
376
|
+
}
|
|
368
377
|
if (data && data.messages) {
|
|
369
378
|
if ((data.messages[0].type === 'OrderException') && data.AdrResponse.ADRDetail && data.AdrResponse.ADRDetail.SalesOrderDetail) {
|
|
370
|
-
syncSalesOrderResponse(data.AdrResponse, order);
|
|
371
379
|
await OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
|
|
372
380
|
} else if (data.messages[0].type === 'ProductDiscontinuedException') {
|
|
373
381
|
handleDiscontinuedSku(order, adr, data.messages);
|
|
@@ -465,8 +473,10 @@ const orderSimulate = () => {
|
|
|
465
473
|
if (data && data.messages) {
|
|
466
474
|
order.messages = data.messages;
|
|
467
475
|
}
|
|
468
|
-
if (data && data.SalesOrderResponse
|
|
476
|
+
if (data && data.SalesOrderResponse) {
|
|
469
477
|
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
478
|
+
}
|
|
479
|
+
if (data && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
|
|
470
480
|
await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
|
|
471
481
|
} else {
|
|
472
482
|
console.log("SAP Error while calling simulate...");
|
|
@@ -478,9 +488,11 @@ const orderSimulate = () => {
|
|
|
478
488
|
let data;
|
|
479
489
|
console.log(err);
|
|
480
490
|
if (err && err.response) data = err.response.data;
|
|
491
|
+
if (data && data.SalesOrderResponse) {
|
|
492
|
+
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
493
|
+
}
|
|
481
494
|
if (data && data.messages) {
|
|
482
495
|
if ((data.messages[0].type === 'OrderException') && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
|
|
483
|
-
syncSalesOrderResponse(data.SalesOrderResponse, order);
|
|
484
496
|
await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
|
|
485
497
|
} else if (data.messages[0].type === 'ProductDiscontinuedException') {
|
|
486
498
|
handleDiscontinuedSku(order, null, data.messages);
|