@things-factory/integration-marketplace 4.3.193 → 4.3.203

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.
Files changed (16) hide show
  1. package/dist-server/controllers/shopify/apis/get-store-order-packages.js +25 -0
  2. package/dist-server/controllers/shopify/apis/get-store-order-packages.js.map +1 -0
  3. package/dist-server/controllers/shopify/apis/get-store-orders.js +8 -4
  4. package/dist-server/controllers/shopify/apis/get-store-orders.js.map +1 -1
  5. package/dist-server/controllers/shopify/apis/index.js +1 -0
  6. package/dist-server/controllers/shopify/apis/index.js.map +1 -1
  7. package/dist-server/controllers/shopify/apis/set-store-order-status-ready-to-ship.js +14 -11
  8. package/dist-server/controllers/shopify/apis/set-store-order-status-ready-to-ship.js.map +1 -1
  9. package/dist-server/controllers/shopify/shopify.js +6 -5
  10. package/dist-server/controllers/shopify/shopify.js.map +1 -1
  11. package/package.json +3 -3
  12. package/server/controllers/shopify/apis/get-store-order-packages.ts +24 -0
  13. package/server/controllers/shopify/apis/get-store-orders.ts +203 -192
  14. package/server/controllers/shopify/apis/index.ts +1 -0
  15. package/server/controllers/shopify/apis/set-store-order-status-ready-to-ship.ts +14 -12
  16. package/server/controllers/shopify/shopify.ts +8 -7
package/dist-server/controllers/shopify/apis/get-store-order-packages.js ADDED
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ /* https://open.shopee.com/documents?module=4&type=1&id=399 */
3
+ Object.defineProperty(exports, "__esModule", { value: true });
4
+ exports.getStoreOrderPackages = void 0;
5
+ function getStoreOrderPackages() {
6
+ return {
7
+ method: 'get',
8
+ path: '/orders/{orderId}/fulfillment_orders.json',
9
+ denormalize(req) {
10
+ const { orderId } = req;
11
+ return {
12
+ resource: {
13
+ orderId
14
+ }
15
+ };
16
+ },
17
+ async normalize(res) {
18
+ const { fulfillment_orders } = res;
19
+ let validFulfillmentOrder = fulfillment_orders.filter(fo => fo.status == 'open');
20
+ return validFulfillmentOrder;
21
+ }
22
+ };
23
+ }
24
+ exports.getStoreOrderPackages = getStoreOrderPackages;
25
+ //# sourceMappingURL=get-store-order-packages.js.map
package/dist-server/controllers/shopify/apis/get-store-order-packages.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-store-order-packages.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/get-store-order-packages.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,SAAgB,qBAAqB;IACnC,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,2CAA2C;QACjD,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAEvB,OAAO;gBACL,QAAQ,EAAE;oBACR,OAAO;iBACR;aACF,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG;YACjB,MAAM,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAA;YAElC,IAAI,qBAAqB,GAAQ,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC,CAAA;YAErF,OAAO,qBAAqB,CAAA;QAC9B,CAAC;KACF,CAAA;AACH,CAAC;AArBD,sDAqBC"}
package/dist-server/controllers/shopify/apis/get-store-orders.js CHANGED
@@ -2,6 +2,7 @@
2
2
  /* https://open.shopee.com/documents?module=4&type=1&id=399 */
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.getStoreOrders = void 0;
5
+ const store_api_1 = require("../../store-api");
5
6
  function getStoreOrders() {
6
7
  return {
7
8
  method: 'get',
@@ -45,15 +46,16 @@ function getStoreOrders() {
45
46
  }
46
47
  const orderSourceNames = ['pos'];
47
48
  var { orders } = res;
48
- const results = orders
49
+ const results = await Promise.all(orders
49
50
  .filter(item => !orderSourceNames.includes(item.source_name))
50
- .map(order => {
51
+ .map(async (order) => {
51
52
  var _a, _b;
52
53
  const orderId = order.id;
53
54
  const fulfillmentStatus = order.fulfillment_status;
54
55
  const paymentStatus = (order === null || order === void 0 ? void 0 : order.financial_status) || '';
55
56
  let orderStatus = (order === null || order === void 0 ? void 0 : order.cancelled_at) ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled';
56
57
  let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus);
58
+ const fulfillmentOrders = await store_api_1.StoreAPI.getStoreOrderPackages(store, { orderId });
57
59
  let itemCount = 0;
58
60
  let result;
59
61
  if (fulfillmentStatus != null) {
@@ -67,6 +69,7 @@ function getStoreOrders() {
67
69
  orderCreatedAt: new Date(order.created_at).toUTCString(),
68
70
  orderUpdatedAt: new Date(order.updated_at).toUTCString(),
69
71
  discountValue: order.total_discounts,
72
+ paymentStatus: order.financial_status,
70
73
  status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
71
74
  sellercraftStatus,
72
75
  trackingNo: fulfillment.tracking_number,
@@ -183,7 +186,8 @@ function getStoreOrders() {
183
186
  state,
184
187
  country: country === 'MY' ? 'Malaysia' : country,
185
188
  collectionCurrency: order.currency,
186
- attentionTo: `${first_name} ${last_name}`
189
+ attentionTo: `${first_name} ${last_name}`,
190
+ packageId: fulfillmentOrders[0].id
187
191
  };
188
192
  result.orderShipping = orderShipping;
189
193
  // For SC mapping
@@ -221,7 +225,7 @@ function getStoreOrders() {
221
225
  itemCount = result.orderItems.length;
222
226
  result.itemCount = itemCount;
223
227
  return result;
224
- });
228
+ }));
225
229
  return { results, more, nextCursor };
226
230
  }
227
231
  };
package/dist-server/controllers/shopify/apis/get-store-orders.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
package/dist-server/controllers/shopify/apis/index.js CHANGED
@@ -18,6 +18,7 @@ __exportStar(require("./echo"), exports);
18
18
  __exportStar(require("./get-store-products"), exports);
19
19
  __exportStar(require("./get-store-products-count"), exports);
20
20
  __exportStar(require("./get-store-orders"), exports);
21
+ __exportStar(require("./get-store-order-packages"), exports);
21
22
  __exportStar(require("./get-inventory-level"), exports);
22
23
  __exportStar(require("./update-store-product-variation-stock"), exports);
23
24
  __exportStar(require("./update-order-status"), exports);
package/dist-server/controllers/shopify/apis/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,uDAAoC;AACpC,6DAA0C;AAC1C,qDAAkC;AAClC,wDAAqC;AACrC,yEAAsD;AACtD,wDAAqC;AACrC,yEAAsD;AACtD,oDAAiC;AACjC,yEAAsD;AACtD,+DAA4C;AAC5C,+DAA4C;AAC5C,sEAAmD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,uDAAoC;AACpC,6DAA0C;AAC1C,qDAAkC;AAClC,6DAA0C;AAC1C,wDAAqC;AACrC,yEAAsD;AACtD,wDAAqC;AACrC,yEAAsD;AACtD,oDAAiC;AACjC,yEAAsD;AACtD,+DAA4C;AAC5C,+DAA4C;AAC5C,sEAAmD"}
package/dist-server/controllers/shopify/apis/set-store-order-status-ready-to-ship.js CHANGED
@@ -5,22 +5,25 @@ exports.setStoreOrderStatusReadyToShip = void 0;
5
5
  function setStoreOrderStatusReadyToShip() {
6
6
  return {
7
7
  method: 'post',
8
- path: '/orders/{orderId}/fulfillments.json',
8
+ path: '/fulfillments.json',
9
9
  denormalize(req) {
10
- const { orderId, trackingUrl, trackingNo, orderItemId, order, transporter } = req || {};
11
- let locationId = JSON.parse(order.marketplaceOrderItems[0].marketplaceProductVariation.locationId)[0].location_id;
10
+ const { packageId, trackingUrl, trackingNo, transporter } = req || {};
12
11
  return {
13
12
  payload: {
14
13
  fulfillment: {
15
- location_id: locationId,
16
- tracking_number: trackingNo,
17
- tracking_urls: [trackingUrl],
18
- notify_customer: true,
19
- tracking_company: transporter
14
+ message: 'The package was shipped',
15
+ notify_customer: false,
16
+ tracking_info: {
17
+ number: trackingNo,
18
+ url: trackingUrl,
19
+ company: transporter
20
+ },
21
+ line_items_by_fulfillment_order: [
22
+ {
23
+ fulfillment_order_id: parseFloat(packageId)
24
+ }
25
+ ]
20
26
  }
21
- },
22
- resource: {
23
- orderId
24
27
  }
25
28
  };
26
29
  },
package/dist-server/controllers/shopify/apis/set-store-order-status-ready-to-ship.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"set-store-order-status-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/set-store-order-status-ready-to-ship.ts"],"names":[],"mappings":";AAAA,iHAAiH;;;AAEjH,SAAgB,8BAA8B;IAC5C,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,qCAAqC;QAC3C,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAEvF,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;YAEjH,OAAO;gBACL,OAAO,EAAE;oBACP,WAAW,EAAE;wBACX,WAAW,EAAE,UAAU;wBACvB,eAAe,EAAE,UAAU;wBAC3B,aAAa,EAAE,CAAC,WAAW,CAAC;wBAC5B,eAAe,EAAE,IAAI;wBACrB,gBAAgB,EAAE,WAAW;qBAC9B;iBACF;gBACD,QAAQ,EAAE;oBACR,OAAO;iBACR;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA5BD,wEA4BC"}
1
+ {"version":3,"file":"set-store-order-status-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/set-store-order-status-ready-to-ship.ts"],"names":[],"mappings":";AAAA,iHAAiH;;;AAEjH,SAAgB,8BAA8B;IAC5C,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,oBAAoB;QAC1B,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAErE,OAAO;gBACL,OAAO,EAAE;oBACP,WAAW,EAAE;wBACX,OAAO,EAAE,yBAAyB;wBAClC,eAAe,EAAE,KAAK;wBACtB,aAAa,EAAE;4BACb,MAAM,EAAE,UAAU;4BAClB,GAAG,EAAE,WAAW;4BAChB,OAAO,EAAE,WAAW;yBACrB;wBACD,+BAA+B,EAAE;4BAC/B;gCACE,oBAAoB,EAAE,UAAU,CAAC,SAAS,CAAC;6BAC5C;yBACF;qBACF;iBACF;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA9BD,wEA8BC"}
package/dist-server/controllers/shopify/shopify.js CHANGED
@@ -15,10 +15,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  exports.Shopify = void 0;
18
- const node_fetch_1 = __importDefault(require("node-fetch"));
19
18
  const crypto_1 = __importDefault(require("crypto"));
19
+ const node_fetch_1 = __importDefault(require("node-fetch"));
20
20
  const querystring_1 = __importDefault(require("querystring"));
21
21
  const debug = require('debug')('things-factory:integration-marketplace:shopify');
22
+ const apiVersion = '2022-10';
22
23
  class Shopify {
23
24
  constructor(config) {
24
25
  this.config = Object.assign({}, config);
@@ -32,7 +33,7 @@ class Shopify {
32
33
  // so, accessMode should be 'offline'
33
34
  // var accessMode = 'per-user'
34
35
  // TODO make scopes properly
35
- var scopes = 'read_products,write_orders,read_customers,read_inventory,write_inventory';
36
+ var scopes = 'read_products,read_orders,write_orders,read_customers,read_inventory,write_inventory,read_fulfillments,write_fulfillments,read_assigned_fulfillment_orders,write_assigned_fulfillment_orders,read_merchant_managed_fulfillment_orders,write_merchant_managed_fulfillment_orders,read_third_party_fulfillment_orders,write_third_party_fulfillment_orders,read_assigned_fulfillment_orders,write_assigned_fulfillment_orders';
36
37
  var { shop, apiKey } = this.config;
37
38
  // return `https://${shop}.myshopify.com/admin/oauth/authorize?client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}&grant_options[]=${accessMode}`
38
39
  return `https://${shop}.myshopify.com/admin/oauth/authorize?client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}`;
@@ -51,7 +52,7 @@ class Shopify {
51
52
  const qs = Object.entries(data)
52
53
  .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
53
54
  .join('&');
54
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}${qs ? '?' + qs : ''}`;
55
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}${qs ? '?' + qs : ''}`;
55
56
  debug('endpoint', endpoint);
56
57
  const response = await (0, node_fetch_1.default)(endpoint, {
57
58
  headers: {
@@ -77,7 +78,7 @@ class Shopify {
77
78
  const { shop, accessToken } = this.config;
78
79
  debug('data', data);
79
80
  const jsondata = JSON.stringify(data);
80
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`;
81
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`;
81
82
  const response = await (0, node_fetch_1.default)(endpoint, {
82
83
  method: 'post',
83
84
  headers: {
@@ -99,7 +100,7 @@ class Shopify {
99
100
  const { shop, accessToken } = this.config;
100
101
  debug('data', data);
101
102
  const jsondata = JSON.stringify(data);
102
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`;
103
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`;
103
104
  const response = await (0, node_fetch_1.default)(endpoint, {
104
105
  method: 'put',
105
106
  headers: {
package/dist-server/controllers/shopify/shopify.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../server/controllers/shopify/shopify.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../server/controllers/shopify/shopify.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-marketplace",
3
- "version": "4.3.193",
3
+ "version": "4.3.203",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -31,7 +31,7 @@
31
31
  "@things-factory/context-ui": "^4.3.179",
32
32
  "@things-factory/grist-ui": "^4.3.179",
33
33
  "@things-factory/i18n-base": "^4.3.179",
34
- "@things-factory/integration-lmd": "^4.3.193",
34
+ "@things-factory/integration-lmd": "^4.3.197",
35
35
  "@things-factory/integration-ui": "^4.3.190",
36
36
  "@things-factory/more-ui": "^4.3.179",
37
37
  "@things-factory/resource-ui": "^4.3.179",
@@ -51,5 +51,5 @@
51
51
  "nock": "^13.0.2",
52
52
  "should": "^13.2.3"
53
53
  },
54
- "gitHead": "8cba442aa16d21e21fa20c2bd22ba039e0a9bb5a"
54
+ "gitHead": "b52c1edcf8ce5a968ccbf008a6a5f364f7de6f08"
55
55
  }
package/server/controllers/shopify/apis/get-store-order-packages.ts ADDED
@@ -0,0 +1,24 @@
1
+ /* https://open.shopee.com/documents?module=4&type=1&id=399 */
2
+
3
+ export function getStoreOrderPackages() {
4
+ return {
5
+ method: 'get',
6
+ path: '/orders/{orderId}/fulfillment_orders.json',
7
+ denormalize(req) {
8
+ const { orderId } = req
9
+
10
+ return {
11
+ resource: {
12
+ orderId
13
+ }
14
+ }
15
+ },
16
+ async normalize(res) {
17
+ const { fulfillment_orders } = res
18
+
19
+ let validFulfillmentOrder: any = fulfillment_orders.filter(fo => fo.status == 'open')
20
+
21
+ return validFulfillmentOrder
22
+ }
23
+ }
24
+ }
package/server/controllers/shopify/apis/get-store-orders.ts CHANGED
@@ -1,11 +1,14 @@
1
1
  /* https://open.shopee.com/documents?module=4&type=1&id=399 */
2
2
 
3
+ import { StoreAPI } from '../../store-api'
4
+
3
5
  export function getStoreOrders() {
4
6
  return {
5
7
  method: 'get',
6
8
  path: '/orders.json',
7
9
  denormalize(req) {
8
- var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId, nextCursor } = req || {}
10
+ var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId, nextCursor } =
11
+ req || {}
9
12
  var { page = 0, limit = 100 } = pagination || {}
10
13
 
11
14
  var payload: any = {
@@ -53,208 +56,214 @@ export function getStoreOrders() {
53
56
  const orderSourceNames: any = ['pos']
54
57
  var { orders } = res
55
58
 
56
- const results: any[] = orders
57
- .filter(item => !orderSourceNames.includes(item.source_name))
58
- .map(order => {
59
- const orderId = order.id
60
- const fulfillmentStatus = order.fulfillment_status
61
- const paymentStatus = order?.financial_status || ''
62
- let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
63
- let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus)
64
-
65
- let itemCount: Number = 0
66
- let result: any
67
-
68
- if (fulfillmentStatus != null) {
69
- const fulfillment = order.fulfillments[0]
70
-
71
- result = {
72
- name: fulfillment.order_id,
73
- orderNo: order.name,
74
- currency: order.currency,
75
- totalAmount: order.current_total_price,
76
- remark: order.note,
77
- orderCreatedAt: new Date(order.created_at).toUTCString(),
78
- orderUpdatedAt: new Date(order.updated_at).toUTCString(),
79
- discountValue: order.total_discounts,
80
- status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
81
- sellercraftStatus,
82
- trackingNo: fulfillment.tracking_number,
83
- shippingProvider: fulfillment.tracking_company,
84
- recipientAddress:
85
- fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
86
- reason: order.cancel_reason,
87
- orderItems: fulfillment.line_items.map(lineItem => {
88
- return {
89
- name: lineItem.id.toString(),
90
- qty: lineItem.quantity,
91
- status: lineItem.status,
92
- paidPrice: lineItem.price,
93
- docRefNo: lineItem.id,
94
- variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
95
- variationSku: lineItem.sku,
96
- channelSku: lineItem.sku,
97
- variationName: lineItem.name,
98
- originalPrice: lineItem.price,
99
- total: lineItem.price,
100
- subtotal: lineItem.price
101
- }
102
- })
103
- }
104
- } else {
105
- let lineItems = []
106
-
107
- const refundItems = order.refunds
108
- .reduce((acc, curr) => {
109
- const refundLineItems = curr.refund_line_items
110
- acc.push(...refundLineItems)
111
-
112
- return acc
113
- }, [])
114
- .reduce((acc, curr) => {
115
- let sum = acc.findIndex(x => x.line_item_id === curr.line_item_id)
116
- if (sum >= 0) {
117
- acc[sum].quantity += curr.quantity
118
- } else {
119
- acc.push(curr)
120
- }
121
-
122
- return acc
123
- }, [])
124
-
125
- let filteredLineItems = []
126
- if (orderStatus == 'cancelled') {
127
- filteredLineItems = order.line_items
59
+ const results: any[] = await Promise.all(
60
+ orders
61
+ .filter(item => !orderSourceNames.includes(item.source_name))
62
+ .map(async order => {
63
+ const orderId = order.id
64
+ const fulfillmentStatus = order.fulfillment_status
65
+ const paymentStatus = order?.financial_status || ''
66
+ let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
67
+ let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus)
68
+
69
+ const fulfillmentOrders: any = await StoreAPI.getStoreOrderPackages(store, { orderId })
70
+
71
+ let itemCount: Number = 0
72
+ let result: any
73
+
74
+ if (fulfillmentStatus != null) {
75
+ const fulfillment = order.fulfillments[0]
76
+
77
+ result = {
78
+ name: fulfillment.order_id,
79
+ orderNo: order.name,
80
+ currency: order.currency,
81
+ totalAmount: order.current_total_price,
82
+ remark: order.note,
83
+ orderCreatedAt: new Date(order.created_at).toUTCString(),
84
+ orderUpdatedAt: new Date(order.updated_at).toUTCString(),
85
+ discountValue: order.total_discounts,
86
+ paymentStatus: order.financial_status,
87
+ status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
88
+ sellercraftStatus,
89
+ trackingNo: fulfillment.tracking_number,
90
+ shippingProvider: fulfillment.tracking_company,
91
+ recipientAddress:
92
+ fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
93
+ reason: order.cancel_reason,
94
+ orderItems: fulfillment.line_items.map(lineItem => {
95
+ return {
96
+ name: lineItem.id.toString(),
97
+ qty: lineItem.quantity,
98
+ status: lineItem.status,
99
+ paidPrice: lineItem.price,
100
+ docRefNo: lineItem.id,
101
+ variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
102
+ variationSku: lineItem.sku,
103
+ channelSku: lineItem.sku,
104
+ variationName: lineItem.name,
105
+ originalPrice: lineItem.price,
106
+ total: lineItem.price,
107
+ subtotal: lineItem.price
108
+ }
109
+ })
110
+ }
128
111
  } else {
129
- filteredLineItems = order.line_items.filter(item => item.fulfillable_quantity > 0)
130
- }
131
-
132
- filteredLineItems.map(lineItem => {
133
- const matchedLineItem = refundItems.find(item => item.line_item_id == lineItem.id)
134
-
135
- if (!matchedLineItem) {
136
- lineItem = {
137
- name: lineItem.id.toString(),
138
- qty: lineItem.quantity,
139
- paidPrice: lineItem.price,
140
- docRefNo: lineItem.id,
141
- variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
142
- variationSku: lineItem.sku,
143
- channelSku: lineItem.sku,
144
- variationName: lineItem.name,
145
- originalPrice: lineItem.price,
146
- total: lineItem.price,
147
- subtotal: lineItem.price
148
- }
149
-
150
- lineItems.push(lineItem)
112
+ let lineItems = []
113
+
114
+ const refundItems = order.refunds
115
+ .reduce((acc, curr) => {
116
+ const refundLineItems = curr.refund_line_items
117
+ acc.push(...refundLineItems)
118
+
119
+ return acc
120
+ }, [])
121
+ .reduce((acc, curr) => {
122
+ let sum = acc.findIndex(x => x.line_item_id === curr.line_item_id)
123
+ if (sum >= 0) {
124
+ acc[sum].quantity += curr.quantity
125
+ } else {
126
+ acc.push(curr)
127
+ }
128
+
129
+ return acc
130
+ }, [])
131
+
132
+ let filteredLineItems = []
133
+ if (orderStatus == 'cancelled') {
134
+ filteredLineItems = order.line_items
151
135
  } else {
152
- lineItem = {
153
- name: lineItem.id.toString(),
154
- qty: orderStatus == 'cancelled' ? lineItem.quantity : lineItem.quantity - matchedLineItem.quantity,
155
- paidPrice: lineItem.price,
156
- docRefNo: lineItem.id,
157
- variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
158
- variationSku: lineItem.sku,
159
- channelSku: lineItem.sku,
160
- variationName: lineItem.name,
161
- originalPrice: lineItem.price,
162
- total: lineItem.price,
163
- subtotal: lineItem.price
136
+ filteredLineItems = order.line_items.filter(item => item.fulfillable_quantity > 0)
137
+ }
138
+
139
+ filteredLineItems.map(lineItem => {
140
+ const matchedLineItem = refundItems.find(item => item.line_item_id == lineItem.id)
141
+
142
+ if (!matchedLineItem) {
143
+ lineItem = {
144
+ name: lineItem.id.toString(),
145
+ qty: lineItem.quantity,
146
+ paidPrice: lineItem.price,
147
+ docRefNo: lineItem.id,
148
+ variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
149
+ variationSku: lineItem.sku,
150
+ channelSku: lineItem.sku,
151
+ variationName: lineItem.name,
152
+ originalPrice: lineItem.price,
153
+ total: lineItem.price,
154
+ subtotal: lineItem.price
155
+ }
156
+
157
+ lineItems.push(lineItem)
158
+ } else {
159
+ lineItem = {
160
+ name: lineItem.id.toString(),
161
+ qty: orderStatus == 'cancelled' ? lineItem.quantity : lineItem.quantity - matchedLineItem.quantity,
162
+ paidPrice: lineItem.price,
163
+ docRefNo: lineItem.id,
164
+ variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
165
+ variationSku: lineItem.sku,
166
+ channelSku: lineItem.sku,
167
+ variationName: lineItem.name,
168
+ originalPrice: lineItem.price,
169
+ total: lineItem.price,
170
+ subtotal: lineItem.price
171
+ }
172
+
173
+ if (lineItem.qty >= 0) lineItems.push(lineItem)
164
174
  }
175
+ })
165
176
 
166
- if (lineItem.qty >= 0) lineItems.push(lineItem)
177
+ result = {
178
+ name: orderId,
179
+ orderNo: order.name,
180
+ currency: order.currency,
181
+ totalAmount: orderStatus == 'cancelled' ? order.total_price : order.current_total_price,
182
+ remark: order.note,
183
+ orderCreatedAt: new Date(order.created_at).toUTCString(),
184
+ orderUpdatedAt: new Date(order.updated_at).toUTCString(),
185
+ discountValue: order.total_discounts,
186
+ recipientAddress: order.billing_address,
187
+ status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
188
+ sellercraftStatus,
189
+ reason: order.cancel_reason,
190
+ orderItems: lineItems
167
191
  }
168
- })
169
-
170
- result = {
171
- name: orderId,
172
- orderNo: order.name,
173
- currency: order.currency,
174
- totalAmount: orderStatus == 'cancelled' ? order.total_price : order.current_total_price,
175
- remark: order.note,
176
- orderCreatedAt: new Date(order.created_at).toUTCString(),
177
- orderUpdatedAt: new Date(order.updated_at).toUTCString(),
178
- discountValue: order.total_discounts,
179
- recipientAddress: order.billing_address,
180
- status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
181
- sellercraftStatus,
182
- reason: order.cancel_reason,
183
- orderItems: lineItems
184
- }
185
- }
186
-
187
- if (order?.shipping_address || order?.billing_address) {
188
- const {
189
- address1,
190
- address2,
191
- phone,
192
- zip: postCode,
193
- city,
194
- country,
195
- first_name,
196
- last_name,
197
- province: state
198
- } = order?.shipping_address ? order.shipping_address : order.billing_address
199
-
200
- var orderShipping = {
201
- address1,
202
- address2,
203
- address3: null,
204
- address4: null,
205
- address5: null,
206
- phone1: phone,
207
- phone2: null,
208
- postCode,
209
- city,
210
- state,
211
- country: country === 'MY' ? 'Malaysia' : country,
212
- collectionCurrency: order.currency,
213
- attentionTo: `${first_name} ${last_name}`
214
192
  }
215
193
 
216
- result.orderShipping = orderShipping
194
+ if (order?.shipping_address || order?.billing_address) {
195
+ const {
196
+ address1,
197
+ address2,
198
+ phone,
199
+ zip: postCode,
200
+ city,
201
+ country,
202
+ first_name,
203
+ last_name,
204
+ province: state
205
+ } = order?.shipping_address ? order.shipping_address : order.billing_address
206
+
207
+ var orderShipping = {
208
+ address1,
209
+ address2,
210
+ address3: null,
211
+ address4: null,
212
+ address5: null,
213
+ phone1: phone,
214
+ phone2: null,
215
+ postCode,
216
+ city,
217
+ state,
218
+ country: country === 'MY' ? 'Malaysia' : country,
219
+ collectionCurrency: order.currency,
220
+ attentionTo: `${first_name} ${last_name}`,
221
+ packageId: fulfillmentOrders[0].id
222
+ }
217
223
 
218
- // For SC mapping
224
+ result.orderShipping = orderShipping
219
225
 
220
- let shippingAddress = order?.shipping_address
221
- let billingAddress = order?.billing_address || shippingAddress
226
+ // For SC mapping
222
227
 
223
- result.shipping = {
224
- address_1: shippingAddress?.address1,
225
- address_2: shippingAddress?.address2,
226
- address_3: shippingAddress?.province,
227
- postcode: shippingAddress?.zip,
228
- country: shippingAddress?.country_code,
229
- city: shippingAddress?.city,
230
- first_name: shippingAddress?.first_name,
231
- last_name: shippingAddress?.last_name,
232
- phone: shippingAddress?.phone,
233
- email: order?.email
234
- }
235
- result.billing = {
236
- address_1: billingAddress?.address1,
237
- address_2: billingAddress?.address2,
238
- address_3: billingAddress?.province,
239
- postcode: billingAddress?.zip,
240
- country: billingAddress?.country_code,
241
- city: billingAddress?.city,
242
- first_name: billingAddress?.first_name,
243
- last_name: billingAddress?.last_name,
244
- phone: billingAddress?.phone,
245
- email: order?.email
228
+ let shippingAddress = order?.shipping_address
229
+ let billingAddress = order?.billing_address || shippingAddress
230
+
231
+ result.shipping = {
232
+ address_1: shippingAddress?.address1,
233
+ address_2: shippingAddress?.address2,
234
+ address_3: shippingAddress?.province,
235
+ postcode: shippingAddress?.zip,
236
+ country: shippingAddress?.country_code,
237
+ city: shippingAddress?.city,
238
+ first_name: shippingAddress?.first_name,
239
+ last_name: shippingAddress?.last_name,
240
+ phone: shippingAddress?.phone,
241
+ email: order?.email
242
+ }
243
+ result.billing = {
244
+ address_1: billingAddress?.address1,
245
+ address_2: billingAddress?.address2,
246
+ address_3: billingAddress?.province,
247
+ postcode: billingAddress?.zip,
248
+ country: billingAddress?.country_code,
249
+ city: billingAddress?.city,
250
+ first_name: billingAddress?.first_name,
251
+ last_name: billingAddress?.last_name,
252
+ phone: billingAddress?.phone,
253
+ email: order?.email
254
+ }
255
+ result.isSOF = true
256
+ result.firstName = order?.customer?.first_name || ''
257
+ result.lastName = order?.customer?.last_name || ''
258
+ result.sellercraftDisplayOrderNo = order.name
246
259
  }
247
- result.isSOF = true
248
- result.firstName = order?.customer?.first_name || ''
249
- result.lastName = order?.customer?.last_name || ''
250
- result.sellercraftDisplayOrderNo = order.name
251
- }
252
260
 
253
- itemCount = result.orderItems.length
254
- result.itemCount = itemCount
261
+ itemCount = result.orderItems.length
262
+ result.itemCount = itemCount
255
263
 
256
- return result
257
- })
264
+ return result
265
+ })
266
+ )
258
267
 
259
268
  return { results, more, nextCursor }
260
269
  }
@@ -268,8 +277,10 @@ function checkNextPage(link) {
268
277
  // If there's a previous link, remove the first part of the string entirely
269
278
  if (link.indexOf(`rel="next"`) > -1) {
270
279
  let nextLink = link.split(' ')
271
- nextLink = nextLink[nextLink.indexOf(`rel="next"`)-1]
272
- nextCursor = new URLSearchParams(nextLink.substring(nextLink.indexOf('<') + 1, nextLink.lastIndexOf('>'))).get('page_info')
280
+ nextLink = nextLink[nextLink.indexOf(`rel="next"`) - 1]
281
+ nextCursor = new URLSearchParams(nextLink.substring(nextLink.indexOf('<') + 1, nextLink.lastIndexOf('>'))).get(
282
+ 'page_info'
283
+ )
273
284
  nextPage = true
274
285
  }
275
286
 
package/server/controllers/shopify/apis/index.ts CHANGED
@@ -2,6 +2,7 @@ export * from './echo'
2
2
  export * from './get-store-products'
3
3
  export * from './get-store-products-count'
4
4
  export * from './get-store-orders'
5
+ export * from './get-store-order-packages'
5
6
  export * from './get-inventory-level'
6
7
  export * from './update-store-product-variation-stock'
7
8
  export * from './update-order-status'
package/server/controllers/shopify/apis/set-store-order-status-ready-to-ship.ts CHANGED
@@ -3,24 +3,26 @@
3
3
  export function setStoreOrderStatusReadyToShip() {
4
4
  return {
5
5
  method: 'post',
6
- path: '/orders/{orderId}/fulfillments.json',
6
+ path: '/fulfillments.json',
7
7
  denormalize(req) {
8
- const { orderId, trackingUrl, trackingNo, orderItemId, order, transporter } = req || {}
9
-
10
- let locationId = JSON.parse(order.marketplaceOrderItems[0].marketplaceProductVariation.locationId)[0].location_id
8
+ const { packageId, trackingUrl, trackingNo, transporter } = req || {}
11
9
 
12
10
  return {
13
11
  payload: {
14
12
  fulfillment: {
15
- location_id: locationId,
16
- tracking_number: trackingNo,
17
- tracking_urls: [trackingUrl],
18
- notify_customer: true,
19
- tracking_company: transporter
13
+ message: 'The package was shipped',
14
+ notify_customer: false,
15
+ tracking_info: {
16
+ number: trackingNo,
17
+ url: trackingUrl,
18
+ company: transporter
19
+ },
20
+ line_items_by_fulfillment_order: [
21
+ {
22
+ fulfillment_order_id: parseFloat(packageId)
23
+ }
24
+ ]
20
25
  }
21
- },
22
- resource: {
23
- orderId
24
26
  }
25
27
  }
26
28
  },
package/server/controllers/shopify/shopify.ts CHANGED
@@ -1,9 +1,7 @@
1
- import fetch from 'node-fetch'
2
1
  import crypto from 'crypto'
2
+ import fetch from 'node-fetch'
3
3
  import querystring from 'querystring'
4
4
 
5
- import { createPayloadLog } from '@things-factory/integration-base'
6
-
7
5
  const debug = require('debug')('things-factory:integration-marketplace:shopify')
8
6
 
9
7
  export type ShopifyConfig = {
@@ -13,6 +11,8 @@ export type ShopifyConfig = {
13
11
  accessToken?: string
14
12
  }
15
13
 
14
+ const apiVersion = '2022-10'
15
+
16
16
  export class Shopify {
17
17
  private config: ShopifyConfig
18
18
 
@@ -33,7 +33,8 @@ export class Shopify {
33
33
  // var accessMode = 'per-user'
34
34
 
35
35
  // TODO make scopes properly
36
- var scopes = 'read_products,write_orders,read_customers,read_inventory,write_inventory'
36
+ var scopes =
37
+ 'read_products,read_orders,write_orders,read_customers,read_inventory,write_inventory,read_fulfillments,write_fulfillments,read_assigned_fulfillment_orders,write_assigned_fulfillment_orders,read_merchant_managed_fulfillment_orders,write_merchant_managed_fulfillment_orders,read_third_party_fulfillment_orders,write_third_party_fulfillment_orders,read_assigned_fulfillment_orders,write_assigned_fulfillment_orders'
37
38
 
38
39
  var { shop, apiKey } = this.config
39
40
 
@@ -60,7 +61,7 @@ export class Shopify {
60
61
  .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
61
62
  .join('&')
62
63
 
63
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}${qs ? '?' + qs : ''}`
64
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}${qs ? '?' + qs : ''}`
64
65
  debug('endpoint', endpoint)
65
66
 
66
67
  const response = await fetch(endpoint, {
@@ -96,7 +97,7 @@ export class Shopify {
96
97
 
97
98
  const jsondata = JSON.stringify(data)
98
99
 
99
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`
100
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`
100
101
 
101
102
  const response = await fetch(endpoint, {
102
103
  method: 'post',
@@ -125,7 +126,7 @@ export class Shopify {
125
126
 
126
127
  const jsondata = JSON.stringify(data)
127
128
 
128
- const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`
129
+ const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`
129
130
 
130
131
  const response = await fetch(endpoint, {
131
132
  method: 'put',