@hszrdm/core 1.7.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 +6832 -5418
- package/.medusa/server/src/admin/index.mjs +6834 -5420
- package/.medusa/server/src/api/admin/arukereso/marketplace-preview/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/arukereso/marketplace-preview/route.js +26 -0
- package/.medusa/server/src/api/admin/billingo/advance/route.d.ts +8 -0
- package/.medusa/server/src/api/admin/billingo/advance/route.js +55 -0
- package/.medusa/server/src/api/admin/billingo/partial-credit/route.d.ts +8 -0
- package/.medusa/server/src/api/admin/billingo/partial-credit/route.js +69 -0
- package/.medusa/server/src/api/admin/documents/[id]/route.d.ts +22 -0
- package/.medusa/server/src/api/admin/documents/[id]/route.js +107 -0
- package/.medusa/server/src/api/admin/documents/route.d.ts +21 -0
- package/.medusa/server/src/api/admin/documents/route.js +117 -0
- package/.medusa/server/src/api/admin/google-ads/diagnostics/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/google-ads/diagnostics/route.js +26 -0
- package/.medusa/server/src/api/admin/google-ads/oauth/start/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/google-ads/oauth/start/route.js +27 -0
- package/.medusa/server/src/api/admin/google-merchant/data-source/sync/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/google-merchant/data-source/sync/route.js +69 -0
- package/.medusa/server/src/api/admin/google-merchant/diagnostics/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/google-merchant/diagnostics/route.js +26 -0
- package/.medusa/server/src/api/admin/google-merchant/oauth/start/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/google-merchant/oauth/start/route.js +25 -0
- 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 +46 -8
- 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/mpl/close/route.d.ts +1 -1
- package/.medusa/server/src/api/admin/shipping/mpl/close/route.js +48 -70
- package/.medusa/server/src/api/admin/shipping/orders/route.js +19 -4
- package/.medusa/server/src/api/auth/google-ads/callback/route.d.ts +2 -0
- package/.medusa/server/src/api/auth/google-ads/callback/route.js +58 -0
- package/.medusa/server/src/api/feeds/arukereso-marketplace.xml/route.d.ts +2 -0
- package/.medusa/server/src/api/feeds/arukereso-marketplace.xml/route.js +33 -0
- package/.medusa/server/src/api/feeds/google-merchant.xml/route.js +5 -3
- package/.medusa/server/src/api/hooks/arukereso/marketplace/order/route.d.ts +2 -0
- package/.medusa/server/src/api/hooks/arukereso/marketplace/order/route.js +211 -0
- package/.medusa/server/src/api/hooks/simplepay/ipn/route.js +113 -23
- package/.medusa/server/src/api/store/account/orders/[id]/reorder/route.d.ts +2 -0
- package/.medusa/server/src/api/store/account/orders/[id]/reorder/route.js +113 -0
- package/.medusa/server/src/api/store/arukereso/backlink/route.d.ts +2 -0
- package/.medusa/server/src/api/store/arukereso/backlink/route.js +73 -0
- package/.medusa/server/src/api/store/arukereso/trusted-shop/[id]/route.d.ts +2 -0
- package/.medusa/server/src/api/store/arukereso/trusted-shop/[id]/route.js +84 -0
- package/.medusa/server/src/api/store/arukereso/widget/route.d.ts +2 -0
- package/.medusa/server/src/api/store/arukereso/widget/route.js +64 -0
- 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/api/store/documents/route.d.ts +2 -0
- package/.medusa/server/src/api/store/documents/route.js +84 -0
- package/.medusa/server/src/api/store/google-merchant/oauth/callback/route.d.ts +2 -0
- package/.medusa/server/src/api/store/google-merchant/oauth/callback/route.js +50 -0
- package/.medusa/server/src/config.d.ts +3 -3
- package/.medusa/server/src/config.js +70 -87
- package/.medusa/server/src/core/documents.d.ts +31 -0
- package/.medusa/server/src/core/documents.js +47 -0
- 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/arukereso/index.d.ts +1 -0
- package/.medusa/server/src/lib/modules/arukereso/index.js +2 -1
- package/.medusa/server/src/lib/modules/arukereso/marketplace-feed.d.ts +19 -0
- package/.medusa/server/src/lib/modules/arukereso/marketplace-feed.js +100 -0
- package/.medusa/server/src/lib/modules/billingo/actions.js +42 -12
- package/.medusa/server/src/lib/modules/billingo/advance.d.ts +68 -0
- package/.medusa/server/src/lib/modules/billingo/advance.js +309 -0
- package/.medusa/server/src/lib/modules/billingo/automation.js +49 -9
- package/.medusa/server/src/lib/modules/billingo/client.d.ts +5 -2
- package/.medusa/server/src/lib/modules/billingo/client.js +17 -8
- package/.medusa/server/src/lib/modules/billingo/index.d.ts +2 -0
- package/.medusa/server/src/lib/modules/billingo/index.js +3 -1
- package/.medusa/server/src/lib/modules/billingo/mapper.d.ts +42 -2
- package/.medusa/server/src/lib/modules/billingo/mapper.js +77 -4
- package/.medusa/server/src/lib/modules/billingo/partial-credit.d.ts +55 -0
- package/.medusa/server/src/lib/modules/billingo/partial-credit.js +338 -0
- package/.medusa/server/src/lib/modules/billingo/types.d.ts +21 -2
- package/.medusa/server/src/lib/modules/google-ads/adjustments.d.ts +21 -0
- package/.medusa/server/src/lib/modules/google-ads/adjustments.js +146 -0
- package/.medusa/server/src/lib/modules/google-ads/api.d.ts +23 -0
- package/.medusa/server/src/lib/modules/google-ads/api.js +171 -0
- package/.medusa/server/src/lib/modules/google-ads/diagnostics.d.ts +47 -0
- package/.medusa/server/src/lib/modules/google-ads/diagnostics.js +164 -0
- package/.medusa/server/src/lib/modules/google-merchant/category-fields.d.ts +7 -0
- package/.medusa/server/src/lib/modules/google-merchant/category-fields.js +210 -0
- package/.medusa/server/src/lib/modules/google-merchant/data-source.d.ts +17 -0
- package/.medusa/server/src/lib/modules/google-merchant/data-source.js +132 -0
- package/.medusa/server/src/lib/modules/google-merchant/diagnostics.d.ts +33 -0
- package/.medusa/server/src/lib/modules/google-merchant/diagnostics.js +113 -0
- package/.medusa/server/src/lib/modules/google-merchant/index.d.ts +5 -0
- package/.medusa/server/src/lib/modules/google-merchant/index.js +6 -1
- package/.medusa/server/src/lib/modules/google-merchant/merchant-api.d.ts +18 -0
- package/.medusa/server/src/lib/modules/google-merchant/merchant-api.js +120 -0
- package/.medusa/server/src/lib/modules/google-merchant/shipping.d.ts +13 -0
- package/.medusa/server/src/lib/modules/google-merchant/shipping.js +97 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/api.d.ts +1 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/api.js +3 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/index.d.ts +1 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/index.js +3 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/sync.d.ts +1 -0
- package/.medusa/server/src/lib/modules/google-tag-manager/sync.js +3 -0
- package/.medusa/server/src/lib/modules/shipping/actions.d.ts +2 -2
- package/.medusa/server/src/lib/modules/shipping/actions.js +171 -352
- package/.medusa/server/src/lib/modules/shipping/durable-create.d.ts +2 -1
- package/.medusa/server/src/lib/modules/shipping/durable-create.js +33 -5
- package/.medusa/server/src/lib/modules/shipping/idempotency.js +4 -2
- 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/lib/modules/shipping/types.d.ts +1 -1
- package/.medusa/server/src/modules/core-documents/index.d.ts +38 -0
- package/.medusa/server/src/modules/core-documents/index.js +18 -0
- package/.medusa/server/src/modules/core-documents/migrations/Migration20261102190000.d.ts +5 -0
- package/.medusa/server/src/modules/core-documents/migrations/Migration20261102190000.js +22 -0
- package/.medusa/server/src/modules/core-documents/models/core-document-assignment.d.ts +9 -0
- package/.medusa/server/src/modules/core-documents/models/core-document-assignment.js +18 -0
- package/.medusa/server/src/modules/core-documents/models/core-document.d.ts +18 -0
- package/.medusa/server/src/modules/core-documents/models/core-document.js +27 -0
- package/.medusa/server/src/modules/core-documents/service.d.ts +38 -0
- package/.medusa/server/src/modules/core-documents/service.js +13 -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-operation/state.d.ts +1 -0
- package/.medusa/server/src/modules/integration-operation/state.js +11 -50
- package/.medusa/server/src/modules/integration-operation/types.d.ts +1 -1
- package/.medusa/server/src/modules/integration-settings/arukereso-registration.js +19 -2
- package/.medusa/server/src/modules/integration-settings/connection-test.js +20 -4
- package/.medusa/server/src/modules/integration-settings/csomagpiac-definition.d.ts +2 -0
- package/.medusa/server/src/modules/integration-settings/csomagpiac-definition.js +49 -0
- package/.medusa/server/src/modules/integration-settings/csomagpiac-registration.d.ts +1 -0
- package/.medusa/server/src/modules/integration-settings/csomagpiac-registration.js +35 -0
- package/.medusa/server/src/modules/integration-settings/google-merchant-registration.js +23 -2
- package/.medusa/server/src/modules/integration-settings/hot-reload-registration.d.ts +1 -0
- package/.medusa/server/src/modules/integration-settings/hot-reload-registration.js +23 -0
- package/.medusa/server/src/modules/integration-settings/index.d.ts +4 -0
- package/.medusa/server/src/modules/integration-settings/index.js +5 -1
- package/.medusa/server/src/modules/integration-settings/manager.js +38 -4
- package/.medusa/server/src/modules/integration-settings/registry.js +1 -14
- package/.medusa/server/src/modules/integration-settings/reloadable.d.ts +10 -0
- package/.medusa/server/src/modules/integration-settings/reloadable.js +58 -0
- package/.medusa/server/src/modules/integration-settings/runtime-snapshot.d.ts +9 -0
- package/.medusa/server/src/modules/integration-settings/runtime-snapshot.js +48 -3
- package/.medusa/server/src/modules/integration-settings/simplepay-registration.d.ts +1 -0
- package/.medusa/server/src/modules/integration-settings/simplepay-registration.js +18 -0
- package/.medusa/server/src/modules/integration-settings/storefront-public-registration.js +15 -5
- package/.medusa/server/src/providers/csomagpiac/client.d.ts +25 -0
- package/.medusa/server/src/providers/csomagpiac/client.js +144 -0
- package/.medusa/server/src/providers/csomagpiac/fulfillment-provider.d.ts +50 -0
- package/.medusa/server/src/providers/csomagpiac/fulfillment-provider.js +248 -0
- package/.medusa/server/src/providers/csomagpiac/index.d.ts +7 -0
- package/.medusa/server/src/providers/csomagpiac/index.js +30 -0
- package/.medusa/server/src/providers/csomagpiac/service.d.ts +60 -0
- package/.medusa/server/src/providers/csomagpiac/service.js +296 -0
- package/.medusa/server/src/providers/csomagpiac/types.d.ts +66 -0
- package/.medusa/server/src/providers/csomagpiac/types.js +27 -0
- package/.medusa/server/src/providers/dpd/fulfillment-provider.d.ts +5 -1
- package/.medusa/server/src/providers/dpd/fulfillment-provider.js +94 -27
- package/.medusa/server/src/providers/dpd/service.d.ts +2 -0
- package/.medusa/server/src/providers/dpd/service.js +32 -4
- 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/email/service.d.ts +7 -6
- package/.medusa/server/src/providers/email/service.js +51 -25
- package/.medusa/server/src/providers/foxpost/foxpost-service.d.ts +3 -1
- package/.medusa/server/src/providers/foxpost/foxpost-service.js +19 -17
- package/.medusa/server/src/providers/foxpost/fulfillment-provider.d.ts +10 -3
- package/.medusa/server/src/providers/foxpost/fulfillment-provider.js +99 -69
- package/.medusa/server/src/providers/foxpost/types.d.ts +1 -0
- package/.medusa/server/src/providers/gls/fulfillment-provider.d.ts +4 -0
- package/.medusa/server/src/providers/gls/fulfillment-provider.js +87 -17
- package/.medusa/server/src/providers/gls/gls-service.d.ts +19 -1
- package/.medusa/server/src/providers/gls/gls-service.js +32 -64
- package/.medusa/server/src/providers/gls/types.d.ts +16 -0
- package/.medusa/server/src/providers/mpl/fulfillment-provider.d.ts +4 -0
- package/.medusa/server/src/providers/mpl/fulfillment-provider.js +67 -176
- package/.medusa/server/src/providers/mpl/index.d.ts +2 -0
- package/.medusa/server/src/providers/mpl/index.js +7 -2
- package/.medusa/server/src/providers/mpl/service.d.ts +37 -1
- package/.medusa/server/src/providers/mpl/service.js +113 -366
- package/.medusa/server/src/providers/mpl/types.d.ts +19 -0
- package/.medusa/server/src/providers/mpl/types.js +1 -1
- package/.medusa/server/src/providers/packeta/client.d.ts +2 -1
- package/.medusa/server/src/providers/packeta/client.js +24 -2
- package/.medusa/server/src/providers/packeta/fulfillment-provider.d.ts +4 -0
- package/.medusa/server/src/providers/packeta/fulfillment-provider.js +84 -9
- 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.d.ts +1 -0
- package/.medusa/server/src/providers/packeta/service.js +91 -23
- package/.medusa/server/src/providers/packeta/types.d.ts +27 -0
- package/.medusa/server/src/providers/packeta/types.js +1 -1
- package/.medusa/server/src/providers/resilient-stripe/index.d.ts +19 -1
- package/.medusa/server/src/providers/resilient-stripe/index.js +59 -12
- package/.medusa/server/src/providers/simplepay/config.js +11 -1
- package/.medusa/server/src/providers/simplepay/index.d.ts +2 -0
- package/.medusa/server/src/providers/simplepay/index.js +5 -3
- package/.medusa/server/src/providers/simplepay/runtime-service.d.ts +13 -0
- package/.medusa/server/src/providers/simplepay/runtime-service.js +55 -0
- package/.medusa/server/src/providers/simplepay/service.d.ts +2 -0
- package/.medusa/server/src/providers/simplepay/service.js +40 -5
- package/.medusa/server/src/scripts/verify-runtime-modules.d.ts +7 -0
- package/.medusa/server/src/scripts/verify-runtime-modules.js +46 -0
- package/.medusa/server/src/subscribers/google-ads-order-canceled.d.ts +7 -0
- package/.medusa/server/src/subscribers/google-ads-order-canceled.js +50 -0
- package/.medusa/server/src/subscribers/google-ads-payment-refunded.d.ts +7 -0
- package/.medusa/server/src/subscribers/google-ads-payment-refunded.js +181 -0
- package/.medusa/server/src/subscribers/simplepay-paid-order-recovery.js +14 -1
- package/package.json +23 -18
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.csomagpiacService = exports.CsomagpiacService = exports.CSOMAGPIAC_TEST_URL = exports.CSOMAGPIAC_LIVE_URL = void 0;
|
|
4
|
+
exports.loadCsomagpiacConfig = loadCsomagpiacConfig;
|
|
5
|
+
exports.rejectUnsupportedCsomagpiacRecipientPoint = rejectUnsupportedCsomagpiacRecipientPoint;
|
|
6
|
+
const client_1 = require("./client");
|
|
7
|
+
const reloadable_1 = require("../../modules/integration-settings/reloadable");
|
|
8
|
+
const types_1 = require("./types");
|
|
9
|
+
exports.CSOMAGPIAC_LIVE_URL = "https://bestr.csomagpiac.hu/api/v1/";
|
|
10
|
+
exports.CSOMAGPIAC_TEST_URL = "https://demo.csomagpiac.hu/api/v1/";
|
|
11
|
+
function loadCsomagpiacConfig(env = process.env) {
|
|
12
|
+
const live = env.CSOMAGPIAC_LIVE === "true";
|
|
13
|
+
return {
|
|
14
|
+
apiUrl: env.CSOMAGPIAC_API_URL?.trim() ||
|
|
15
|
+
(live ? exports.CSOMAGPIAC_LIVE_URL : exports.CSOMAGPIAC_TEST_URL),
|
|
16
|
+
token: clean(env.CSOMAGPIAC_TOKEN),
|
|
17
|
+
username: clean(env.CSOMAGPIAC_USERNAME),
|
|
18
|
+
password: clean(env.CSOMAGPIAC_PASSWORD),
|
|
19
|
+
live,
|
|
20
|
+
pickupPointId: positiveInteger(env.CSOMAGPIAC_PICKUP_POINT_ID),
|
|
21
|
+
priceHuf: positiveNumber(env.CSOMAGPIAC_PRICE_HUF) ?? 1990,
|
|
22
|
+
freeShippingThresholdHuf: positiveNumber(env.CSOMAGPIAC_FREE_SHIPPING_THRESHOLD_HUF),
|
|
23
|
+
timeoutMs: positiveNumber(env.CSOMAGPIAC_TIMEOUT_MS) ?? 15000,
|
|
24
|
+
defaultWeightKg: positiveNumber(env.CSOMAGPIAC_DEFAULT_WEIGHT_KG) ?? 1,
|
|
25
|
+
labelFormat: env.CSOMAGPIAC_LABEL_FORMAT === "A6" ? "A6" : "A4",
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Csomagpiac pickupPointId is the SENDER's registered collection address.
|
|
30
|
+
* Recipient locker/parcel-shop IDs are NOT interchangeable with this value.
|
|
31
|
+
* Until the recipient-location field is verified from API v1 documentation,
|
|
32
|
+
* fail closed instead of silently producing home-delivery labels.
|
|
33
|
+
*/
|
|
34
|
+
function rejectUnsupportedCsomagpiacRecipientPoint(selection) {
|
|
35
|
+
const fields = ["deliveryPointId", "delivery_point_id", "recipientPointId", "recipient_point_id", "pickupPoint", "deliveryPoint", "recipientPoint", "locker", "parcelShop"];
|
|
36
|
+
if (fields.some((field) => selection[field] !== undefined && selection[field] !== null)) {
|
|
37
|
+
throw new types_1.CsomagpiacValidationError("A Csomagpiac címzetti csomagpontja még nincs igazoltan támogatva. " +
|
|
38
|
+
"A pickupPointId kizárólag a feladó felvételi címe. " +
|
|
39
|
+
"Csomagpontra címzéshez hitelesített API-mezőleképezés szükséges.");
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
class CsomagpiacService {
|
|
43
|
+
constructor(fallbackConfig) {
|
|
44
|
+
this.fallbackConfig = fallbackConfig;
|
|
45
|
+
this.runtimeClient = (0, reloadable_1.createReloadableIntegrationService)(() => new client_1.CsomagpiacClient(this.config));
|
|
46
|
+
}
|
|
47
|
+
get config() {
|
|
48
|
+
const runtime = loadCsomagpiacConfig();
|
|
49
|
+
const fallback = this.fallbackConfig;
|
|
50
|
+
if (!fallback)
|
|
51
|
+
return runtime;
|
|
52
|
+
const has = (name) => Object.prototype.hasOwnProperty.call(process.env, name);
|
|
53
|
+
return {
|
|
54
|
+
...fallback,
|
|
55
|
+
...runtime,
|
|
56
|
+
apiUrl: has("CSOMAGPIAC_API_URL") ? runtime.apiUrl : fallback.apiUrl || runtime.apiUrl,
|
|
57
|
+
token: has("CSOMAGPIAC_TOKEN") ? clean(process.env.CSOMAGPIAC_TOKEN) : fallback.token,
|
|
58
|
+
username: has("CSOMAGPIAC_USERNAME") ? clean(process.env.CSOMAGPIAC_USERNAME) : fallback.username,
|
|
59
|
+
password: has("CSOMAGPIAC_PASSWORD") ? clean(process.env.CSOMAGPIAC_PASSWORD) : fallback.password,
|
|
60
|
+
live: has("CSOMAGPIAC_LIVE") ? process.env.CSOMAGPIAC_LIVE === "true" : fallback.live,
|
|
61
|
+
pickupPointId: has("CSOMAGPIAC_PICKUP_POINT_ID") ? runtime.pickupPointId : fallback.pickupPointId,
|
|
62
|
+
priceHuf: has("CSOMAGPIAC_PRICE_HUF") ? runtime.priceHuf : fallback.priceHuf,
|
|
63
|
+
freeShippingThresholdHuf: has("CSOMAGPIAC_FREE_SHIPPING_THRESHOLD_HUF")
|
|
64
|
+
? runtime.freeShippingThresholdHuf
|
|
65
|
+
: fallback.freeShippingThresholdHuf,
|
|
66
|
+
timeoutMs: has("CSOMAGPIAC_TIMEOUT_MS") ? runtime.timeoutMs : fallback.timeoutMs,
|
|
67
|
+
defaultWeightKg: has("CSOMAGPIAC_DEFAULT_WEIGHT_KG") ? runtime.defaultWeightKg : fallback.defaultWeightKg,
|
|
68
|
+
labelFormat: has("CSOMAGPIAC_LABEL_FORMAT") ? runtime.labelFormat : fallback.labelFormat,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
get client() {
|
|
72
|
+
return this.runtimeClient;
|
|
73
|
+
}
|
|
74
|
+
extractShipment(order) {
|
|
75
|
+
const raw = order.metadata?.csomagpiac;
|
|
76
|
+
return raw && typeof raw === "object" ? raw : null;
|
|
77
|
+
}
|
|
78
|
+
async validateSenderPickupPoint(id) {
|
|
79
|
+
if (!Number.isSafeInteger(id) || id <= 0) {
|
|
80
|
+
throw new types_1.CsomagpiacValidationError("Érvénytelen Csomagpiac feladói felvételipont-azonosító.");
|
|
81
|
+
}
|
|
82
|
+
// The authenticated endpoint returns merchant-owned sender collection addresses.
|
|
83
|
+
const data = await this.client.listPickupPoints();
|
|
84
|
+
const root = asRecord(data);
|
|
85
|
+
const nested = asRecord(root.data);
|
|
86
|
+
const points = Array.isArray(data) ? data :
|
|
87
|
+
[root.pickupPoints, root.pickuppoints, root.data, root.items, nested.pickupPoints, nested.items]
|
|
88
|
+
.find(Array.isArray);
|
|
89
|
+
if (!points || !points.length) {
|
|
90
|
+
throw new types_1.CsomagpiacValidationError("A Csomagpiac feladói címek nem ellenőrizhetők.");
|
|
91
|
+
}
|
|
92
|
+
const exists = points.some(point => {
|
|
93
|
+
const value = asRecord(point);
|
|
94
|
+
const attributes = asRecord(value.attributes);
|
|
95
|
+
const identifier = positiveInteger(value.id ?? value.pickupPointId ?? value.pickup_point_id ??
|
|
96
|
+
attributes.id ?? attributes.pickupPointId);
|
|
97
|
+
return identifier === id;
|
|
98
|
+
});
|
|
99
|
+
if (!exists) {
|
|
100
|
+
throw new types_1.CsomagpiacValidationError("A Csomagpiac felvételi cím nem szerepel a hitelesített fiók címjegyzékében.");
|
|
101
|
+
}
|
|
102
|
+
return id;
|
|
103
|
+
}
|
|
104
|
+
async validateServices(services) {
|
|
105
|
+
if (!services.length)
|
|
106
|
+
return;
|
|
107
|
+
const data = await this.client.listServices();
|
|
108
|
+
const root = asRecord(data);
|
|
109
|
+
const nested = asRecord(root.data);
|
|
110
|
+
const allowed = Array.isArray(data) ? data :
|
|
111
|
+
[root.services, root.data, root.items, nested.services, nested.items]
|
|
112
|
+
.find(Array.isArray);
|
|
113
|
+
if (!allowed || !allowed.length) {
|
|
114
|
+
throw new types_1.CsomagpiacValidationError("A Csomagpiac engedélyezett szolgáltatásai nem ellenőrizhetők.");
|
|
115
|
+
}
|
|
116
|
+
for (const requested of services) {
|
|
117
|
+
const accepted = allowed.some(item => {
|
|
118
|
+
const row = asRecord(item), attrs = asRecord(row.attributes);
|
|
119
|
+
const name = String(row.name ?? attrs.name ?? "").trim();
|
|
120
|
+
const value = String(row.value ?? attrs.value ?? "").trim();
|
|
121
|
+
return name === requested.name && value === requested.value;
|
|
122
|
+
});
|
|
123
|
+
if (!accepted) {
|
|
124
|
+
throw new types_1.CsomagpiacValidationError("A kért Csomagpiac szolgáltatás nem engedélyezett ennél a fióknál.");
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
async createShipment(order) {
|
|
129
|
+
const client = this.client;
|
|
130
|
+
if (!client.isConfigured())
|
|
131
|
+
throw new types_1.CsomagpiacConfigError();
|
|
132
|
+
const config = this.config;
|
|
133
|
+
const current = this.extractShipment(order);
|
|
134
|
+
if (!current)
|
|
135
|
+
throw new types_1.CsomagpiacValidationError("A rendelés nem Csomagpiac szállítású.");
|
|
136
|
+
// Never interpret a recipient's locker ID as the sender collection-address ID.
|
|
137
|
+
const selection = asRecord(asRecord(order.metadata).csomagpiac);
|
|
138
|
+
rejectUnsupportedCsomagpiacRecipientPoint(selection);
|
|
139
|
+
if (current.identifier && String(current.status).toUpperCase() !== "CANCELLED")
|
|
140
|
+
return current;
|
|
141
|
+
const address = asRecord(order.shipping_address);
|
|
142
|
+
const pickupPointId = positiveInteger(current.pickupPointId) ?? config.pickupPointId;
|
|
143
|
+
if (!pickupPointId)
|
|
144
|
+
throw new types_1.CsomagpiacValidationError("Hiányzik a Csomagpiac felvételi cím azonosítója.");
|
|
145
|
+
await this.validateSenderPickupPoint(pickupPointId);
|
|
146
|
+
await this.validateServices(current.services ?? []);
|
|
147
|
+
const recipientName = [address.first_name, address.last_name]
|
|
148
|
+
.map((value) => String(value ?? "").trim())
|
|
149
|
+
.filter(Boolean)
|
|
150
|
+
.join(" ");
|
|
151
|
+
const recipientEmail = String(order.email ?? "").trim();
|
|
152
|
+
const recipientPhone = String(address.phone ?? "").trim();
|
|
153
|
+
const recipientZip = String(address.postal_code ?? "").trim();
|
|
154
|
+
const recipientCity = String(address.city ?? "").trim();
|
|
155
|
+
const recipientAddress = [address.address_1, address.address_2]
|
|
156
|
+
.map((value) => String(value ?? "").trim())
|
|
157
|
+
.filter(Boolean)
|
|
158
|
+
.join(" ");
|
|
159
|
+
const recipientCountryCode = String(address.country_code ?? "HU").trim().toUpperCase();
|
|
160
|
+
for (const [label, value] of [
|
|
161
|
+
["címzett neve", recipientName],
|
|
162
|
+
["címzett e-mail-címe", recipientEmail],
|
|
163
|
+
["címzett telefonszáma", recipientPhone],
|
|
164
|
+
["irányítószám", recipientZip],
|
|
165
|
+
["város", recipientCity],
|
|
166
|
+
["cím", recipientAddress],
|
|
167
|
+
]) {
|
|
168
|
+
if (!value)
|
|
169
|
+
throw new types_1.CsomagpiacValidationError(`Hiányzik a Csomagpiac küldemény ${label} mezője.`);
|
|
170
|
+
}
|
|
171
|
+
const weightKg = positiveNumber(current.weightKg) ?? config.defaultWeightKg;
|
|
172
|
+
const orderTotal = nonNegativeNumber(order.total);
|
|
173
|
+
const payload = {
|
|
174
|
+
pickupPointId,
|
|
175
|
+
recipientName: recipientName.slice(0, 40),
|
|
176
|
+
recipientCountryCode: recipientCountryCode.slice(0, 3),
|
|
177
|
+
recipientZip: recipientZip.slice(0, 10),
|
|
178
|
+
recipientCity: recipientCity.slice(0, 40),
|
|
179
|
+
recipientAddress: recipientAddress.slice(0, 40),
|
|
180
|
+
recipientPhone: recipientPhone.slice(0, 20),
|
|
181
|
+
recipientEmail: recipientEmail.slice(0, 100),
|
|
182
|
+
packageCount: 1,
|
|
183
|
+
weights: [Math.max(1, Math.round(weightKg * 1000))],
|
|
184
|
+
weightUnit: "g",
|
|
185
|
+
reference: String(order.display_id ?? order.id ?? "").slice(0, 100),
|
|
186
|
+
...(orderTotal == null ? {} : { parcelValue: Math.round(orderTotal) }),
|
|
187
|
+
...(current.codAmount > 0 ? { cashOnDelivery: Math.round(current.codAmount) } : {}),
|
|
188
|
+
...(current.insuredValue == null ? {} : { insuredValue: Math.round(current.insuredValue) }),
|
|
189
|
+
...(current.services?.length ? { services: current.services } : {}),
|
|
190
|
+
};
|
|
191
|
+
const response = asRecord(await client.createShipment(payload));
|
|
192
|
+
const identifier = remoteIdentifier(response);
|
|
193
|
+
if (!identifier) {
|
|
194
|
+
throw new types_1.CsomagpiacError("A Csomagpiac sikeresnek tűnő válasza nem tartalmazott küldeményazonosítót.", { remoteOutcomeUncertain: true });
|
|
195
|
+
}
|
|
196
|
+
return {
|
|
197
|
+
...current,
|
|
198
|
+
pickupPointId,
|
|
199
|
+
weightKg,
|
|
200
|
+
identifier,
|
|
201
|
+
trackingNumber: remoteTrackingNumber(response) ?? identifier,
|
|
202
|
+
status: normalizeStatus(response) ?? "CREATED",
|
|
203
|
+
statusText: remoteStatusText(response),
|
|
204
|
+
statusUpdatedAt: new Date().toISOString(),
|
|
205
|
+
createdAt: new Date().toISOString(),
|
|
206
|
+
remote: response,
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
async refreshStatus(shipment) {
|
|
210
|
+
if (!shipment.identifier)
|
|
211
|
+
throw new types_1.CsomagpiacValidationError("Hiányzik a Csomagpiac küldeményazonosító.");
|
|
212
|
+
const response = asRecord(await this.client.getShipmentStatus(shipment.identifier));
|
|
213
|
+
return {
|
|
214
|
+
...shipment,
|
|
215
|
+
status: normalizeStatus(response) ?? shipment.status,
|
|
216
|
+
statusText: remoteStatusText(response) ?? shipment.statusText,
|
|
217
|
+
trackingNumber: remoteTrackingNumber(response) ?? shipment.trackingNumber,
|
|
218
|
+
statusUpdatedAt: new Date().toISOString(),
|
|
219
|
+
remote: response,
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
async cancelShipment(shipment) {
|
|
223
|
+
if (!shipment.identifier || String(shipment.status).toUpperCase() === "CANCELLED")
|
|
224
|
+
return shipment;
|
|
225
|
+
await this.client.deleteShipment(shipment.identifier);
|
|
226
|
+
return {
|
|
227
|
+
...shipment,
|
|
228
|
+
status: "CANCELLED",
|
|
229
|
+
statusText: "Törölve",
|
|
230
|
+
statusUpdatedAt: new Date().toISOString(),
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
async getLabel(shipment, format) {
|
|
234
|
+
if (!shipment.identifier)
|
|
235
|
+
throw new types_1.CsomagpiacValidationError("Hiányzik a Csomagpiac küldeményazonosító.");
|
|
236
|
+
return this.client.downloadShipmentLabel(shipment.identifier, format ?? this.config.labelFormat);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
exports.CsomagpiacService = CsomagpiacService;
|
|
240
|
+
exports.csomagpiacService = new CsomagpiacService();
|
|
241
|
+
function remoteIdentifier(response) {
|
|
242
|
+
const data = asRecord(response.data);
|
|
243
|
+
return firstString(response.identifier, response.cspIdentifier, response.shipmentIdentifier, response.id, data.identifier, data.cspIdentifier, data.shipmentIdentifier, data.id);
|
|
244
|
+
}
|
|
245
|
+
function remoteTrackingNumber(response) {
|
|
246
|
+
const data = asRecord(response.data);
|
|
247
|
+
return firstString(response.trackingNumber, response.tracking_number, response.parcelNumber, response.parcel_number, data.trackingNumber, data.tracking_number, data.parcelNumber, data.parcel_number);
|
|
248
|
+
}
|
|
249
|
+
function remoteStatusText(response) {
|
|
250
|
+
const data = asRecord(response.data);
|
|
251
|
+
return firstString(response.statusName, response.statusText, response.status, data.statusName, data.statusText, data.status);
|
|
252
|
+
}
|
|
253
|
+
function normalizeStatus(response) {
|
|
254
|
+
const raw = (remoteStatusText(response) ?? "").toLocaleLowerCase("hu-HU");
|
|
255
|
+
if (!raw)
|
|
256
|
+
return undefined;
|
|
257
|
+
if (raw.includes("kézbes") || raw.includes("deliver"))
|
|
258
|
+
return "DELIVERED";
|
|
259
|
+
if (raw.includes("vissza") || raw.includes("return"))
|
|
260
|
+
return "RETURNED";
|
|
261
|
+
if (raw.includes("töröl") || raw.includes("cancel"))
|
|
262
|
+
return "CANCELLED";
|
|
263
|
+
if (raw.includes("hiba") || raw.includes("error") || raw.includes("sikertelen"))
|
|
264
|
+
return "ERROR";
|
|
265
|
+
if (raw.includes("száll") || raw.includes("úton") || raw.includes("transit") || raw.includes("futár"))
|
|
266
|
+
return "IN_TRANSIT";
|
|
267
|
+
return "CREATED";
|
|
268
|
+
}
|
|
269
|
+
function asRecord(value) {
|
|
270
|
+
return value && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
271
|
+
}
|
|
272
|
+
function clean(value) {
|
|
273
|
+
const text = String(value ?? "").trim();
|
|
274
|
+
return text || undefined;
|
|
275
|
+
}
|
|
276
|
+
function firstString(...values) {
|
|
277
|
+
for (const value of values) {
|
|
278
|
+
const text = clean(value);
|
|
279
|
+
if (text)
|
|
280
|
+
return text;
|
|
281
|
+
}
|
|
282
|
+
return undefined;
|
|
283
|
+
}
|
|
284
|
+
function positiveInteger(value) {
|
|
285
|
+
const number = Number(value);
|
|
286
|
+
return Number.isInteger(number) && number > 0 ? number : undefined;
|
|
287
|
+
}
|
|
288
|
+
function positiveNumber(value) {
|
|
289
|
+
const number = Number(value);
|
|
290
|
+
return Number.isFinite(number) && number > 0 ? number : undefined;
|
|
291
|
+
}
|
|
292
|
+
function nonNegativeNumber(value) {
|
|
293
|
+
const number = Number(value);
|
|
294
|
+
return Number.isFinite(number) && number >= 0 ? number : undefined;
|
|
295
|
+
}
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/providers/csomagpiac/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
export type CsomagpiacConfig = {
|
|
2
|
+
apiUrl: string;
|
|
3
|
+
token?: string;
|
|
4
|
+
username?: string;
|
|
5
|
+
password?: string;
|
|
6
|
+
live: boolean;
|
|
7
|
+
pickupPointId?: number;
|
|
8
|
+
priceHuf: number;
|
|
9
|
+
freeShippingThresholdHuf?: number;
|
|
10
|
+
timeoutMs: number;
|
|
11
|
+
defaultWeightKg: number;
|
|
12
|
+
labelFormat: "A4" | "A6";
|
|
13
|
+
};
|
|
14
|
+
export type CsomagpiacShipmentStatus = "CREATED" | "IN_TRANSIT" | "DELIVERED" | "RETURNED" | "CANCELLED" | "ERROR";
|
|
15
|
+
export type CsomagpiacServiceSelection = {
|
|
16
|
+
name: string;
|
|
17
|
+
value: string;
|
|
18
|
+
};
|
|
19
|
+
export type CsomagpiacShipmentData = {
|
|
20
|
+
recipientEmail?: string | null;
|
|
21
|
+
pickupPointId: number;
|
|
22
|
+
weightKg: number;
|
|
23
|
+
services?: CsomagpiacServiceSelection[];
|
|
24
|
+
codAmount: number;
|
|
25
|
+
insuredValue?: number;
|
|
26
|
+
identifier?: string;
|
|
27
|
+
trackingNumber?: string;
|
|
28
|
+
status: CsomagpiacShipmentStatus | string;
|
|
29
|
+
statusText?: string;
|
|
30
|
+
statusUpdatedAt?: string;
|
|
31
|
+
createdAt?: string;
|
|
32
|
+
remote?: Record<string, unknown>;
|
|
33
|
+
};
|
|
34
|
+
export type CsomagpiacCreateRequest = {
|
|
35
|
+
pickupPointId: number;
|
|
36
|
+
recipientName: string;
|
|
37
|
+
recipientCountryCode: string;
|
|
38
|
+
recipientZip: string;
|
|
39
|
+
recipientCity: string;
|
|
40
|
+
recipientAddress: string;
|
|
41
|
+
recipientPhone: string;
|
|
42
|
+
recipientEmail: string;
|
|
43
|
+
packageCount?: number;
|
|
44
|
+
weights?: number[];
|
|
45
|
+
weightUnit?: "g" | "dkg" | "kg";
|
|
46
|
+
insuredValue?: number;
|
|
47
|
+
observation?: string;
|
|
48
|
+
reference?: string;
|
|
49
|
+
parcelValue?: number;
|
|
50
|
+
cashOnDelivery?: number;
|
|
51
|
+
services?: CsomagpiacServiceSelection[];
|
|
52
|
+
};
|
|
53
|
+
export declare class CsomagpiacError extends Error {
|
|
54
|
+
status?: number;
|
|
55
|
+
remoteOutcomeUncertain?: boolean;
|
|
56
|
+
constructor(message: string, options?: {
|
|
57
|
+
status?: number;
|
|
58
|
+
remoteOutcomeUncertain?: boolean;
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
export declare class CsomagpiacConfigError extends CsomagpiacError {
|
|
62
|
+
constructor(message?: string);
|
|
63
|
+
}
|
|
64
|
+
export declare class CsomagpiacValidationError extends CsomagpiacError {
|
|
65
|
+
constructor(message: string);
|
|
66
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CsomagpiacValidationError = exports.CsomagpiacConfigError = exports.CsomagpiacError = void 0;
|
|
4
|
+
class CsomagpiacError extends Error {
|
|
5
|
+
constructor(message, options = {}) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.name = "CsomagpiacError";
|
|
8
|
+
this.status = options.status;
|
|
9
|
+
this.remoteOutcomeUncertain = options.remoteOutcomeUncertain;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.CsomagpiacError = CsomagpiacError;
|
|
13
|
+
class CsomagpiacConfigError extends CsomagpiacError {
|
|
14
|
+
constructor(message = "A Csomagpiac API nincs megfelelően konfigurálva.") {
|
|
15
|
+
super(message);
|
|
16
|
+
this.name = "CsomagpiacConfigError";
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
exports.CsomagpiacConfigError = CsomagpiacConfigError;
|
|
20
|
+
class CsomagpiacValidationError extends CsomagpiacError {
|
|
21
|
+
constructor(message) {
|
|
22
|
+
super(message);
|
|
23
|
+
this.name = "CsomagpiacValidationError";
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.CsomagpiacValidationError = CsomagpiacValidationError;
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcHJvdmlkZXJzL2Nzb21hZ3BpYWMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBK0RBLE1BQWEsZUFBZ0IsU0FBUSxLQUFLO0lBSXhDLFlBQVksT0FBZSxFQUFFLFVBQWlFLEVBQUU7UUFDOUYsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2QsSUFBSSxDQUFDLElBQUksR0FBRyxpQkFBaUIsQ0FBQTtRQUM3QixJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUE7UUFDNUIsSUFBSSxDQUFDLHNCQUFzQixHQUFHLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQTtJQUM5RCxDQUFDO0NBQ0Y7QUFWRCwwQ0FVQztBQUVELE1BQWEscUJBQXNCLFNBQVEsZUFBZTtJQUN4RCxZQUFZLE9BQU8sR0FBRyxrREFBa0Q7UUFDdEUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2QsSUFBSSxDQUFDLElBQUksR0FBRyx1QkFBdUIsQ0FBQTtJQUNyQyxDQUFDO0NBQ0Y7QUFMRCxzREFLQztBQUVELE1BQWEseUJBQTBCLFNBQVEsZUFBZTtJQUM1RCxZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ2QsSUFBSSxDQUFDLElBQUksR0FBRywyQkFBMkIsQ0FBQTtJQUN6QyxDQUFDO0NBQ0Y7QUFMRCw4REFLQyJ9
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type RecipientEmailOrderService } from "../../lib/modules/shipping/recipient-email";
|
|
1
2
|
import { AbstractFulfillmentProviderService } from "@medusajs/framework/utils";
|
|
2
3
|
import type { CalculatedShippingOptionPrice, CalculateShippingOptionPriceContext, CreateFulfillmentResult, CreateShippingOptionDTO, FulfillmentDTO, FulfillmentItemDTO, FulfillmentOption, FulfillmentOrderDTO, ValidateFulfillmentDataContext } from "@medusajs/framework/types";
|
|
3
4
|
import { DpdService } from "./service";
|
|
@@ -27,6 +28,7 @@ type InjectedDependencies = {
|
|
|
27
28
|
info: (message: string) => void;
|
|
28
29
|
};
|
|
29
30
|
integrationOperation?: IntegrationOperationStore;
|
|
31
|
+
order?: RecipientEmailOrderService;
|
|
30
32
|
};
|
|
31
33
|
export default class DpdFulfillmentProviderService extends AbstractFulfillmentProviderService {
|
|
32
34
|
static identifier: string;
|
|
@@ -34,6 +36,7 @@ export default class DpdFulfillmentProviderService extends AbstractFulfillmentPr
|
|
|
34
36
|
protected readonly options_: ProviderOptions;
|
|
35
37
|
protected readonly logger_?: InjectedDependencies["logger"];
|
|
36
38
|
protected readonly operationStore_?: IntegrationOperationStore;
|
|
39
|
+
protected readonly orderService_?: RecipientEmailOrderService;
|
|
37
40
|
constructor(container?: InjectedDependencies, options?: ProviderOptions);
|
|
38
41
|
getFulfillmentOptions(): Promise<FulfillmentOption[]>;
|
|
39
42
|
validateFulfillmentData(optionData: Record<string, unknown>, data: Record<string, unknown>, context: ValidateFulfillmentDataContext): Promise<Record<string, unknown>>;
|
|
@@ -43,9 +46,10 @@ export default class DpdFulfillmentProviderService extends AbstractFulfillmentPr
|
|
|
43
46
|
createFulfillment(data: Record<string, unknown>, _items: Partial<Omit<FulfillmentItemDTO, "fulfillment">>[], order: Partial<FulfillmentOrderDTO> | undefined, fulfillment: Partial<Omit<FulfillmentDTO, "provider_id" | "data" | "items">>): Promise<CreateFulfillmentResult>;
|
|
44
47
|
cancelFulfillment(data: Record<string, unknown>): Promise<Record<string, unknown>>;
|
|
45
48
|
getFulfillmentDocuments(_data: Record<string, unknown>): Promise<never[]>;
|
|
46
|
-
createReturnFulfillment(
|
|
49
|
+
createReturnFulfillment(_fulfillment: Record<string, unknown>): Promise<CreateFulfillmentResult>;
|
|
47
50
|
retrieveDocuments(_fulfillmentData: Record<string, unknown>, _documentType: string): Promise<void>;
|
|
48
51
|
getReturnDocuments(_data: Record<string, unknown>): Promise<never[]>;
|
|
49
52
|
getShipmentDocuments(_data: Record<string, unknown>): Promise<never[]>;
|
|
53
|
+
private runDurableCancel;
|
|
50
54
|
}
|
|
51
55
|
export {};
|