@things-factory/integration-marketplace 4.3.197 → 4.3.204

package/dist-server/controllers/lazada/apis/get-store-order.js

@@ -14,7 +14,7 @@ function getStoreOrder() {
             };
         },
         async normalize(res, { store }) {
-            var { order_id, order_number: orderNo, items_count: itemCount, price: totalAmount, statuses, address_shipping, created_at, updated_at } = res;
+            var { order_id, order_number: orderNo, items_count: itemCount, price: totalAmount, statuses, address_shipping, payment_method: paymentMethod, created_at, updated_at } = res;
             var orderCreatedAt = new Date(created_at).toUTCString();
             var orderUpdatedAt = new Date(updated_at).toUTCString();
             var status = statuses[0];
@@ -49,6 +49,7 @@ function getStoreOrder() {
                 totalAmount,
                 trackingNo,
                 shippingProvider,
+                paymentMethod,
                 itemCount,
                 orderItems: orderItemResult,
                 orderShipping

package/dist-server/controllers/lazada/apis/get-store-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-order.ts"],"names":[],"mappings":";AAAA,2GAA2G;;;AAE3G,+CAA0C;AAE1C,SAAgB,aAAa;IAC3B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,YAAY;QAClB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAE9B,OAAO;gBACL,QAAQ,EAAE,OAAO;aAClB,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC5B,IAAI,EACF,QAAQ,EACR,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,WAAW,EAClB,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,UAAU,EACX,GAAG,GAAG,CAAA;YAEP,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAExB,IAAI,OAAO,GAAG,QAAQ,CAAA;YACtB,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAC9B,IAAI,eAAe,GAAG,MAAM,oBAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;YAE3E,yBAAyB;YACzB,IAAI,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;YAE9C,+BAA+B;YAC/B,IAAI,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;YAE1D,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EAAE,QAAQ,EACnB,KAAK,EACL,MAAM,EACN,OAAO,EACP,IAAI,EACJ,UAAU,EACV,SAAS,EACV,GAAG,gBAAgB,CAAA;YAEpB,IAAI,aAAa,GAAG;gBAClB,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,IAAI;gBACJ,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;gBAChD,WAAW,EAAE,GAAG,UAAU,IAAI,SAAS,EAAE;aAC1C,CAAA;YAED,OAAO;gBACL,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,cAAc;gBACd,cAAc;gBACd,WAAW;gBACX,UAAU;gBACV,gBAAgB;gBAChB,SAAS;gBACT,UAAU,EAAE,eAAe;gBAC3B,aAAa;aACd,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAlFD,sCAkFC"}
+{"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-order.ts"],"names":[],"mappings":";AAAA,2GAA2G;;;AAE3G,+CAA0C;AAE1C,SAAgB,aAAa;IAC3B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,YAAY;QAClB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAE9B,OAAO;gBACL,QAAQ,EAAE,OAAO;aAClB,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC5B,IAAI,EACF,QAAQ,EACR,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,WAAW,EAClB,QAAQ,EACR,gBAAgB,EAChB,cAAc,EAAE,aAAa,EAC7B,UAAU,EACV,UAAU,EACX,GAAG,GAAG,CAAA;YAEP,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAExB,IAAI,OAAO,GAAG,QAAQ,CAAA;YACtB,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAC9B,IAAI,eAAe,GAAG,MAAM,oBAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;YAE3E,yBAAyB;YACzB,IAAI,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;YAE9C,+BAA+B;YAC/B,IAAI,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;YAE1D,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EAAE,QAAQ,EACnB,KAAK,EACL,MAAM,EACN,OAAO,EACP,IAAI,EACJ,UAAU,EACV,SAAS,EACV,GAAG,gBAAgB,CAAA;YAEpB,IAAI,aAAa,GAAG;gBAClB,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,IAAI;gBACJ,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;gBAChD,WAAW,EAAE,GAAG,UAAU,IAAI,SAAS,EAAE;aAC1C,CAAA;YAED,OAAO;gBACL,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,cAAc;gBACd,cAAc;gBACd,WAAW;gBACX,UAAU;gBACV,gBAAgB;gBAChB,aAAa;gBACb,SAAS;gBACT,UAAU,EAAE,eAAe;gBAC3B,aAAa;aACd,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AApFD,sCAoFC"}

package/dist-server/controllers/shopee/apis2/get-store-order-by-batch.js

@@ -40,7 +40,7 @@ function getStoreOrderByBatch() {
                     trackingNo = await store_api_1.StoreAPI.getTrackingNumber(store, { orderNo: order.order_sn });
                 }
                 catch (e) { }
-                const result = Object.assign(Object.assign({ name: order.order_sn, orderNo: order.order_sn, docRefNo: order.order_sn, status: order.order_status.toLowerCase(), orderCreatedAt: new Date(order.create_time * 1000), orderUpdatedAt: new Date(order.update_time * 1000), totalAmount: order.total_amount, cancelBy: order === null || order === void 0 ? void 0 : order.cancel_by, reason: order === null || order === void 0 ? void 0 : order.cancel_reason, recipientAddress: recipientAddress ? JSON.stringify(recipientAddress) : null, shippingProvider: order.shipping_carrier, itemCount: order.item_list.length, buyerUsername: order.buyer_username, payTime: (order === null || order === void 0 ? void 0 : order.pay_time) ? new Date(order.pay_time * 1000) : null, orderItems: order.item_list.map(item => {
+                const result = Object.assign(Object.assign({ name: order.order_sn, orderNo: order.order_sn, docRefNo: order.order_sn, status: order.order_status.toLowerCase(), orderCreatedAt: new Date(order.create_time * 1000), orderUpdatedAt: new Date(order.update_time * 1000), totalAmount: order.total_amount, cancelBy: order === null || order === void 0 ? void 0 : order.cancel_by, reason: order === null || order === void 0 ? void 0 : order.cancel_reason, paymentMethod: order === null || order === void 0 ? void 0 : order.payment_method, recipientAddress: recipientAddress ? JSON.stringify(recipientAddress) : null, shippingProvider: order.shipping_carrier, itemCount: order.item_list.length, buyerUsername: order.buyer_username, payTime: (order === null || order === void 0 ? void 0 : order.pay_time) ? new Date(order.pay_time * 1000) : null, orderItems: order.item_list.map(item => {
                         return {
                             name: item.item_id,
                             variationId: item.model_id == 0 ? item.item_id : item.model_id,

package/dist-server/controllers/shopee/apis2/get-store-order-by-batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-store-order-by-batch.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-store-order-by-batch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-store-order-by-batch.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-store-order-by-batch.ts"],"names":[],"mappings":"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"}

package/dist-server/controllers/shopify/apis/get-store-order-packages.js

@@ -0,0 +1,25 @@
+"use strict";
+/* https://open.shopee.com/documents?module=4&type=1&id=399 */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStoreOrderPackages = void 0;
+function getStoreOrderPackages() {
+    return {
+        method: 'get',
+        path: '/orders/{orderId}/fulfillment_orders.json',
+        denormalize(req) {
+            const { orderId } = req;
+            return {
+                resource: {
+                    orderId
+                }
+            };
+        },
+        async normalize(res) {
+            const { fulfillment_orders } = res;
+            let validFulfillmentOrder = fulfillment_orders.filter(fo => fo.status == 'open');
+            return validFulfillmentOrder;
+        }
+    };
+}
+exports.getStoreOrderPackages = getStoreOrderPackages;
+//# sourceMappingURL=get-store-order-packages.js.map

package/dist-server/controllers/shopify/apis/get-store-order-packages.js.map

@@ -0,0 +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

@@ -2,6 +2,7 @@
 /* https://open.shopee.com/documents?module=4&type=1&id=399 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStoreOrders = void 0;
+const store_api_1 = require("../../store-api");
 function getStoreOrders() {
     return {
         method: 'get',
@@ -45,15 +46,16 @@ function getStoreOrders() {
             }
             const orderSourceNames = ['pos'];
             var { orders } = res;
-            const results = orders
+            const results = await Promise.all(orders
                 .filter(item => !orderSourceNames.includes(item.source_name))
-                .map(order => {
+                .map(async (order) => {
                 var _a, _b;
                 const orderId = order.id;
                 const fulfillmentStatus = order.fulfillment_status;
                 const paymentStatus = (order === null || order === void 0 ? void 0 : order.financial_status) || '';
                 let orderStatus = (order === null || order === void 0 ? void 0 : order.cancelled_at) ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled';
                 let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus);
+                const fulfillmentOrders = await store_api_1.StoreAPI.getStoreOrderPackages(store, { orderId });
                 let itemCount = 0;
                 let result;
                 if (fulfillmentStatus != null) {
@@ -67,10 +69,12 @@ function getStoreOrders() {
                         orderCreatedAt: new Date(order.created_at).toUTCString(),
                         orderUpdatedAt: new Date(order.updated_at).toUTCString(),
                         discountValue: order.total_discounts,
+                        paymentStatus: order.financial_status,
                         status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
                         sellercraftStatus,
                         trackingNo: fulfillment.tracking_number,
                         shippingProvider: fulfillment.tracking_company,
+                        paymentMethod: order.payment_gateway_names[0],
                         recipientAddress: fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
                         reason: order.cancel_reason,
                         orderItems: fulfillment.line_items.map(lineItem => {
@@ -165,6 +169,7 @@ function getStoreOrders() {
                         status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
                         sellercraftStatus,
                         reason: order.cancel_reason,
+                        paymentMethod: order.payment_gateway_names[0],
                         orderItems: lineItems
                     };
                 }
@@ -183,7 +188,8 @@ function getStoreOrders() {
                         state,
                         country: country === 'MY' ? 'Malaysia' : country,
                         collectionCurrency: order.currency,
-                        attentionTo: `${first_name} ${last_name}`
+                        attentionTo: `${first_name} ${last_name}`,
+                        packageId: fulfillmentOrders[0].id
                     };
                     result.orderShipping = orderShipping;
                     // For SC mapping
@@ -221,7 +227,7 @@ function getStoreOrders() {
                 itemCount = result.orderItems.length;
                 result.itemCount = itemCount;
                 return result;
-            });
+            }));
             return { results, more, nextCursor };
         }
     };

package/dist-server/controllers/shopify/apis/get-store-orders.js.map

@@ -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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"}
+{"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

@@ -18,6 +18,7 @@ __exportStar(require("./echo"), exports);
 __exportStar(require("./get-store-products"), exports);
 __exportStar(require("./get-store-products-count"), exports);
 __exportStar(require("./get-store-orders"), exports);
+__exportStar(require("./get-store-order-packages"), exports);
 __exportStar(require("./get-inventory-level"), exports);
 __exportStar(require("./update-store-product-variation-stock"), exports);
 __exportStar(require("./update-order-status"), exports);

package/dist-server/controllers/shopify/apis/index.js.map

@@ -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"}
+{"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

@@ -5,22 +5,25 @@ exports.setStoreOrderStatusReadyToShip = void 0;
 function setStoreOrderStatusReadyToShip() {
     return {
         method: 'post',
-        path: '/orders/{orderId}/fulfillments.json',
+        path: '/fulfillments.json',
         denormalize(req) {
-            const { orderId, trackingUrl, trackingNo, orderItemId, order, transporter } = req || {};
-            let locationId = JSON.parse(order.marketplaceOrderItems[0].marketplaceProductVariation.locationId)[0].location_id;
+            const { packageId, trackingUrl, trackingNo, transporter } = req || {};
             return {
                 payload: {
                     fulfillment: {
-                        location_id: locationId,
-                        tracking_number: trackingNo,
-                        tracking_urls: [trackingUrl],
-                        notify_customer: true,
-                        tracking_company: transporter
+                        message: 'The package was shipped',
+                        notify_customer: false,
+                        tracking_info: {
+                            number: trackingNo,
+                            url: trackingUrl,
+                            company: transporter
+                        },
+                        line_items_by_fulfillment_order: [
+                            {
+                                fulfillment_order_id: parseFloat(packageId)
+                            }
+                        ]
                     }
-                },
-                resource: {
-                    orderId
                 }
             };
         },

package/dist-server/controllers/shopify/apis/set-store-order-status-ready-to-ship.js.map

@@ -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"}
+{"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

@@ -15,10 +15,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shopify = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const crypto_1 = __importDefault(require("crypto"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const querystring_1 = __importDefault(require("querystring"));
 const debug = require('debug')('things-factory:integration-marketplace:shopify');
+const apiVersion = '2022-10';
 class Shopify {
     constructor(config) {
         this.config = Object.assign({}, config);
@@ -32,7 +33,7 @@ class Shopify {
         // so, accessMode should be 'offline'
         // var accessMode = 'per-user'
         // TODO make scopes properly
-        var scopes = 'read_products,write_orders,read_customers,read_inventory,write_inventory';
+        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';
         var { shop, apiKey } = this.config;
         // return `https://${shop}.myshopify.com/admin/oauth/authorize?client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}&grant_options[]=${accessMode}`
         return `https://${shop}.myshopify.com/admin/oauth/authorize?client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}`;
@@ -51,7 +52,7 @@ class Shopify {
         const qs = Object.entries(data)
             .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
             .join('&');
-        const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}${qs ? '?' + qs : ''}`;
+        const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}${qs ? '?' + qs : ''}`;
         debug('endpoint', endpoint);
         const response = await (0, node_fetch_1.default)(endpoint, {
             headers: {
@@ -77,7 +78,7 @@ class Shopify {
         const { shop, accessToken } = this.config;
         debug('data', data);
         const jsondata = JSON.stringify(data);
-        const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`;
+        const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`;
         const response = await (0, node_fetch_1.default)(endpoint, {
             method: 'post',
             headers: {
@@ -99,7 +100,7 @@ class Shopify {
         const { shop, accessToken } = this.config;
         debug('data', data);
         const jsondata = JSON.stringify(data);
-        const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`;
+        const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`;
         const response = await (0, node_fetch_1.default)(endpoint, {
             method: 'put',
             headers: {

package/dist-server/controllers/shopify/shopify.js.map

@@ -1 +1 @@
-{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../server/controllers/shopify/shopify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shopify.js","sourceRoot":"","sources":["../../../server/controllers/shopify/shopify.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-marketplace",
-  "version": "4.3.197",
+  "version": "4.3.204",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "5260e10e3fcf588d40a66d46f471d98ff8d803d4"
+  "gitHead": "d7400c05d76662c2df54c0278078ade54e57f271"
 }

package/server/controllers/lazada/apis/get-store-order.ts

@@ -21,6 +21,7 @@ export function getStoreOrder() {
         price: totalAmount,
         statuses,
         address_shipping,
+        payment_method: paymentMethod,
         created_at,
         updated_at
       } = res
@@ -78,6 +79,7 @@ export function getStoreOrder() {
         totalAmount,
         trackingNo,
         shippingProvider,
+        paymentMethod,
         itemCount,
         orderItems: orderItemResult,
         orderShipping

package/server/controllers/shopee/apis2/get-store-order-by-batch.ts

@@ -48,6 +48,7 @@ export function getStoreOrderByBatch() {
           totalAmount: order.total_amount,
           cancelBy: order?.cancel_by,
           reason: order?.cancel_reason,
+          paymentMethod: order?.payment_method,
           recipientAddress: recipientAddress ? JSON.stringify(recipientAddress) : null,
           shippingProvider: order.shipping_carrier,
           itemCount: order.item_list.length,

package/server/controllers/shopify/apis/get-store-order-packages.ts

@@ -0,0 +1,24 @@
+/* https://open.shopee.com/documents?module=4&type=1&id=399 */
+
+export function getStoreOrderPackages() {
+  return {
+    method: 'get',
+    path: '/orders/{orderId}/fulfillment_orders.json',
+    denormalize(req) {
+      const { orderId } = req
+
+      return {
+        resource: {
+          orderId
+        }
+      }
+    },
+    async normalize(res) {
+      const { fulfillment_orders } = res
+
+      let validFulfillmentOrder: any = fulfillment_orders.filter(fo => fo.status == 'open')
+
+      return validFulfillmentOrder
+    }
+  }
+}

package/server/controllers/shopify/apis/get-store-orders.ts

@@ -1,11 +1,14 @@
 /* https://open.shopee.com/documents?module=4&type=1&id=399 */
 
+import { StoreAPI } from '../../store-api'
+
 export function getStoreOrders() {
   return {
     method: 'get',
     path: '/orders.json',
     denormalize(req) {
-      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId, nextCursor } = req || {}
+      var { pagination, fromCreatedDate, toCreatedDate, fromUpdatedDate, toUpdatedDate, lastOrderId, nextCursor } =
+        req || {}
       var { page = 0, limit = 100 } = pagination || {}
 
       var payload: any = {
@@ -53,208 +56,216 @@ export function getStoreOrders() {
       const orderSourceNames: any = ['pos']
       var { orders } = res
 
-      const results: any[] = orders
-        .filter(item => !orderSourceNames.includes(item.source_name))
-        .map(order => {
-          const orderId = order.id
-          const fulfillmentStatus = order.fulfillment_status
-          const paymentStatus = order?.financial_status || ''
-          let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
-          let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus)
-
-          let itemCount: Number = 0
-          let result: any
-
-          if (fulfillmentStatus != null) {
-            const fulfillment = order.fulfillments[0]
-
-            result = {
-              name: fulfillment.order_id,
-              orderNo: order.name,
-              currency: order.currency,
-              totalAmount: order.current_total_price,
-              remark: order.note,
-              orderCreatedAt: new Date(order.created_at).toUTCString(),
-              orderUpdatedAt: new Date(order.updated_at).toUTCString(),
-              discountValue: order.total_discounts,
-              status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
-              sellercraftStatus,
-              trackingNo: fulfillment.tracking_number,
-              shippingProvider: fulfillment.tracking_company,
-              recipientAddress:
-                fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
-              reason: order.cancel_reason,
-              orderItems: fulfillment.line_items.map(lineItem => {
-                return {
-                  name: lineItem.id.toString(),
-                  qty: lineItem.quantity,
-                  status: lineItem.status,
-                  paidPrice: lineItem.price,
-                  docRefNo: lineItem.id,
-                  variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
-                  variationSku: lineItem.sku,
-                  channelSku: lineItem.sku,
-                  variationName: lineItem.name,
-                  originalPrice: lineItem.price,
-                  total: lineItem.price,
-                  subtotal: lineItem.price
-                }
-              })
-            }
-          } else {
-            let lineItems = []
-
-            const refundItems = order.refunds
-              .reduce((acc, curr) => {
-                const refundLineItems = curr.refund_line_items
-                acc.push(...refundLineItems)
-
-                return acc
-              }, [])
-              .reduce((acc, curr) => {
-                let sum = acc.findIndex(x => x.line_item_id === curr.line_item_id)
-                if (sum >= 0) {
-                  acc[sum].quantity += curr.quantity
-                } else {
-                  acc.push(curr)
-                }
-
-                return acc
-              }, [])
-
-            let filteredLineItems = []
-            if (orderStatus == 'cancelled') {
-              filteredLineItems = order.line_items
+      const results: any[] = await Promise.all(
+        orders
+          .filter(item => !orderSourceNames.includes(item.source_name))
+          .map(async order => {
+            const orderId = order.id
+            const fulfillmentStatus = order.fulfillment_status
+            const paymentStatus = order?.financial_status || ''
+            let orderStatus = order?.cancelled_at ? 'cancelled' : fulfillmentStatus ? fulfillmentStatus : 'unfulfilled'
+            let sellercraftStatus = getSellercraftStatus(fulfillmentStatus, paymentStatus)
+
+            const fulfillmentOrders: any = await StoreAPI.getStoreOrderPackages(store, { orderId })
+
+            let itemCount: Number = 0
+            let result: any
+
+            if (fulfillmentStatus != null) {
+              const fulfillment = order.fulfillments[0]
+
+              result = {
+                name: fulfillment.order_id,
+                orderNo: order.name,
+                currency: order.currency,
+                totalAmount: order.current_total_price,
+                remark: order.note,
+                orderCreatedAt: new Date(order.created_at).toUTCString(),
+                orderUpdatedAt: new Date(order.updated_at).toUTCString(),
+                discountValue: order.total_discounts,
+                paymentStatus: order.financial_status,
+                status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
+                sellercraftStatus,
+                trackingNo: fulfillment.tracking_number,
+                shippingProvider: fulfillment.tracking_company,
+                paymentMethod: order.payment_gateway_names[0],
+                recipientAddress:
+                  fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
+                reason: order.cancel_reason,
+                orderItems: fulfillment.line_items.map(lineItem => {
+                  return {
+                    name: lineItem.id.toString(),
+                    qty: lineItem.quantity,
+                    status: lineItem.status,
+                    paidPrice: lineItem.price,
+                    docRefNo: lineItem.id,
+                    variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
+                    variationSku: lineItem.sku,
+                    channelSku: lineItem.sku,
+                    variationName: lineItem.name,
+                    originalPrice: lineItem.price,
+                    total: lineItem.price,
+                    subtotal: lineItem.price
+                  }
+                })
+              }
             } else {
-              filteredLineItems = order.line_items.filter(item => item.fulfillable_quantity > 0)
-            }
-
-            filteredLineItems.map(lineItem => {
-              const matchedLineItem = refundItems.find(item => item.line_item_id == lineItem.id)
-
-              if (!matchedLineItem) {
-                lineItem = {
-                  name: lineItem.id.toString(),
-                  qty: lineItem.quantity,
-                  paidPrice: lineItem.price,
-                  docRefNo: lineItem.id,
-                  variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
-                  variationSku: lineItem.sku,
-                  channelSku: lineItem.sku,
-                  variationName: lineItem.name,
-                  originalPrice: lineItem.price,
-                  total: lineItem.price,
-                  subtotal: lineItem.price
-                }
-
-                lineItems.push(lineItem)
+              let lineItems = []
+
+              const refundItems = order.refunds
+                .reduce((acc, curr) => {
+                  const refundLineItems = curr.refund_line_items
+                  acc.push(...refundLineItems)
+
+                  return acc
+                }, [])
+                .reduce((acc, curr) => {
+                  let sum = acc.findIndex(x => x.line_item_id === curr.line_item_id)
+                  if (sum >= 0) {
+                    acc[sum].quantity += curr.quantity
+                  } else {
+                    acc.push(curr)
+                  }
+
+                  return acc
+                }, [])
+
+              let filteredLineItems = []
+              if (orderStatus == 'cancelled') {
+                filteredLineItems = order.line_items
               } else {
-                lineItem = {
-                  name: lineItem.id.toString(),
-                  qty: orderStatus == 'cancelled' ? lineItem.quantity : lineItem.quantity - matchedLineItem.quantity,
-                  paidPrice: lineItem.price,
-                  docRefNo: lineItem.id,
-                  variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
-                  variationSku: lineItem.sku,
-                  channelSku: lineItem.sku,
-                  variationName: lineItem.name,
-                  originalPrice: lineItem.price,
-                  total: lineItem.price,
-                  subtotal: lineItem.price
+                filteredLineItems = order.line_items.filter(item => item.fulfillable_quantity > 0)
+              }
+
+              filteredLineItems.map(lineItem => {
+                const matchedLineItem = refundItems.find(item => item.line_item_id == lineItem.id)
+
+                if (!matchedLineItem) {
+                  lineItem = {
+                    name: lineItem.id.toString(),
+                    qty: lineItem.quantity,
+                    paidPrice: lineItem.price,
+                    docRefNo: lineItem.id,
+                    variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
+                    variationSku: lineItem.sku,
+                    channelSku: lineItem.sku,
+                    variationName: lineItem.name,
+                    originalPrice: lineItem.price,
+                    total: lineItem.price,
+                    subtotal: lineItem.price
+                  }
+
+                  lineItems.push(lineItem)
+                } else {
+                  lineItem = {
+                    name: lineItem.id.toString(),
+                    qty: orderStatus == 'cancelled' ? lineItem.quantity : lineItem.quantity - matchedLineItem.quantity,
+                    paidPrice: lineItem.price,
+                    docRefNo: lineItem.id,
+                    variationId: lineItem.product_exists === true ? lineItem.variant_id : lineItem.id.toString(),
+                    variationSku: lineItem.sku,
+                    channelSku: lineItem.sku,
+                    variationName: lineItem.name,
+                    originalPrice: lineItem.price,
+                    total: lineItem.price,
+                    subtotal: lineItem.price
+                  }
+
+                  if (lineItem.qty >= 0) lineItems.push(lineItem)
                 }
+              })
 
-                if (lineItem.qty >= 0) lineItems.push(lineItem)
+              result = {
+                name: orderId,
+                orderNo: order.name,
+                currency: order.currency,
+                totalAmount: orderStatus == 'cancelled' ? order.total_price : order.current_total_price,
+                remark: order.note,
+                orderCreatedAt: new Date(order.created_at).toUTCString(),
+                orderUpdatedAt: new Date(order.updated_at).toUTCString(),
+                discountValue: order.total_discounts,
+                recipientAddress: order.billing_address,
+                status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
+                sellercraftStatus,
+                reason: order.cancel_reason,
+                paymentMethod: order.payment_gateway_names[0],
+                orderItems: lineItems
               }
-            })
-
-            result = {
-              name: orderId,
-              orderNo: order.name,
-              currency: order.currency,
-              totalAmount: orderStatus == 'cancelled' ? order.total_price : order.current_total_price,
-              remark: order.note,
-              orderCreatedAt: new Date(order.created_at).toUTCString(),
-              orderUpdatedAt: new Date(order.updated_at).toUTCString(),
-              discountValue: order.total_discounts,
-              recipientAddress: order.billing_address,
-              status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
-              sellercraftStatus,
-              reason: order.cancel_reason,
-              orderItems: lineItems
-            }
-          }
-
-          if (order?.shipping_address || order?.billing_address) {
-            const {
-              address1,
-              address2,
-              phone,
-              zip: postCode,
-              city,
-              country,
-              first_name,
-              last_name,
-              province: state
-            } = order?.shipping_address ? order.shipping_address : order.billing_address
-
-            var orderShipping = {
-              address1,
-              address2,
-              address3: null,
-              address4: null,
-              address5: null,
-              phone1: phone,
-              phone2: null,
-              postCode,
-              city,
-              state,
-              country: country === 'MY' ? 'Malaysia' : country,
-              collectionCurrency: order.currency,
-              attentionTo: `${first_name} ${last_name}`
             }
 
-            result.orderShipping = orderShipping
+            if (order?.shipping_address || order?.billing_address) {
+              const {
+                address1,
+                address2,
+                phone,
+                zip: postCode,
+                city,
+                country,
+                first_name,
+                last_name,
+                province: state
+              } = order?.shipping_address ? order.shipping_address : order.billing_address
+
+              var orderShipping = {
+                address1,
+                address2,
+                address3: null,
+                address4: null,
+                address5: null,
+                phone1: phone,
+                phone2: null,
+                postCode,
+                city,
+                state,
+                country: country === 'MY' ? 'Malaysia' : country,
+                collectionCurrency: order.currency,
+                attentionTo: `${first_name} ${last_name}`,
+                packageId: fulfillmentOrders[0].id
+              }
 
-            // For SC mapping
+              result.orderShipping = orderShipping
 
-            let shippingAddress = order?.shipping_address
-            let billingAddress = order?.billing_address || shippingAddress
+              // For SC mapping
 
-            result.shipping = {
-              address_1: shippingAddress?.address1,
-              address_2: shippingAddress?.address2,
-              address_3: shippingAddress?.province,
-              postcode: shippingAddress?.zip,
-              country: shippingAddress?.country_code,
-              city: shippingAddress?.city,
-              first_name: shippingAddress?.first_name,
-              last_name: shippingAddress?.last_name,
-              phone: shippingAddress?.phone,
-              email: order?.email
-            }
-            result.billing = {
-              address_1: billingAddress?.address1,
-              address_2: billingAddress?.address2,
-              address_3: billingAddress?.province,
-              postcode: billingAddress?.zip,
-              country: billingAddress?.country_code,
-              city: billingAddress?.city,
-              first_name: billingAddress?.first_name,
-              last_name: billingAddress?.last_name,
-              phone: billingAddress?.phone,
-              email: order?.email
+              let shippingAddress = order?.shipping_address
+              let billingAddress = order?.billing_address || shippingAddress
+
+              result.shipping = {
+                address_1: shippingAddress?.address1,
+                address_2: shippingAddress?.address2,
+                address_3: shippingAddress?.province,
+                postcode: shippingAddress?.zip,
+                country: shippingAddress?.country_code,
+                city: shippingAddress?.city,
+                first_name: shippingAddress?.first_name,
+                last_name: shippingAddress?.last_name,
+                phone: shippingAddress?.phone,
+                email: order?.email
+              }
+              result.billing = {
+                address_1: billingAddress?.address1,
+                address_2: billingAddress?.address2,
+                address_3: billingAddress?.province,
+                postcode: billingAddress?.zip,
+                country: billingAddress?.country_code,
+                city: billingAddress?.city,
+                first_name: billingAddress?.first_name,
+                last_name: billingAddress?.last_name,
+                phone: billingAddress?.phone,
+                email: order?.email
+              }
+              result.isSOF = true
+              result.firstName = order?.customer?.first_name || ''
+              result.lastName = order?.customer?.last_name || ''
+              result.sellercraftDisplayOrderNo = order.name
             }
-            result.isSOF = true
-            result.firstName = order?.customer?.first_name || ''
-            result.lastName = order?.customer?.last_name || ''
-            result.sellercraftDisplayOrderNo = order.name
-          }
 
-          itemCount = result.orderItems.length
-          result.itemCount = itemCount
+            itemCount = result.orderItems.length
+            result.itemCount = itemCount
 
-          return result
-        })
+            return result
+          })
+      )
 
       return { results, more, nextCursor }
     }
@@ -268,8 +279,10 @@ function checkNextPage(link) {
   // If there's a previous link, remove the first part of the string entirely
   if (link.indexOf(`rel="next"`) > -1) {
     let nextLink = link.split(' ')
-    nextLink = nextLink[nextLink.indexOf(`rel="next"`)-1]
-    nextCursor = new URLSearchParams(nextLink.substring(nextLink.indexOf('<') + 1, nextLink.lastIndexOf('>'))).get('page_info')
+    nextLink = nextLink[nextLink.indexOf(`rel="next"`) - 1]
+    nextCursor = new URLSearchParams(nextLink.substring(nextLink.indexOf('<') + 1, nextLink.lastIndexOf('>'))).get(
+      'page_info'
+    )
     nextPage = true
   }
 

package/server/controllers/shopify/apis/index.ts

@@ -2,6 +2,7 @@ export * from './echo'
 export * from './get-store-products'
 export * from './get-store-products-count'
 export * from './get-store-orders'
+export * from './get-store-order-packages'
 export * from './get-inventory-level'
 export * from './update-store-product-variation-stock'
 export * from './update-order-status'

package/server/controllers/shopify/apis/set-store-order-status-ready-to-ship.ts

@@ -3,24 +3,26 @@
 export function setStoreOrderStatusReadyToShip() {
   return {
     method: 'post',
-    path: '/orders/{orderId}/fulfillments.json',
+    path: '/fulfillments.json',
     denormalize(req) {
-      const { orderId, trackingUrl, trackingNo, orderItemId, order, transporter } = req || {}
-
-      let locationId = JSON.parse(order.marketplaceOrderItems[0].marketplaceProductVariation.locationId)[0].location_id
+      const { packageId, trackingUrl, trackingNo, transporter } = req || {}
 
       return {
         payload: {
           fulfillment: {
-            location_id: locationId,
-            tracking_number: trackingNo,
-            tracking_urls: [trackingUrl],
-            notify_customer: true,
-            tracking_company: transporter
+            message: 'The package was shipped',
+            notify_customer: false,
+            tracking_info: {
+              number: trackingNo,
+              url: trackingUrl,
+              company: transporter
+            },
+            line_items_by_fulfillment_order: [
+              {
+                fulfillment_order_id: parseFloat(packageId)
+              }
+            ]
           }
-        },
-        resource: {
-          orderId
         }
       }
     },

package/server/controllers/shopify/shopify.ts

@@ -1,9 +1,7 @@
-import fetch from 'node-fetch'
 import crypto from 'crypto'
+import fetch from 'node-fetch'
 import querystring from 'querystring'
 
-import { createPayloadLog } from '@things-factory/integration-base'
-
 const debug = require('debug')('things-factory:integration-marketplace:shopify')
 
 export type ShopifyConfig = {
@@ -13,6 +11,8 @@ export type ShopifyConfig = {
   accessToken?: string
 }
 
+const apiVersion = '2022-10'
+
 export class Shopify {
   private config: ShopifyConfig
 
@@ -33,7 +33,8 @@ export class Shopify {
     // var accessMode = 'per-user'
 
     // TODO make scopes properly
-    var scopes = 'read_products,write_orders,read_customers,read_inventory,write_inventory'
+    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'
 
     var { shop, apiKey } = this.config
 
@@ -60,7 +61,7 @@ export class Shopify {
       .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
       .join('&')
 
-    const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}${qs ? '?' + qs : ''}`
+    const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}${qs ? '?' + qs : ''}`
     debug('endpoint', endpoint)
 
     const response = await fetch(endpoint, {
@@ -96,7 +97,7 @@ export class Shopify {
 
     const jsondata = JSON.stringify(data)
 
-    const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`
+    const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`
 
     const response = await fetch(endpoint, {
       method: 'post',
@@ -125,7 +126,7 @@ export class Shopify {
 
     const jsondata = JSON.stringify(data)
 
-    const endpoint = `https://${shop}.myshopify.com/admin/api/2020-01${path}`
+    const endpoint = `https://${shop}.myshopify.com/admin/api/${apiVersion}${path}`
 
     const response = await fetch(endpoint, {
       method: 'put',