@hszrdm/core 1.8.0 → 1.9.0
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/.medusa/server/src/admin/index.js +5787 -5812
- package/.medusa/server/src/admin/index.mjs +5788 -5813
- package/.medusa/server/src/api/admin/integrations/[key]/verify/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/integrations/[key]/verify/route.js +79 -0
- package/.medusa/server/src/api/admin/orders/[id]/billingo/route.js +10 -1
- package/.medusa/server/src/api/admin/orders/[id]/foxpost/create/route.d.ts +3 -5
- package/.medusa/server/src/api/admin/orders/[id]/foxpost/create/route.js +7 -14
- package/.medusa/server/src/api/admin/orders/[id]/foxpost/label/route.js +12 -6
- package/.medusa/server/src/api/admin/orders/[id]/gls/create/route.d.ts +2 -1
- package/.medusa/server/src/api/admin/orders/[id]/gls/create/route.js +6 -14
- package/.medusa/server/src/api/admin/orders/[id]/gls/label/route.js +9 -4
- package/.medusa/server/src/api/admin/orders/[id]/shipping/label/route.js +4 -2
- package/.medusa/server/src/api/admin/orders/[id]/shipping/route.d.ts +1 -2
- package/.medusa/server/src/api/admin/orders/[id]/shipping/route.js +60 -22
- package/.medusa/server/src/api/admin/shipping/bulk/create/route.d.ts +3 -6
- package/.medusa/server/src/api/admin/shipping/bulk/create/route.js +6 -57
- package/.medusa/server/src/api/admin/shipping/bulk/labels/route.js +4 -2
- package/.medusa/server/src/api/admin/shipping/orders/route.js +19 -4
- package/.medusa/server/src/api/store/cms/entries/[slug]/route.js +3 -2
- package/.medusa/server/src/api/store/cms/entries/route.js +3 -2
- package/.medusa/server/src/config.js +8 -2
- package/.medusa/server/src/core/version.d.ts +2 -2
- package/.medusa/server/src/core/version.js +2 -2
- package/.medusa/server/src/jobs/mpl-status-sync.js +10 -6
- package/.medusa/server/src/jobs/shipping-status-sync-eligibility.d.ts +5 -0
- package/.medusa/server/src/jobs/shipping-status-sync-eligibility.js +26 -0
- package/.medusa/server/src/jobs/shipping-status-sync.d.ts +6 -0
- package/.medusa/server/src/jobs/shipping-status-sync.js +63 -28
- package/.medusa/server/src/lib/modules/billingo/client.d.ts +0 -1
- package/.medusa/server/src/lib/modules/billingo/client.js +6 -3
- package/.medusa/server/src/lib/modules/billingo/mapper.d.ts +4 -1
- package/.medusa/server/src/lib/modules/billingo/mapper.js +46 -4
- package/.medusa/server/src/lib/modules/billingo/types.d.ts +14 -0
- package/.medusa/server/src/lib/modules/shipping/actions.d.ts +2 -2
- package/.medusa/server/src/lib/modules/shipping/actions.js +13 -5
- package/.medusa/server/src/lib/modules/shipping/index.d.ts +1 -0
- package/.medusa/server/src/lib/modules/shipping/index.js +2 -1
- package/.medusa/server/src/lib/modules/shipping/native-fulfillment.d.ts +73 -0
- package/.medusa/server/src/lib/modules/shipping/native-fulfillment.js +191 -0
- package/.medusa/server/src/lib/modules/shipping/operations.d.ts +28 -0
- package/.medusa/server/src/lib/modules/shipping/operations.js +9 -1
- package/.medusa/server/src/lib/modules/shipping/print-eligibility.d.ts +12 -0
- package/.medusa/server/src/lib/modules/shipping/print-eligibility.js +34 -0
- package/.medusa/server/src/lib/modules/shipping/recipient-email.d.ts +18 -0
- package/.medusa/server/src/lib/modules/shipping/recipient-email.js +29 -0
- package/.medusa/server/src/lib/modules/shipping/resolve.d.ts +9 -0
- package/.medusa/server/src/lib/modules/shipping/resolve.js +65 -0
- package/.medusa/server/src/modules/integration-operation/migrations/Migration20261104010000.d.ts +5 -0
- package/.medusa/server/src/modules/integration-operation/migrations/Migration20261104010000.js +34 -0
- package/.medusa/server/src/modules/integration-operation/models/integration-operation.d.ts +1 -1
- package/.medusa/server/src/modules/integration-operation/models/integration-operation.js +2 -2
- package/.medusa/server/src/modules/integration-operation/service.d.ts +1 -1
- package/.medusa/server/src/modules/integration-settings/connection-test.js +7 -4
- package/.medusa/server/src/modules/integration-settings/registry.js +1 -14
- package/.medusa/server/src/providers/csomagpiac/fulfillment-provider.d.ts +5 -0
- package/.medusa/server/src/providers/csomagpiac/fulfillment-provider.js +36 -9
- package/.medusa/server/src/providers/csomagpiac/service.d.ts +14 -0
- package/.medusa/server/src/providers/csomagpiac/service.js +71 -1
- package/.medusa/server/src/providers/csomagpiac/types.d.ts +1 -0
- package/.medusa/server/src/providers/csomagpiac/types.js +1 -1
- package/.medusa/server/src/providers/dpd/fulfillment-provider.d.ts +3 -0
- package/.medusa/server/src/providers/dpd/fulfillment-provider.js +12 -3
- package/.medusa/server/src/providers/dpd/service.d.ts +2 -0
- package/.medusa/server/src/providers/dpd/service.js +28 -2
- package/.medusa/server/src/providers/dpd/types.d.ts +1 -0
- package/.medusa/server/src/providers/dpd/types.js +1 -1
- package/.medusa/server/src/providers/foxpost/foxpost-service.d.ts +3 -1
- package/.medusa/server/src/providers/foxpost/foxpost-service.js +15 -9
- package/.medusa/server/src/providers/foxpost/fulfillment-provider.d.ts +9 -3
- package/.medusa/server/src/providers/foxpost/fulfillment-provider.js +29 -9
- package/.medusa/server/src/providers/foxpost/types.d.ts +1 -0
- package/.medusa/server/src/providers/gls/fulfillment-provider.d.ts +3 -0
- package/.medusa/server/src/providers/gls/fulfillment-provider.js +12 -5
- package/.medusa/server/src/providers/gls/gls-service.d.ts +3 -1
- package/.medusa/server/src/providers/gls/gls-service.js +11 -4
- package/.medusa/server/src/providers/gls/types.d.ts +1 -0
- package/.medusa/server/src/providers/mpl/fulfillment-provider.d.ts +3 -0
- package/.medusa/server/src/providers/mpl/fulfillment-provider.js +21 -5
- package/.medusa/server/src/providers/mpl/service.d.ts +2 -0
- package/.medusa/server/src/providers/mpl/service.js +37 -2
- package/.medusa/server/src/providers/mpl/types.d.ts +1 -0
- package/.medusa/server/src/providers/mpl/types.js +1 -1
- package/.medusa/server/src/providers/packeta/fulfillment-provider.d.ts +3 -0
- package/.medusa/server/src/providers/packeta/fulfillment-provider.js +13 -6
- package/.medusa/server/src/providers/packeta/point-validation.d.ts +2 -0
- package/.medusa/server/src/providers/packeta/point-validation.js +99 -0
- package/.medusa/server/src/providers/packeta/service.js +7 -2
- package/.medusa/server/src/providers/packeta/types.d.ts +1 -0
- package/.medusa/server/src/providers/packeta/types.js +1 -1
- package/.medusa/server/src/providers/resilient-stripe/index.js +5 -10
- package/.medusa/server/src/scripts/verify-runtime-modules.d.ts +7 -0
- package/.medusa/server/src/scripts/verify-runtime-modules.js +46 -0
- package/package.json +19 -18
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GET = GET;
|
|
4
|
+
const print_eligibility_1 = require("../../../../lib/modules/shipping/print-eligibility");
|
|
4
5
|
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
const integration_operation_1 = require("../../../../modules/integration-operation");
|
|
5
7
|
const shipping_1 = require("../../../../lib/modules/shipping");
|
|
6
8
|
async function GET(req, res) {
|
|
7
9
|
const logger = req.scope.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
@@ -9,14 +11,27 @@ async function GET(req, res) {
|
|
|
9
11
|
const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
10
12
|
const { data } = await query.graph({
|
|
11
13
|
entity: "order",
|
|
12
|
-
fields: ["id", "display_id", "email", "created_at", "metadata"],
|
|
14
|
+
fields: ["id", "display_id", "email", "created_at", "metadata", "shipping_address.postal_code", "shipping_address.city", "shipping_address.address_1", "shipping_address.address_2"],
|
|
13
15
|
pagination: { skip: 0, take: 200 },
|
|
14
16
|
});
|
|
15
17
|
const orders = (Array.isArray(data) ? data : []);
|
|
16
|
-
const
|
|
18
|
+
const operationStore = req.scope.resolve(integration_operation_1.INTEGRATION_OPERATION_MODULE);
|
|
19
|
+
// Bound database concurrency: the admin list can contain up to 200
|
|
20
|
+
// orders, each requiring a durable-operation lookup.
|
|
21
|
+
const hydrated = [];
|
|
22
|
+
for (let offset = 0; offset < orders.length; offset += 12) {
|
|
23
|
+
hydrated.push(...await Promise.all(orders.slice(offset, offset + 12).map(order => (0, shipping_1.resolveShippingOrder)(order, operationStore))));
|
|
24
|
+
}
|
|
25
|
+
const shippingOrders = hydrated
|
|
17
26
|
.map((order) => {
|
|
18
27
|
const carrier = (0, shipping_1.carrierForOrder)(order);
|
|
19
|
-
|
|
28
|
+
if (!carrier)
|
|
29
|
+
return null;
|
|
30
|
+
const operations = (0, shipping_1.shippingOperations)(order.metadata);
|
|
31
|
+
const raw = order.metadata?.[carrier];
|
|
32
|
+
const shipment = raw && typeof raw === "object" && !Array.isArray(raw)
|
|
33
|
+
? raw : null;
|
|
34
|
+
return { ...order, carrier, operations, printState: (0, print_eligibility_1.shippingPrintState)(carrier, shipment, operations) };
|
|
20
35
|
})
|
|
21
36
|
.filter((order) => Boolean(order))
|
|
22
37
|
.sort((first, second) => orderTime(second.created_at) - orderTime(first.created_at));
|
|
@@ -33,4 +48,4 @@ function orderTime(value) {
|
|
|
33
48
|
const timestamp = new Date(value).getTime();
|
|
34
49
|
return Number.isNaN(timestamp) ? 0 : timestamp;
|
|
35
50
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3NoaXBwaW5nL29yZGVycy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQU1BLGtCQXNDQztBQTVDRCwwRkFBdUY7QUFFdkYscURBQXFFO0FBQ3JFLHFGQUEwSDtBQUMxSCwrREFBZ0k7QUFFekgsS0FBSyxVQUFVLEdBQUcsQ0FBQyxHQUFrQixFQUFFLEdBQW1CO0lBQy9ELE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBRWxFLElBQUksQ0FBQztRQUNILE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ2hFLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7WUFDakMsTUFBTSxFQUFFLE9BQU87WUFDZixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLDhCQUE4QixFQUFFLHVCQUF1QixFQUFFLDRCQUE0QixFQUFFLDRCQUE0QixDQUFDO1lBQ3BMLFVBQVUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtTQUNuQyxDQUFDLENBQUE7UUFDRixNQUFNLE1BQU0sR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFvQixDQUFBO1FBQ25FLE1BQU0sY0FBYyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLG9EQUE0QixDQUFnQyxDQUFBO1FBQ3JHLG1FQUFtRTtRQUNuRSxxREFBcUQ7UUFD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
|
|
@@ -8,6 +8,7 @@ async function GET(req, res) {
|
|
|
8
8
|
if (!config.enabled)
|
|
9
9
|
return res.status(404).json({ message: "A CMS jelenleg nem elérhető." });
|
|
10
10
|
const requestLocale = queryText(req.locale || req.query?.locale);
|
|
11
|
+
const responseLocale = requestLocale || config.defaultLocale;
|
|
11
12
|
const contentType = queryText(req.query?.content_type);
|
|
12
13
|
const filters = {
|
|
13
14
|
slug: req.params.slug,
|
|
@@ -53,10 +54,10 @@ async function GET(req, res) {
|
|
|
53
54
|
const entry = (result.data || []).find((candidate) => (0, cms_1.isCmsEntryPublic)(candidate));
|
|
54
55
|
if (!entry)
|
|
55
56
|
return res.status(404).json({ message: "A tartalom nem található." });
|
|
56
|
-
return res.json({ entry: (0, cms_1.publicCmsEntry)(entry,
|
|
57
|
+
return res.json({ entry: (0, cms_1.publicCmsEntry)(entry, responseLocale) });
|
|
57
58
|
}
|
|
58
59
|
function queryText(value) {
|
|
59
60
|
const raw = Array.isArray(value) ? value[0] : value;
|
|
60
61
|
return typeof raw === "string" && raw.trim() ? raw.trim() : "";
|
|
61
62
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2Ntcy9lbnRyaWVzL1tzbHVnXS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWlCQSxrQkFvREM7QUFwRUQscURBQXFFO0FBQ3JFLG9EQUltQztBQVc1QixLQUFLLFVBQVUsR0FBRyxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDL0QsTUFBTSxNQUFNLEdBQUcsSUFBQSxtQkFBYSxHQUFFLENBQUE7SUFDOUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPO1FBQUUsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxDQUFDLENBQUE7SUFFN0YsTUFBTSxhQUFhLEdBQUcsU0FBUyxDQUFFLEdBQThCLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFDNUYsTUFBTSxjQUFjLEdBQUcsYUFBYSxJQUFJLE1BQU0sQ0FBQyxhQUFhLENBQUE7SUFDNUQsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUE7SUFDdEQsTUFBTSxPQUFPLEdBQTRCO1FBQ3ZDLElBQUksRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUk7UUFDckIsTUFBTSxFQUFFLENBQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQztLQUNuQyxDQUFBO0lBQ0QsSUFBSSxXQUFXO1FBQUUsT0FBTyxDQUFDLFlBQVksR0FBRyxXQUFXLENBQUE7SUFFbkQsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUF5QixDQUFBO0lBQ3hGLE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUMvQixNQUFNLEVBQUUsV0FBVztRQUNuQixNQUFNLEVBQUU7WUFDTixJQUFJO1lBQ0osY0FBYztZQUNkLFFBQVE7WUFDUixPQUFPO1lBQ1AsTUFBTTtZQUNOLFNBQVM7WUFDVCxNQUFNO1lBQ04sYUFBYTtZQUNiLFFBQVE7WUFDUixvQkFBb0I7WUFDcEIsb0JBQW9CO1lBQ3BCLGFBQWE7WUFDYixXQUFXO1lBQ1gsaUJBQWlCO1lBQ2pCLGVBQWU7WUFDZixTQUFTO1lBQ1QsY0FBYztZQUNkLGNBQWM7WUFDZCxZQUFZO1lBQ1osZUFBZTtZQUNmLFlBQVk7WUFDWixZQUFZO1lBQ1osVUFBVTtZQUNWLGdCQUFnQjtZQUNoQixZQUFZO1lBQ1osWUFBWTtZQUNaLG1CQUFtQjtTQUNwQjtRQUNELE9BQU87UUFDUCxVQUFVLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUU7S0FDbEMsRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUV6RCxNQUFNLEtBQUssR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxJQUFBLHNCQUFnQixFQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDbEYsSUFBSSxDQUFDLEtBQUs7UUFBRSxPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLENBQUMsQ0FBQTtJQUNqRixPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBQSxvQkFBYyxFQUFDLEtBQUssRUFBRSxjQUFjLENBQUMsRUFBRSxDQUFDLENBQUE7QUFDbkUsQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLEtBQWM7SUFDL0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7SUFDbkQsT0FBTyxPQUFPLEdBQUcsS0FBSyxRQUFRLElBQUksR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtBQUNoRSxDQUFDIn0=
|
|
@@ -38,6 +38,7 @@ async function GET(req, res) {
|
|
|
38
38
|
return res.status(404).json({ message: "A CMS jelenleg nem elérhető." });
|
|
39
39
|
const queryService = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
40
40
|
const requestLocale = text(req.locale || req.query?.locale);
|
|
41
|
+
const responseLocale = requestLocale || config.defaultLocale;
|
|
41
42
|
const contentType = text(req.query?.content_type);
|
|
42
43
|
const search = text(req.query?.q);
|
|
43
44
|
const category = text(req.query?.category);
|
|
@@ -66,7 +67,7 @@ async function GET(req, res) {
|
|
|
66
67
|
.filter((entry) => !category || hasTerm(entry, "category", category))
|
|
67
68
|
.filter((entry) => !tag || hasTerm(entry, "tag", tag));
|
|
68
69
|
return res.json({
|
|
69
|
-
entries: visible.slice(offset, offset + limit).map((entry) => (0, cms_1.publicCmsEntry)(entry,
|
|
70
|
+
entries: visible.slice(offset, offset + limit).map((entry) => (0, cms_1.publicCmsEntry)(entry, responseLocale)),
|
|
70
71
|
count: visible.length,
|
|
71
72
|
limit,
|
|
72
73
|
offset,
|
|
@@ -84,4 +85,4 @@ function clamp(value, min, max, fallback) {
|
|
|
84
85
|
const number = Number(raw);
|
|
85
86
|
return Number.isFinite(number) ? Math.max(min, Math.min(max, Math.trunc(number))) : fallback;
|
|
86
87
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2Ntcy9lbnRyaWVzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBa0RBLGtCQTBDQztBQTNGRCxxREFBcUU7QUFDckUsaURBSWdDO0FBY2hDLE1BQU0sWUFBWSxHQUFHO0lBQ25CLElBQUk7SUFDSixjQUFjO0lBQ2QsUUFBUTtJQUNSLE9BQU87SUFDUCxNQUFNO0lBQ04sU0FBUztJQUNULE1BQU07SUFDTixhQUFhO0lBQ2IsUUFBUTtJQUNSLG9CQUFvQjtJQUNwQixvQkFBb0I7SUFDcEIsYUFBYTtJQUNiLFdBQVc7SUFDWCxpQkFBaUI7SUFDakIsZUFBZTtJQUNmLFNBQVM7SUFDVCxjQUFjO0lBQ2QsY0FBYztJQUNkLFlBQVk7SUFDWixlQUFlO0lBQ2YsWUFBWTtJQUNaLFlBQVk7SUFDWixVQUFVO0lBQ1YsZ0JBQWdCO0lBQ2hCLFlBQVk7SUFDWixZQUFZO0lBQ1osbUJBQW1CO0NBQ3BCLENBQUE7QUFFTSxLQUFLLFVBQVUsR0FBRyxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDL0QsTUFBTSxNQUFNLEdBQUcsSUFBQSxtQkFBYSxHQUFFLENBQUE7SUFDOUIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPO1FBQUUsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxDQUFDLENBQUE7SUFFN0YsTUFBTSxZQUFZLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUF5QixDQUFBO0lBQy9GLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBRSxHQUE4QixDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBQ3ZGLE1BQU0sY0FBYyxHQUFHLGFBQWEsSUFB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
|
|
@@ -254,11 +254,17 @@ function createHszrdmCommerceConfig(options = {}) {
|
|
|
254
254
|
},
|
|
255
255
|
{
|
|
256
256
|
resolve: "@medusajs/medusa/fulfillment",
|
|
257
|
-
|
|
257
|
+
// Order service lets carrier providers resolve recipient contact details
|
|
258
|
+
// missing from Medusa native fulfillment DTOs (including older orders).
|
|
259
|
+
dependencies: ["integrationOperation", "order"],
|
|
258
260
|
options: { providers: fulfillmentProviders },
|
|
259
261
|
},
|
|
260
262
|
{
|
|
261
263
|
resolve: "@medusajs/medusa/payment",
|
|
264
|
+
// Stripe's webhook provider reads the durable operation store from its
|
|
265
|
+
// injected module container; without this dependency Awilix throws
|
|
266
|
+
// "Could not resolve 'integrationOperation'" during webhook processing.
|
|
267
|
+
dependencies: ["integrationOperation"],
|
|
262
268
|
options: { providers: paymentProviders },
|
|
263
269
|
},
|
|
264
270
|
],
|
|
@@ -312,4 +318,4 @@ function numberOrUndefined(value) {
|
|
|
312
318
|
const number = Number(value);
|
|
313
319
|
return Number.isFinite(number) ? number : undefined;
|
|
314
320
|
}
|
|
315
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":"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"}
|
|
321
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare const CORE_VERSION = "1.
|
|
1
|
+
export declare const CORE_VERSION = "1.9.0";
|
|
2
2
|
export declare const CORE_API_CONTRACT_VERSION = "1.0";
|
|
3
3
|
export declare const STOREFRONT_CORE_CONFIG_SCHEMA_VERSION = 1;
|
|
4
|
-
export declare const CORE_DB_SCHEMA_VERSION =
|
|
4
|
+
export declare const CORE_DB_SCHEMA_VERSION = 9;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CORE_DB_SCHEMA_VERSION = exports.STOREFRONT_CORE_CONFIG_SCHEMA_VERSION = exports.CORE_API_CONTRACT_VERSION = exports.CORE_VERSION = void 0;
|
|
4
|
-
exports.CORE_VERSION = "1.
|
|
4
|
+
exports.CORE_VERSION = "1.9.0";
|
|
5
5
|
exports.CORE_API_CONTRACT_VERSION = "1.0";
|
|
6
6
|
exports.STOREFRONT_CORE_CONFIG_SCHEMA_VERSION = 1;
|
|
7
|
-
exports.CORE_DB_SCHEMA_VERSION =
|
|
7
|
+
exports.CORE_DB_SCHEMA_VERSION = 9;
|
|
8
8
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb3JlL3ZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSxZQUFZLEdBQUcsT0FBTyxDQUFBO0FBQ3RCLFFBQUEseUJBQXlCLEdBQUcsS0FBSyxDQUFBO0FBQ2pDLFFBQUEscUNBQXFDLEdBQUcsQ0FBQyxDQUFBO0FBQ3pDLFFBQUEsc0JBQXNCLEdBQUcsQ0FBQyxDQUFBIn0=
|
|
@@ -4,6 +4,7 @@ exports.config = void 0;
|
|
|
4
4
|
exports.default = mplStatusSync;
|
|
5
5
|
exports.runBatch = runBatch;
|
|
6
6
|
const utils_1 = require("@medusajs/framework/utils");
|
|
7
|
+
const integration_operation_1 = require("../modules/integration-operation");
|
|
7
8
|
const shipping_1 = require("../lib/modules/shipping");
|
|
8
9
|
const TERMINAL = new Set(["DELIVERED", "RETURNED", "CANCELLED"]);
|
|
9
10
|
const PAGE_SIZE = 200;
|
|
@@ -26,6 +27,7 @@ async function mplStatusSync(container) {
|
|
|
26
27
|
}
|
|
27
28
|
async function runBatch(container) {
|
|
28
29
|
const orderService = container.resolve("order");
|
|
30
|
+
const operationStore = container.resolve(integration_operation_1.INTEGRATION_OPERATION_MODULE);
|
|
29
31
|
let scanned = 0;
|
|
30
32
|
let refreshed = 0;
|
|
31
33
|
for (let skip = 0;; skip += PAGE_SIZE) {
|
|
@@ -34,17 +36,19 @@ async function runBatch(container) {
|
|
|
34
36
|
scanned += 1;
|
|
35
37
|
if ((0, shipping_1.carrierForOrder)(order) !== "mpl")
|
|
36
38
|
continue;
|
|
37
|
-
const shipment = order.metadata?.mpl;
|
|
38
|
-
if (!shipment?.trackingNumber ||
|
|
39
|
-
TERMINAL.has(String(shipment.status ?? "").toUpperCase())) {
|
|
40
|
-
continue;
|
|
41
|
-
}
|
|
42
39
|
try {
|
|
40
|
+
const hydrated = await (0, shipping_1.resolveShippingOrder)(order, operationStore);
|
|
41
|
+
const shipment = hydrated.metadata?.mpl;
|
|
42
|
+
if (!shipment?.trackingNumber ||
|
|
43
|
+
TERMINAL.has(String(shipment.status ?? "").toUpperCase())) {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
43
46
|
await (0, shipping_1.executeShippingAction)({
|
|
44
47
|
orderService,
|
|
45
48
|
orderId: order.id,
|
|
46
49
|
action: "status",
|
|
47
50
|
actorId: "mpl-hourly-status-sync",
|
|
51
|
+
operationStore,
|
|
48
52
|
});
|
|
49
53
|
refreshed += 1;
|
|
50
54
|
}
|
|
@@ -60,4 +64,4 @@ async function runBatch(container) {
|
|
|
60
64
|
// Magyar Posta PULL guidance says the same tracking ID must not be queried more
|
|
61
65
|
// often than once per hour. PUSH is the primary path; this hourly job is fallback.
|
|
62
66
|
exports.config = { name: "mpl-status-sync", schedule: "15 * * * *" };
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXBsLXN0YXR1cy1zeW5jLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2pvYnMvbXBsLXN0YXR1cy1zeW5jLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWFBLGdDQTZCQztBQUVELDRCQThDQztBQXpGRCxxREFBcUU7QUFDckUsNEVBQWlIO0FBQ2pILHNEQUtnQztBQUVoQyxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxVQUFVLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQTtBQUNoRSxNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUE7QUFFTixLQUFLLFVBQVUsYUFBYSxDQUFDLFNBQTBCO0lBQ3BFLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEtBQUssTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0JBQW9CLEtBQUssTUFBTSxFQUFFLENBQUM7UUFDdEYsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FNMUMsQ0FBQTtJQUVELElBQUksQ0FBQztRQUNILE9BQU8sTUFBTSxPQUFPLENBQUMsT0FBTyxDQUMxQixxQkFBcUIsRUFDckIsR0FBRyxFQUFFLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUN6QixFQUFFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FDaEMsQ0FBQTtJQUNILENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNsRSxNQUFNLENBQUMsSUFBSSxDQUNULElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixLQUFLLEVBQUUsOEJBQThCO1lBQ3JDLEdBQUcsRUFBRSxpQkFBaUI7WUFDdEIsT0FBTyxFQUFFLEtB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
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { ShippingCarrier } from "../lib/modules/shipping/types";
|
|
2
|
+
/** Only valid, nonterminal physical parcels should be polled.
|
|
3
|
+
* MPL and DPD use their dedicated carrier-compliant sync jobs.
|
|
4
|
+
*/
|
|
5
|
+
export declare function shouldRefreshShippingStatus(carrier: ShippingCarrier, value: unknown): boolean;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldRefreshShippingStatus = shouldRefreshShippingStatus;
|
|
4
|
+
const TERMINAL = new Set([
|
|
5
|
+
"DELIVERED", "RETURNED", "CANCELLED", "CANCELED", "DELETED",
|
|
6
|
+
"VOID", "VOIDED", "DESTROYED", "LOST", "FAILED", "REJECTED",
|
|
7
|
+
]);
|
|
8
|
+
/** Only valid, nonterminal physical parcels should be polled.
|
|
9
|
+
* MPL and DPD use their dedicated carrier-compliant sync jobs.
|
|
10
|
+
*/
|
|
11
|
+
function shouldRefreshShippingStatus(carrier, value) {
|
|
12
|
+
if (carrier === "mpl" || carrier === "dpd")
|
|
13
|
+
return false;
|
|
14
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
15
|
+
return false;
|
|
16
|
+
const shipment = value;
|
|
17
|
+
const status = String(shipment.status ?? "").trim().toUpperCase();
|
|
18
|
+
if (TERMINAL.has(status))
|
|
19
|
+
return false;
|
|
20
|
+
const identifier = carrier === "foxpost" ? shipment.packageId ?? shipment.trackingNumber
|
|
21
|
+
: carrier === "gls" ? shipment.parcelId ?? shipment.parcelNumber
|
|
22
|
+
: carrier === "packeta" ? shipment.packetId
|
|
23
|
+
: shipment.identifier;
|
|
24
|
+
return identifier !== null && identifier !== undefined && String(identifier).trim().length > 0;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctc3RhdHVzLXN5bmMtZWxpZ2liaWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvam9icy9zaGlwcGluZy1zdGF0dXMtc3luYy1lbGlnaWJpbGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVVBLGtFQWNDO0FBdEJELE1BQU0sUUFBUSxHQUFHLElBQUksR0FBRyxDQUFDO0lBQ3ZCLFdBQVcsRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxTQUFTO0lBQzNELE1BQU0sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVTtDQUM1RCxDQUFDLENBQUE7QUFFRjs7R0FFRztBQUNILFNBQWdCLDJCQUEyQixDQUN6QyxPQUF3QixFQUN4QixLQUFjO0lBRWQsSUFBSSxPQUFPLEtBQUssS0FBSyxJQUFJLE9BQU8sS0FBSyxLQUFLO1FBQUUsT0FBTyxLQUFLLENBQUE7SUFDeEQsSUFBSSxDQUFDLEtBQUssSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7UUFBRSxPQUFPLEtBQUssQ0FBQTtJQUM3RSxNQUFNLFFBQVEsR0FBRyxLQUFnQyxDQUFBO0lBQ2pELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQ2pFLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFBRSxPQUFPLEtBQUssQ0FBQTtJQUN0QyxNQUFNLFVBQVUsR0FBRyxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxJQUFJLFFBQVEsQ0FBQyxjQUFjO1FBQ3RGLENBQUMsQ0FBQyxPQUFPLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxZQUFZO1lBQ2hFLENBQUMsQ0FBQyxPQUFPLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUTtnQkFDM0MsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUE7SUFDdkIsT0FBTyxVQUFVLEtBQUssSUFBSSxJQUFJLFVBQVUsS0FBSyxTQUFTLElBQUksTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7QUFDaEcsQ0FBQyJ9
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import type { MedusaContainer } from "@medusajs/framework/types";
|
|
2
2
|
export default function shippingStatusSync(container: MedusaContainer): Promise<{
|
|
3
3
|
scanned: number;
|
|
4
|
+
eligible: number;
|
|
5
|
+
pending: number;
|
|
4
6
|
refreshed: number;
|
|
7
|
+
failed: number;
|
|
5
8
|
} | undefined>;
|
|
6
9
|
export declare function runBatch(container: MedusaContainer): Promise<{
|
|
7
10
|
scanned: number;
|
|
11
|
+
eligible: number;
|
|
12
|
+
pending: number;
|
|
8
13
|
refreshed: number;
|
|
14
|
+
failed: number;
|
|
9
15
|
}>;
|
|
10
16
|
export declare const config: {
|
|
11
17
|
name: string;
|
|
@@ -4,13 +4,16 @@ exports.config = void 0;
|
|
|
4
4
|
exports.default = shippingStatusSync;
|
|
5
5
|
exports.runBatch = runBatch;
|
|
6
6
|
const utils_1 = require("@medusajs/framework/utils");
|
|
7
|
+
const integration_operation_1 = require("../modules/integration-operation");
|
|
7
8
|
const shipping_1 = require("../lib/modules/shipping");
|
|
8
|
-
const
|
|
9
|
+
const shipping_status_sync_eligibility_1 = require("./shipping-status-sync-eligibility");
|
|
9
10
|
const PAGE_SIZE = 200;
|
|
10
11
|
async function shippingStatusSync(container) {
|
|
12
|
+
if (process.env.SHIPPING_STATUS_SYNC_ENABLED === "false")
|
|
13
|
+
return;
|
|
11
14
|
const locking = container.resolve("locking");
|
|
12
15
|
try {
|
|
13
|
-
return await locking.execute("job:shipping-status-sync", () => runBatch(container), { timeout: 1, expire:
|
|
16
|
+
return await locking.execute("job:shipping-status-sync", () => runBatch(container), { timeout: 1, expire: 29 * 60 });
|
|
14
17
|
}
|
|
15
18
|
catch (error) {
|
|
16
19
|
const logger = container.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
@@ -23,44 +26,76 @@ async function shippingStatusSync(container) {
|
|
|
23
26
|
}
|
|
24
27
|
async function runBatch(container) {
|
|
25
28
|
const orderService = container.resolve("order");
|
|
29
|
+
const operationStore = container.resolve(integration_operation_1.INTEGRATION_OPERATION_MODULE);
|
|
30
|
+
const logger = container.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
31
|
+
const limitRaw = Number(process.env.SHIPPING_STATUS_SYNC_BATCH_SIZE || 100);
|
|
32
|
+
const batchLimit = Number.isInteger(limitRaw) && limitRaw > 0
|
|
33
|
+
? Math.min(limitRaw, 500) : 100;
|
|
26
34
|
let scanned = 0;
|
|
35
|
+
let eligible = 0;
|
|
27
36
|
let refreshed = 0;
|
|
37
|
+
let failed = 0;
|
|
38
|
+
// Select the least recently refreshed parcels first. A fixed cap on the
|
|
39
|
+
// newest orders would otherwise starve older parcels indefinitely.
|
|
40
|
+
const candidates = [];
|
|
28
41
|
for (let skip = 0;; skip += PAGE_SIZE) {
|
|
29
42
|
const orders = await orderService.listOrders({}, { take: PAGE_SIZE, skip, order: { created_at: "DESC" } });
|
|
30
|
-
for (const
|
|
43
|
+
for (const original of orders) {
|
|
31
44
|
scanned += 1;
|
|
32
|
-
const carrier = (0, shipping_1.carrierForOrder)(
|
|
33
|
-
if (!carrier)
|
|
34
|
-
continue;
|
|
35
|
-
// MPL uses the official PUSH stream with an hourly PULL fallback.
|
|
36
|
-
// DPD physical transit is supplied by Statusdata, not the Shipping API.
|
|
37
|
-
if (carrier === "mpl" || carrier === "dpd")
|
|
38
|
-
continue;
|
|
39
|
-
const shipment = order.metadata?.[carrier];
|
|
40
|
-
const hasParcel = carrier === "foxpost"
|
|
41
|
-
? Boolean(shipment?.packageId)
|
|
42
|
-
: carrier === "packeta"
|
|
43
|
-
? Boolean(shipment?.packetId)
|
|
44
|
-
: Boolean(shipment?.parcelNumber);
|
|
45
|
-
if (!hasParcel || TERMINAL.has(String(shipment?.status ?? "").toUpperCase()))
|
|
45
|
+
const carrier = (0, shipping_1.carrierForOrder)(original);
|
|
46
|
+
if (!carrier || carrier === "mpl" || carrier === "dpd")
|
|
46
47
|
continue;
|
|
48
|
+
let order;
|
|
47
49
|
try {
|
|
48
|
-
await (0, shipping_1.
|
|
49
|
-
orderService,
|
|
50
|
-
orderId: order.id,
|
|
51
|
-
action: "status",
|
|
52
|
-
actorId: "scheduled-status-sync",
|
|
53
|
-
});
|
|
54
|
-
refreshed += 1;
|
|
50
|
+
order = await (0, shipping_1.resolveShippingOrder)(original, operationStore);
|
|
55
51
|
}
|
|
56
52
|
catch (error) {
|
|
57
|
-
|
|
53
|
+
failed += 1;
|
|
54
|
+
logger.warn(`[shipping-status-sync] hydrate ${original.id}: ${error instanceof Error ? error.message : String(error)}`);
|
|
55
|
+
continue;
|
|
58
56
|
}
|
|
57
|
+
const shipment = order.metadata?.[carrier];
|
|
58
|
+
if (!(0, shipping_status_sync_eligibility_1.shouldRefreshShippingStatus)(carrier, shipment))
|
|
59
|
+
continue;
|
|
60
|
+
const fields = shipment;
|
|
61
|
+
const time = Date.parse(String(fields.statusUpdatedAt ?? ""));
|
|
62
|
+
candidates.push({
|
|
63
|
+
orderId: order.id,
|
|
64
|
+
carrier,
|
|
65
|
+
checkedAt: Number.isFinite(time) ? time : 0,
|
|
66
|
+
});
|
|
59
67
|
}
|
|
60
68
|
if (orders.length < PAGE_SIZE)
|
|
61
69
|
break;
|
|
62
70
|
}
|
|
63
|
-
|
|
71
|
+
candidates.sort((a, b) => a.checkedAt - b.checkedAt);
|
|
72
|
+
// When the configured batch limit is reached, remaining orders will receive
|
|
73
|
+
// their turn on the next execution instead of always refreshing newest first.
|
|
74
|
+
for (const candidate of candidates.slice(0, batchLimit)) {
|
|
75
|
+
eligible += 1;
|
|
76
|
+
try {
|
|
77
|
+
await (0, shipping_1.executeShippingAction)({
|
|
78
|
+
orderService,
|
|
79
|
+
orderId: candidate.orderId,
|
|
80
|
+
action: "status",
|
|
81
|
+
actorId: "scheduled-status-sync",
|
|
82
|
+
operationStore,
|
|
83
|
+
});
|
|
84
|
+
refreshed += 1;
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
failed += 1;
|
|
88
|
+
logger.warn(`[shipping-status-sync] ${candidate.carrier} ${candidate.orderId}: ${error instanceof Error ? error.message : String(error)}`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
logger.info(JSON.stringify({
|
|
92
|
+
event: "shipping_status_sync_complete",
|
|
93
|
+
scanned, eligible, pending: candidates.length - eligible, refreshed, failed, batchLimit,
|
|
94
|
+
}));
|
|
95
|
+
return { scanned, eligible, pending: candidates.length - eligible, refreshed, failed };
|
|
64
96
|
}
|
|
65
|
-
|
|
66
|
-
|
|
97
|
+
// MPL tracking is PULL at most once/hour with PUSH as primary.
|
|
98
|
+
// DPD Hungary physical tracking comes from hourly Statusdata FTP feeds.
|
|
99
|
+
// FOXPOST, GLS, Packeta and Csomagpiac are polled at 30-minute intervals.
|
|
100
|
+
exports.config = { name: "shipping-status-sync", schedule: "*/30 * * * *" };
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctc3RhdHVzLXN5bmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvam9icy9zaGlwcGluZy1zdGF0dXMtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFpQkEscUNBeUJDO0FBRUQsNEJBd0VDO0FBbkhELHFEQUFxRTtBQUNyRSw0RUFHeUM7QUFDekMsc0RBTWdDO0FBQ2hDLHlGQUFnRjtBQUVoRixNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUE7QUFFTixLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBMEI7SUFDekUsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixLQUFLLE9BQU87UUFBRSxPQUFNO0lBRWhFLE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQU0xQyxDQUFBO0lBRUQsSUFBSSxDQUFDO1FBQ0gsT0FBTyxNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQzFCLDBCQUEwQixFQUMxQixHQUFHLEVBQUUsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLEVBQ3pCLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUNoQyxDQUFBO0lBQ0gsQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ2xFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUN6QixLQUFLLEVBQUUsOEJBQThCO1lBQ3JDLEdBQUcsRUFBRSxzQkFBc0I7WUFDM0IsT0FBTyxFQUFFLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7U0FDaEUsQ0FBQyxDQUFDLENBQUE7SUFDTCxDQUFDO0FBQ0gs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
|
|
@@ -28,13 +28,16 @@ class BillingoClient {
|
|
|
28
28
|
* remain stable, which is useful for tests and one-off connection checks.
|
|
29
29
|
*/
|
|
30
30
|
get apiUrl() {
|
|
31
|
-
return (this.options.apiUrl ||
|
|
31
|
+
return (this.options.apiUrl || "https://api.billingo.hu/v3").replace(/\/$/, "");
|
|
32
32
|
}
|
|
33
33
|
get apiKey() {
|
|
34
34
|
return this.options.apiKey ?? process.env.BILLINGO_API_KEY ?? "";
|
|
35
35
|
}
|
|
36
36
|
get timeoutMs() {
|
|
37
|
-
|
|
37
|
+
const configured = Number(process.env.BILLINGO_TIMEOUT_MS ?? "30000");
|
|
38
|
+
return Number.isInteger(configured) && configured >= 1_000 && configured <= 120_000
|
|
39
|
+
? configured
|
|
40
|
+
: 30_000;
|
|
38
41
|
}
|
|
39
42
|
isConfigured() {
|
|
40
43
|
return Boolean(this.apiKey && positiveIntegerEnv("BILLINGO_DOCUMENT_BLOCK_ID"));
|
|
@@ -151,4 +154,4 @@ function positiveIntegerEnv(name) {
|
|
|
151
154
|
const value = Number(process.env[name]);
|
|
152
155
|
return Number.isInteger(value) && value > 0 ? value : null;
|
|
153
156
|
}
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9tb2R1bGVzL2JpbGxpbmdvL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUEwQkEsNEVBRUM7QUF1SkQsOEJBR0M7QUFFRCxnREFHQztBQWhMRCxNQUFhLGdCQUFpQixTQUFRLEtBQUs7SUFHekMsWUFDRSxPQUFlLEVBQ04sU0FBUyxHQUFHLEVBQ1osT0FBaUIsRUFDMUIsVUFBZ0QsRUFBRTtRQUVsRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7UUFKTCxXQUFNLEdBQU4sTUFBTSxDQUFNO1FBQ1osWUFBTyxHQUFQLE9BQU8sQ0FBVTtRQUkxQixJQUFJLENBQUMsSUFBSSxHQUFHLGtCQUFrQixDQUFBO1FBQzlCLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxPQUFPLENBQUMsc0JBQXNCLEtBQUssSUFBSSxDQUFBO0lBQ3ZFLENBQUM7Q0FDRjtBQWJELDRDQWFDO0FBRUQsU0FBZ0IsZ0NBQWdDLENBQUMsS0FBYztJQUM3RCxPQUFPLEtBQUssWUFBWSxnQkFBZ0IsSUFBSSxLQUFLLENBQUMsc0JBQXNCLENBQUE7QUFDMUUsQ0FBQztBQUVELE1BQWEsY0FBYztJQUd6QixZQUFZLFVBQWlDLEVBQUU7UUFDN0MsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUE7SUFDeEIsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsSUFBSSxNQUFNO1FBQ1IsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxJQUFJLDRCQUE0QixDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBRUQsSUFBSSxNQUFNO1FBQ1IsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBQTtJQUNsRSxDQUFDO0lBRUQsSUFBSSxTQUFTO1FBQ1gsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLElBQUksT0FBTyxDQUFDLENBQUE7UUFDckUsT0FBTyxNQUFNLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLFVBQVUsSUFBSSxLQUFLLElBQUksVUFBVSxJQUFJLE9BQU87WUFDakYsQ0FBQyxDQUFDLFVBQVU7WUFDWixDQUFDLENBQUMsTUFBTSxDQUFBO0lBQ1osQ0FBQztJQUVELFlBQVk7UUFDVixPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLGtCQUFrQixDQUFDLDRCQUE0QixDQUFDLENBQUMsQ0FBQTtJQUNqRixDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWM7UUFDbEIsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUEwQixlQUFlLENBQUMsQ0FBQTtJQUMvRCxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFnQztRQUNsRCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQWlCLFdBQVcsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDckYsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsUUFBK0I7UUFDbEQsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFtQixZQUFZLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFBO0lBQ3pGLENBQUM7SUFFRCxLQUFLLENBQUMsMEJBQTBCLENBQUMsRUFBVTtRQUN6QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQW1CLGNBQWMsRUFBRSx1QkFBdUIsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBQ3BHLENBQUM7SUFFRCxLQUFLLENBQUMsMEJBQTBCLENBQUMsRUFBVSxFQUFFLFFBQTJDO1FBQ3RGLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBbUIsY0FBYyxFQUFFLCtCQUErQixFQUFFO1lBQ3JGLE1BQU0sRUFBRSxNQUFNO1lBQ2QsSUFBSSxFQUFFLFFBQVE7U0FDZixDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxFQUFVO1FBQzFCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBbUIsY0FBYyxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQzNELENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLEVBQVUsRUFBRSxNQUFnQjtRQUM3QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQXdCLGNBQWMsRUFBRSxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUMzRyxDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxFQUFVLEVBQUUsS0FBcUI7UUFDcEQsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFtQixjQUFjLEVBQUUsU0FBUyxFQUFFO1lBQy9ELE1BQU0sRUFBRSxNQUFNO1lBQ2QsSUFBSSxFQUFFO2dCQUNKLHVCQUF1QixFQUFFLEtBQUssSUFBSSxTQUFTO2dCQUMzQyxtQkFBbUIsRUFBRSx5Q0FBeUM7YUFDL0Q7U0FDRixDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsS0FBSyxDQUFDLGVBQWUsQ0FBQyxFQUFVO1FBQzlCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBTyxjQUFjLEVBQUUsVUFBVSxFQUFFO1lBQ3BELE1BQU0sRUFBRSxLQUFLO1lBQ2IsWUFBWSxFQUFFLE1BQU07U0FDckIsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFVO1FBQy9CLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBYyxjQUFjLEVBQUUsV0FBVyxFQUFFLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUE7SUFDaEcsQ0FBQztJQUVPLEtBQUssQ0FBQyxPQUFPLENBQUksSUFBWSxFQUFFLFVBQStGLEVBQUU7UUFDdEksSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQUUsTUFBTSxJQUFJLGdCQUFnQixDQUFDLHFDQUFxQyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ3hGLE1BQU0sVUFBVSxHQUFHLElBQUksZUFBZSxFQUFFLENBQUE7UUFDeEMsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDcEUsSUFBSSxDQUFDO1lBQ0gsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksRUFBRSxFQUFFO2dCQUNwRCxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU0sSUFBSSxLQUFLO2dCQUMvQixPQUFPLEVBQUU7b0JBQ1AsV0FBVyxFQUFFLElBQUksQ0FBQyxNQUFNO29CQUN4QixNQUFNLEVBQUUsT0FBTyxDQUFDLFlBQVksS0FBSyxhQUFhLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxrQkFBa0I7b0JBQ3ZGLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLGNBQWMsRUFBRSxrQkFBa0IsRUFBRSxDQUFDO2lCQUM5RTtnQkFDRCxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUMzRSxNQUFNLEVBQUUsVUFBVSxDQUFDLE1BQU07YUFDMUIsQ0FBQyxDQUFBO1lBQ0YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztnQkFDakIsTUFBTSxPQUFPLEdBQUcsTUFBTSxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUE7Z0JBQ3pDLE1BQU0sSUFBSSxnQkFBZ0IsQ0FDeEIsWUFBWSxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQ3RDLFFBQVEsQ0FBQyxNQUFNLEVBQ2YsT0FBTyxFQUNQLEVBQUUsc0JBQXNCLEVBQUUsUUFBUSxDQUFDLE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FDbkQsQ0FBQTtZQUNILENBQUM7WUFDRCxJQUFJLE9BQU8sQ0FBQyxZQUFZLEtBQUssYUFBYTtnQkFBRSxPQUFPLE1BQU0sUUFBUSxDQUFDLFdBQVcsRUFBTyxDQUFBO1lBQ3BGLElBQUksT0FBTyxDQUFDLFlBQVksS0FBSyxNQUFNO2dCQUFFLE9BQU8sU0FBYyxDQUFBO1lBQzFELE9BQU8sTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFPLENBQUE7UUFDbkMsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixJQUFJLEtBQUssWUFBWSxnQkFBZ0I7Z0JBQUUsTUFBTSxLQUFLLENBQUE7WUFDbEQsSUFBSyxLQUEyQixFQUFFLElBQUksS0FBSyxZQUFZLEVBQUUsQ0FBQztnQkFDeEQsTUFBTSxJQUFJLGdCQUFnQixDQUN4QixrQ0FBa0MsRUFDbEMsR0FBRyxFQUNILFNBQVMsRUFDVCxFQUFFLHNCQUFzQixFQUFFLElBQUksRUFBRSxDQUNqQyxDQUFBO1lBQ0gsQ0FBQztZQUNELE1BQU0sSUFBSSxnQkFBZ0IsQ0FDeEIsaUNBQWlDLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUN6RixHQUFHLEVBQ0gsU0FBUyxFQUNULEVBQUUsc0JBQXNCLEVBQUUsSUFBSSxFQUFFLENBQ2pDLENBQUE7UUFDSCxDQUFDO2dCQUFTLENBQUM7WUFDVCxZQUFZLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDdkIsQ0FBQztJQUNILENBQUM7Q0FDRjtBQW5JRCx3Q0FtSUM7QUFFRCxLQUFLLFVBQVUsU0FBUyxDQUFDLFFBQWtCO0lBQ3pDLE1BQU0sSUFBSSxHQUFHLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2xDLElBQUksQ0FBQztRQUFDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQVksQ0FBQTtJQUFDLENBQUM7SUFBQyxNQUFNLENBQUM7UUFBQyxPQUFPLElBQUksQ0FBQTtJQUFDLENBQUM7QUFDbEUsQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLE9BQWdCLEVBQUUsTUFBYztJQUNwRCxJQUFJLE9BQU8sT0FBTyxLQUFLLFFBQVEsSUFBSSxPQUFPLENBQUMsSUFBSSxFQUFFO1FBQUUsT0FBTyxrQkFBa0IsTUFBTSxNQUFNLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFBO0lBQ3hHLElBQUksT0FBTyxJQUFJLE9BQU8sT0FBTyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzNDLE1BQU0sS0FBSyxHQUFHLE9BQWtDLENBQUE7UUFDaEQsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUMsS0FBSyxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUE7UUFDM0QsSUFBSSxPQUFPLE9BQU8sS0FBSyxRQUFRO1lBQUUsT0FBTyxrQkFBa0IsTUFBTSxNQUFNLE9BQU8sRUFBRSxDQUFBO1FBQy9FLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDO1lBQUUsT0FBTyxrQkFBa0IsTUFBTSxNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFBO0lBQzdHLENBQUM7SUFDRCxPQUFPLGtCQUFrQixNQUFNLElBQUksQ0FBQTtBQUNyQyxDQUFDO0FBRUQsU0FBZ0IsU0FBUyxDQUFDLElBQVksRUFBRSxRQUFnQjtJQUN0RCxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQ3ZDLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUE7QUFDbEQsQ0FBQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLElBQVk7SUFDN0MsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtJQUN2QyxPQUFPLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7QUFDNUQsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BillingoDocumentInput, BillingoOrder, BillingoPaymentMethod, BillingoTaxLine } from "./types";
|
|
1
|
+
import type { BillingoDocumentInput, BillingoOrder, BillingoPaymentMethod, BillingoLineItem, BillingoTaxLine } from "./types";
|
|
2
2
|
export declare function partnerFromOrder(order: BillingoOrder): {
|
|
3
3
|
tax_type?: string | undefined;
|
|
4
4
|
eu_tax_number?: string | undefined;
|
|
@@ -59,5 +59,8 @@ export declare function advanceFromOrder(order: BillingoOrder, partnerId: number
|
|
|
59
59
|
};
|
|
60
60
|
export declare function finalInvoiceFromAdvance(order: BillingoOrder, partnerId: number, advanceDocumentId: number, now?: Date): BillingoDocumentInput;
|
|
61
61
|
export declare function paymentMethod(value?: string): BillingoPaymentMethod;
|
|
62
|
+
/** Determine payment method from the selected checkout method, never a shop-wide default. */
|
|
62
63
|
export declare function paymentMethodForOrder(order: BillingoOrder): BillingoPaymentMethod;
|
|
64
|
+
/** Explicit order-line snapshot takes precedence; fall back to product metadata, then db. */
|
|
65
|
+
export declare function billingoUnit(item: BillingoLineItem): string;
|
|
63
66
|
export declare function vatFromMedusaTaxLines(taxLines: BillingoTaxLine[] | null | undefined, label?: string): string;
|