@things-factory/integration-marketplace 4.2.3 → 4.2.5
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/dist-server/controllers/magento/apis/get-store-orders.js +2 -1
- package/dist-server/controllers/magento/apis/get-store-orders.js.map +1 -1
- package/dist-server/controllers/magento/apis/get-store-products.js +8 -9
- package/dist-server/controllers/magento/apis/get-store-products.js.map +1 -1
- package/dist-server/controllers/magento/apis/update-order-status.js +33 -8
- package/dist-server/controllers/magento/apis/update-order-status.js.map +1 -1
- package/package.json +2 -2
- package/server/controllers/magento/apis/get-store-orders.ts +3 -1
- package/server/controllers/magento/apis/get-store-products.ts +1 -2
- package/server/controllers/magento/apis/update-order-status.ts +37 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-orders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ function getStoreProducts() {
|
|
|
17
17
|
return { payload };
|
|
18
18
|
},
|
|
19
19
|
async normalize(res, { store }) {
|
|
20
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m
|
|
20
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
21
21
|
// return res.products
|
|
22
22
|
let { items, total_count } = res;
|
|
23
23
|
let parentLinkList = (_a = items.map(e => { return { id: e.id, children: e.extension_attributes.configurable_product_links }; })) === null || _a === void 0 ? void 0 : _a.filter(e => e.children);
|
|
@@ -44,18 +44,17 @@ function getStoreProducts() {
|
|
|
44
44
|
const productVariations = await store_api_1.StoreAPI.getStoreProductVariations(store, { sku: product.sku });
|
|
45
45
|
const result = {
|
|
46
46
|
itemId: product.id,
|
|
47
|
-
parentId: ((_b = parentLinkList.find(e => e.children.includes(product.id))) === null || _b === void 0 ? void 0 : _b.id) || 0,
|
|
48
47
|
isku: product.sku,
|
|
49
48
|
name: product.name,
|
|
50
49
|
type: product.type_id,
|
|
51
50
|
hasVariation: false,
|
|
52
51
|
attributes: [],
|
|
53
|
-
images: ((
|
|
52
|
+
images: ((_c = (_b = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _b === void 0 ? void 0 : _b.find(att => att.attribute_code == 'image')) === null || _c === void 0 ? void 0 : _c.value)
|
|
54
53
|
? [
|
|
55
|
-
`${store.storeURL}pub/media/catalog/product${(
|
|
54
|
+
`${store.storeURL}pub/media/catalog/product${(_e = (_d = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _d === void 0 ? void 0 : _d.find(att => att.attribute_code == 'image')) === null || _e === void 0 ? void 0 : _e.value}`
|
|
56
55
|
]
|
|
57
56
|
: [],
|
|
58
|
-
categoryId: (
|
|
57
|
+
categoryId: (_f = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _f === void 0 ? void 0 : _f.find(att => att.attribute_code == 'category_ids').value[0],
|
|
59
58
|
variations: productVariations.length > 0
|
|
60
59
|
? productVariations.map(variant => {
|
|
61
60
|
const { stock_id: variantStockId, qty: variantQty } = variant.extension_attributes.stock_item;
|
|
@@ -85,11 +84,11 @@ function getStoreProducts() {
|
|
|
85
84
|
marketplaceStatus: product.status,
|
|
86
85
|
primaryUnit: 'lbs',
|
|
87
86
|
primaryUnitValue: product.weight,
|
|
88
|
-
length: ((
|
|
87
|
+
length: ((_h = (_g = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _g === void 0 ? void 0 : _g.find(att => att.attribute_code == 'ts_dimensions_length')) === null || _h === void 0 ? void 0 : _h.value) *
|
|
89
88
|
25.4 || 0,
|
|
90
|
-
width: ((
|
|
89
|
+
width: ((_k = (_j = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _j === void 0 ? void 0 : _j.find(att => att.attribute_code == 'ts_dimensions_width')) === null || _k === void 0 ? void 0 : _k.value) *
|
|
91
90
|
25.4 || 0,
|
|
92
|
-
height: ((
|
|
91
|
+
height: ((_m = (_l = product === null || product === void 0 ? void 0 : product.custom_attributes) === null || _l === void 0 ? void 0 : _l.find(att => att.attribute_code == 'ts_dimensions_height')) === null || _m === void 0 ? void 0 : _m.value) *
|
|
93
92
|
25.4 || 0,
|
|
94
93
|
weight: product.weight * 453.59237 || 0
|
|
95
94
|
}
|
|
@@ -97,7 +96,7 @@ function getStoreProducts() {
|
|
|
97
96
|
};
|
|
98
97
|
results.push(Object.assign({}, result));
|
|
99
98
|
}
|
|
100
|
-
return { results, total: total_count };
|
|
99
|
+
return { results, total: total_count, parentLinkList };
|
|
101
100
|
}
|
|
102
101
|
};
|
|
103
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-products.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-products.ts"],"names":[],"mappings":";AAAA,2GAA2G;;;AAE3G,+CAA0C;AAE1C,SAAgB,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAC9B,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;YAE3D,IAAI,OAAO,GAAQ;gBACjB,WAAW,EAAE,IAAI,GAAG,CAAC;gBACrB,QAAQ,EAAE,KAAK;aAChB,CAAA;YAED,OAAO,EAAE,OAAO,EAAE,CAAA;QACpB,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;;YAC5B,sBAAsB;YACtB,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;YAEhC,IAAI,cAAc,GAAG,MAAA,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAE,OAAO,EAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,oBAAoB,CAAC,0BAA0B,EAAC,CAAA,CAAA,CAAC,CAAC,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;YAE9I,IAAI,6BAA6B,GAAU,EAAE,CAAA;YAC7C,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,uBAAuB,EAAE;gBAClC,6BAA6B,GAAG,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAClE,sBAAsB,CAAC,EAAE,CAAC,sBAAsB,CAAC,MAAM,KAAK,QAAQ,CACrE,CAAA;aACF;YAED,IAAI,OAAO,GAAU,EAAE,CAAA;YAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;gBAE7B,IAAI,eAAe,GAAW,CAAC,CAAA;gBAE/B,IAAI;oBACF,MAAM,UAAU,GAAU,MAAM,oBAAQ,CAAC,iBAAiB,CAAC,KAAK,EAAE;wBAChE,GAAG,EAAE,OAAO,CAAC,GAAG;wBAChB,YAAY,EAAE,6BAA6B;qBAC5C,CAAC,CAAA;oBAEF,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBACzB,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE;4BACjC,eAAe,IAAI,SAAS,CAAC,GAAG,CAAA;yBACjC;oBACH,CAAC,CAAC,CAAA;iBACH;gBAAC,OAAO,CAAC,EAAE,GAAE;gBACd,MAAM,iBAAiB,GAAU,MAAM,oBAAQ,CAAC,yBAAyB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;gBAEtG,MAAM,MAAM,GAAG;oBACb,MAAM,EAAE,OAAO,CAAC,EAAE;oBAClB,
|
|
1
|
+
{"version":3,"file":"get-store-products.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-products.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateOrderStatus = void 0;
|
|
4
|
-
const store_api_1 = require("../../store-api");
|
|
5
4
|
function updateOrderStatus() {
|
|
6
5
|
return {
|
|
7
6
|
method: 'post',
|
|
8
|
-
path: '/
|
|
7
|
+
path: '/{subpath}',
|
|
9
8
|
async denormalize(req, { store }) {
|
|
10
|
-
let { orderId, status, trackingNo, carrier } = req;
|
|
9
|
+
let { orderId, status, trackingNo, carrier, orderItems } = req;
|
|
11
10
|
let pr;
|
|
12
11
|
if (status == 'SHIPPED' || status == 'READY_TO_SHIP' || status == 'PROCESSING' || status == 'PACKED') {
|
|
13
|
-
let order = await store_api_1.StoreAPI.getStoreOrder(store, { id: orderId });
|
|
14
12
|
pr = {
|
|
15
13
|
resource: {
|
|
16
|
-
subpath:
|
|
14
|
+
subpath: `order/${orderId}/ship`
|
|
17
15
|
},
|
|
18
16
|
payload: {
|
|
19
|
-
items:
|
|
17
|
+
items: unmapOrderItems(orderItems),
|
|
20
18
|
tracks: [
|
|
21
19
|
{
|
|
22
20
|
carrier_code: carrier,
|
|
@@ -35,14 +33,21 @@ function updateOrderStatus() {
|
|
|
35
33
|
else if (status == 'DELIVERED' || status == 'CLOSED') {
|
|
36
34
|
pr = {
|
|
37
35
|
resource: {
|
|
38
|
-
subpath:
|
|
36
|
+
subpath: `order/${orderId}/invoice`
|
|
39
37
|
}
|
|
40
38
|
};
|
|
41
39
|
}
|
|
42
40
|
else if (status == 'REFUND_COMPLETE' || status == 'RETURN_COMPLETE') {
|
|
43
41
|
pr = {
|
|
44
42
|
resource: {
|
|
45
|
-
subpath:
|
|
43
|
+
subpath: `order/${orderId}/refund`
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
else if (status == 'CANCELLED') {
|
|
48
|
+
pr = {
|
|
49
|
+
resource: {
|
|
50
|
+
subpath: `orders/${orderId}/cancel`
|
|
46
51
|
}
|
|
47
52
|
};
|
|
48
53
|
}
|
|
@@ -54,4 +59,24 @@ function updateOrderStatus() {
|
|
|
54
59
|
};
|
|
55
60
|
}
|
|
56
61
|
exports.updateOrderStatus = updateOrderStatus;
|
|
62
|
+
function unmapOrderItems(orderItems) {
|
|
63
|
+
let itemsList = [];
|
|
64
|
+
let res = orderItems.map(e => {
|
|
65
|
+
return e.split('-')[0];
|
|
66
|
+
});
|
|
67
|
+
for (let item of res) {
|
|
68
|
+
let count = 0;
|
|
69
|
+
res.forEach(element => {
|
|
70
|
+
if (element === item) {
|
|
71
|
+
count += 1;
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
itemsList.push({
|
|
75
|
+
order_item_id: item,
|
|
76
|
+
qty: count
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
itemsList = itemsList.filter((value, index, self) => index === self.findIndex(t => t.order_item_id === value.order_item_id));
|
|
80
|
+
return itemsList;
|
|
81
|
+
}
|
|
57
82
|
//# sourceMappingURL=update-order-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-order-status.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/update-order-status.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"update-order-status.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/update-order-status.ts"],"names":[],"mappings":";;;AAEA,SAAgB,iBAAiB;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,YAAY;QAClB,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC9B,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,GAAG,CAAA;YAC9D,IAAI,EAAO,CAAA;YACX,IAAI,MAAM,IAAI,SAAS,IAAI,MAAM,IAAI,eAAe,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,IAAI,QAAQ,EAAE;gBACpG,EAAE,GAAG;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,SAAS,OAAO,OAAO;qBACjC;oBACD,OAAO,EAAE;wBACP,KAAK,EAAE,eAAe,CAAC,UAAU,CAAC;wBAClC,MAAM,EAAE;4BACN;gCACE,YAAY,EAAE,OAAO;gCACrB,YAAY,EAAE,UAAU;gCACxB,KAAK,EAAE,OAAO;6BACf;yBACF;wBACD,SAAS,EAAE;4BACT,oBAAoB,EAAE;gCACpB,WAAW,EAAE,SAAS;6BACvB;yBACF;qBACF;iBACF,CAAA;aACF;iBAAM,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,QAAQ,EAAE;gBACtD,EAAE,GAAG;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,SAAS,OAAO,UAAU;qBACpC;iBACF,CAAA;aACF;iBAAM,IAAI,MAAM,IAAI,iBAAiB,IAAI,MAAM,IAAI,iBAAiB,EAAE;gBACrE,EAAE,GAAG;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,SAAS,OAAO,SAAS;qBACnC;iBACF,CAAA;aACF;iBAAM,IAAI,MAAM,IAAI,WAAW,EAAE;gBAChC,EAAE,GAAG;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,UAAU,OAAO,SAAS;qBACpC;iBACF,CAAA;aACF;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AArDD,8CAqDC;AAED,SAAS,eAAe,CAAC,UAAU;IACjC,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC3B,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,KAAK,IAAI,IAAI,IAAI,GAAG,EAAE;QACpB,IAAI,KAAK,GAAG,CAAC,CAAA;QAEb,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACpB,IAAI,OAAO,KAAK,IAAI,EAAE;gBACpB,KAAK,IAAI,CAAC,CAAA;aACX;QACH,CAAC,CAAC,CAAA;QAEF,SAAS,CAAC,IAAI,CAAC;YACb,aAAa,EAAE,IAAI;YACnB,GAAG,EAAE,KAAK;SACX,CAAC,CAAA;KACH;IAED,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,KAAK,CAAC,aAAa,CAAC,CAAC,CAAA;IAC5H,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-marketplace",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.5",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"nock": "^13.0.2",
|
|
53
53
|
"should": "^13.2.3"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "e1447c2e0c5c1ad9375e84291f688b7ecdbeee40"
|
|
56
56
|
}
|
|
@@ -53,7 +53,6 @@ export function getStoreProducts() {
|
|
|
53
53
|
|
|
54
54
|
const result = {
|
|
55
55
|
itemId: product.id,
|
|
56
|
-
parentId: parentLinkList.find(e => e.children.includes(product.id))?.id || 0,
|
|
57
56
|
isku: product.sku,
|
|
58
57
|
name: product.name,
|
|
59
58
|
type: product.type_id,
|
|
@@ -115,7 +114,7 @@ export function getStoreProducts() {
|
|
|
115
114
|
results.push({ ...result })
|
|
116
115
|
}
|
|
117
116
|
|
|
118
|
-
return { results, total: total_count }
|
|
117
|
+
return { results, total: total_count, parentLinkList }
|
|
119
118
|
}
|
|
120
119
|
}
|
|
121
120
|
}
|
|
@@ -3,20 +3,17 @@ import { StoreAPI } from '../../store-api'
|
|
|
3
3
|
export function updateOrderStatus() {
|
|
4
4
|
return {
|
|
5
5
|
method: 'post',
|
|
6
|
-
path: '/
|
|
6
|
+
path: '/{subpath}',
|
|
7
7
|
async denormalize(req, { store }) {
|
|
8
|
-
let { orderId, status, trackingNo, carrier } = req
|
|
8
|
+
let { orderId, status, trackingNo, carrier, orderItems } = req
|
|
9
9
|
let pr: any
|
|
10
10
|
if (status == 'SHIPPED' || status == 'READY_TO_SHIP' || status == 'PROCESSING' || status == 'PACKED') {
|
|
11
|
-
|
|
12
|
-
let order = await StoreAPI.getStoreOrder(store, { id: orderId })
|
|
13
|
-
|
|
14
11
|
pr = {
|
|
15
12
|
resource: {
|
|
16
|
-
subpath:
|
|
13
|
+
subpath: `order/${orderId}/ship`
|
|
17
14
|
},
|
|
18
15
|
payload: {
|
|
19
|
-
items:
|
|
16
|
+
items: unmapOrderItems(orderItems),
|
|
20
17
|
tracks: [
|
|
21
18
|
{
|
|
22
19
|
carrier_code: carrier,
|
|
@@ -34,13 +31,19 @@ export function updateOrderStatus() {
|
|
|
34
31
|
} else if (status == 'DELIVERED' || status == 'CLOSED') {
|
|
35
32
|
pr = {
|
|
36
33
|
resource: {
|
|
37
|
-
subpath:
|
|
34
|
+
subpath: `order/${orderId}/invoice`
|
|
38
35
|
}
|
|
39
36
|
}
|
|
40
37
|
} else if (status == 'REFUND_COMPLETE' || status == 'RETURN_COMPLETE') {
|
|
41
38
|
pr = {
|
|
42
39
|
resource: {
|
|
43
|
-
subpath:
|
|
40
|
+
subpath: `order/${orderId}/refund`
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
} else if (status == 'CANCELLED') {
|
|
44
|
+
pr = {
|
|
45
|
+
resource: {
|
|
46
|
+
subpath: `orders/${orderId}/cancel`
|
|
44
47
|
}
|
|
45
48
|
}
|
|
46
49
|
}
|
|
@@ -51,3 +54,28 @@ export function updateOrderStatus() {
|
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
}
|
|
57
|
+
|
|
58
|
+
function unmapOrderItems(orderItems) {
|
|
59
|
+
let itemsList = []
|
|
60
|
+
let res = orderItems.map(e => {
|
|
61
|
+
return e.split('-')[0]
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
for (let item of res) {
|
|
65
|
+
let count = 0
|
|
66
|
+
|
|
67
|
+
res.forEach(element => {
|
|
68
|
+
if (element === item) {
|
|
69
|
+
count += 1
|
|
70
|
+
}
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
itemsList.push({
|
|
74
|
+
order_item_id: item,
|
|
75
|
+
qty: count
|
|
76
|
+
})
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
itemsList = itemsList.filter((value, index, self) => index === self.findIndex(t => t.order_item_id === value.order_item_id))
|
|
80
|
+
return itemsList
|
|
81
|
+
}
|