@hartl-services/medusa-base 1.0.0 → 2.0.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 +117 -1
- package/.medusa/server/src/admin/index.mjs +118 -2
- package/.medusa/server/src/documents/plugin-features.js +15 -1
- package/.medusa/server/src/documents/templates/financial-document.js +69 -51
- package/.medusa/server/src/documents/templates/format.js +44 -2
- package/.medusa/server/src/documents/templates/html-factory.js +7 -5
- package/.medusa/server/src/documents/templates/html-utils.js +12 -2
- package/.medusa/server/src/documents/templates/layout.js +115 -70
- package/.medusa/server/src/documents/templates/packing-list.js +10 -8
- package/.medusa/server/src/documents/utils/document-merchant.js +5 -5
- package/.medusa/server/src/documents/utils/document-render-settings.js +59 -0
- package/.medusa/server/src/email/application/handle-invite-event.js +8 -2
- package/.medusa/server/src/email/application/handle-password-reset-event.js +16 -4
- package/.medusa/server/src/email/domain/order-summary.js +103 -0
- package/.medusa/server/src/email/domain/refund-summary.js +43 -0
- package/.medusa/server/src/email/domain/return-summary.js +118 -0
- package/.medusa/server/src/email/domain/shipment-summary.js +74 -0
- package/.medusa/server/src/email/plugin-features.js +9 -1
- package/.medusa/server/src/email/rendering/default-templates.js +693 -65
- package/.medusa/server/src/email/rendering/load-email-shop-details.js +36 -0
- package/.medusa/server/src/email/rendering/render-email.js +16 -3
- package/.medusa/server/src/email/rendering/resolve-shop-configuration.js +20 -1
- package/.medusa/server/src/email/types/template-data.js +155 -2
- package/.medusa/server/src/modules/documents/domain/merchant.js +2 -33
- package/.medusa/server/src/modules/documents/domain/options.js +1 -7
- package/.medusa/server/src/modules/plugin-features/domain/plugin-settings.js +4 -3
- package/.medusa/server/src/public/descriptor.js +3 -1
- package/.medusa/server/src/public/shop-master-data.js +7 -7
- package/.medusa/server/src/shop-config/build-food-shop-config.js +6 -6
- package/.medusa/server/src/shop-config/options.js +5 -15
- package/.medusa/server/src/workflows/documents/issue-cancellation-after-refund.js +2 -3
- package/.medusa/server/src/workflows/documents/issue-document.js +6 -5
- package/.medusa/server/src/workflows/documents/issue-packing-list.js +9 -3
- package/.medusa/server/src/workflows/email/dispatch-email-message.js +4 -2
- package/.medusa/server/src/workflows/email/prepare-order-canceled-email.js +42 -4
- package/.medusa/server/src/workflows/email/prepare-order-received-email.js +31 -5
- package/.medusa/server/src/workflows/email/prepare-refund-email.js +25 -1
- package/.medusa/server/src/workflows/email/prepare-return-email.js +64 -3
- package/.medusa/server/src/workflows/email/prepare-shipment-email.js +36 -3
- package/README.md +180 -43
- package/dist/admin-components/features/plugin-features/components/ImageSettingInput.d.ts +15 -0
- package/dist/admin-components/features/plugin-features/components/ImageSettingInput.js +42 -0
- package/dist/admin-components/features/plugin-features/components/PluginSettingsForm.js +4 -2
- package/dist/admin-components/features/plugin-features/hooks/usePluginFeatureEnabled.d.ts +1 -1
- package/dist/admin-components/features/plugin-features/hooks/usePluginFeatures.d.ts +4 -4
- package/dist/admin-components/features/plugin-features/hooks/usePluginSettingsForm.d.ts +1 -1
- package/dist/admin-components/features/plugin-features/lib/image-upload.d.ts +6 -0
- package/dist/admin-components/features/plugin-features/lib/image-upload.js +17 -0
- package/dist/admin-components/features/plugin-features/lib/plugin-features-admin-client.d.ts +4 -4
- package/dist/admin-components/i18n/texts.d.ts +6 -0
- package/dist/admin-components/i18n/texts.js +6 -0
- package/dist/documents/templates/financial-document.d.ts +3 -3
- package/dist/documents/templates/financial-document.js +68 -50
- package/dist/documents/templates/format.d.ts +14 -0
- package/dist/documents/templates/format.js +43 -1
- package/dist/documents/templates/html-factory.d.ts +6 -2
- package/dist/documents/templates/html-factory.js +6 -4
- package/dist/documents/templates/html-utils.d.ts +6 -0
- package/dist/documents/templates/html-utils.js +11 -1
- package/dist/documents/templates/layout.d.ts +21 -3
- package/dist/documents/templates/layout.js +114 -69
- package/dist/documents/templates/packing-list.js +9 -7
- package/dist/documents/types/documents.d.ts +11 -16
- package/dist/documents/types/html-factory.d.ts +1 -0
- package/dist/email/types/shop-configuration.d.ts +25 -0
- package/dist/email/types/template-data.d.ts +509 -0
- package/dist/email/types/template-data.js +154 -1
- package/dist/modules/documents/domain/options.d.ts +1 -9
- package/dist/modules/documents/domain/options.js +0 -6
- package/dist/public/descriptor.js +2 -0
- package/dist/public/shop-master-data.d.ts +5 -6
- package/dist/public/shop-master-data.js +6 -6
- package/dist/public/types.d.ts +2 -1
- package/dist/shop-config/build-food-shop-config.js +5 -5
- package/dist/shop-config/options.d.ts +13 -8
- package/dist/shop-config/options.js +4 -14
- package/package.json +2 -2
- package/dist/modules/documents/domain/merchant.d.ts +0 -22
- package/dist/modules/documents/domain/merchant.js +0 -85
|
@@ -3,11 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareOrderCanceledEmailWorkflow = exports.prepareOrderCanceledEmail = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
6
7
|
const business_keys_1 = require("../../email/domain/business-keys");
|
|
7
8
|
const documents_fact_fingerprint_1 = require("../../email/domain/documents-fact-fingerprint");
|
|
9
|
+
const order_summary_1 = require("../../email/domain/order-summary");
|
|
8
10
|
const email_1 = require("../../modules/email");
|
|
9
11
|
const dispatch_email_message_1 = require("./dispatch-email-message");
|
|
10
12
|
const documents_required_facts_1 = require("./documents-required-facts");
|
|
13
|
+
/**
|
|
14
|
+
* The snapshot must never block the cancellation mail: an order Medusa
|
|
15
|
+
* returns in an unexpected shape is confirmed without it.
|
|
16
|
+
*/
|
|
17
|
+
const cancellationSummaryData = (container, order) => {
|
|
18
|
+
const canceledAt = (0, order_summary_1.toIsoDateTime)(order.canceled_at);
|
|
19
|
+
try {
|
|
20
|
+
return {
|
|
21
|
+
summary: (0, order_summary_1.toOrderSummary)(order),
|
|
22
|
+
...(canceledAt ? { canceled_at: canceledAt } : {}),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
container
|
|
27
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
28
|
+
.warn("Email: order summary unavailable; canceling without it.");
|
|
29
|
+
return canceledAt ? { canceled_at: canceledAt } : {};
|
|
30
|
+
}
|
|
31
|
+
};
|
|
11
32
|
const prepareOrderCanceledEmail = async (container, input) => {
|
|
12
33
|
const email = container.resolve(email_1.EMAIL_MODULE);
|
|
13
34
|
const businessKey = (0, business_keys_1.orderCanceledBusinessKey)(input.order_id);
|
|
@@ -29,6 +50,7 @@ const prepareOrderCanceledEmail = async (container, input) => {
|
|
|
29
50
|
fact: "documents",
|
|
30
51
|
template_data: {
|
|
31
52
|
order_id: input.order_id,
|
|
53
|
+
cancellation_attached: input.attachments.length > 0,
|
|
32
54
|
documents_fact_fingerprint: (0, documents_fact_fingerprint_1.fingerprintDocumentsFact)({
|
|
33
55
|
schema_version: input.schema_version,
|
|
34
56
|
order_id: input.order_id,
|
|
@@ -39,13 +61,29 @@ const prepareOrderCanceledEmail = async (container, input) => {
|
|
|
39
61
|
attachments: input.attachments.map(({ artifact }) => artifact),
|
|
40
62
|
})
|
|
41
63
|
: await (async () => {
|
|
42
|
-
const
|
|
43
|
-
|
|
64
|
+
const { result } = await (0, core_flows_1.getOrderDetailWorkflow)(container).run({
|
|
65
|
+
input: {
|
|
66
|
+
order_id: input.order_id,
|
|
67
|
+
fields: [
|
|
68
|
+
"id",
|
|
69
|
+
"no_notification",
|
|
70
|
+
"canceled_at",
|
|
71
|
+
...order_summary_1.ORDER_SUMMARY_FIELDS,
|
|
72
|
+
],
|
|
73
|
+
},
|
|
74
|
+
});
|
|
75
|
+
if (!result) {
|
|
76
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Order ${input.order_id} was not found.`);
|
|
77
|
+
}
|
|
78
|
+
const order = result;
|
|
44
79
|
return await email.upsertMessageFact({
|
|
45
80
|
...identity,
|
|
46
81
|
fact: "cancellation",
|
|
47
82
|
recipient: order.email ?? null,
|
|
48
|
-
template_data: {
|
|
83
|
+
template_data: {
|
|
84
|
+
order_id: order.id,
|
|
85
|
+
...cancellationSummaryData(container, order),
|
|
86
|
+
},
|
|
49
87
|
suppression_code: order.no_notification === true ? "notifications_disabled" : null,
|
|
50
88
|
});
|
|
51
89
|
})();
|
|
@@ -61,4 +99,4 @@ const prepareOrderCanceledEmail = async (container, input) => {
|
|
|
61
99
|
exports.prepareOrderCanceledEmail = prepareOrderCanceledEmail;
|
|
62
100
|
const prepareOrderCanceledEmailStep = (0, workflows_sdk_1.createStep)("email-prepare-order-canceled", async (input, { container }) => new workflows_sdk_1.StepResponse(await (0, exports.prepareOrderCanceledEmail)(container, input)));
|
|
63
101
|
exports.prepareOrderCanceledEmailWorkflow = (0, workflows_sdk_1.createWorkflow)("email-prepare-order-canceled", (input) => new workflows_sdk_1.WorkflowResponse(prepareOrderCanceledEmailStep(input)));
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1vcmRlci1jYW5jZWxlZC1lbWFpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3MvZW1haWwvcHJlcGFyZS1vcmRlci1jYW5jZWxlZC1lbWFpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFHbUM7QUFDbkMscUVBSzJDO0FBQzNDLDREQUFxRTtBQUdyRSxvRUFBNEU7QUFDNUUsOEZBQXlGO0FBQ3pGLG9FQUkwQztBQUUxQywrQ0FBbUQ7QUFFbkQscUVBQXdFO0FBQ3hFLHlFQUEyRTtBQThCM0U7OztHQUdHO0FBQ0gsTUFBTSx1QkFBdUIsR0FBRyxDQUM5QixTQUEwQixFQUMxQixLQUFzQyxFQUNZLEVBQUU7SUFDcEQsTUFBTSxVQUFVLEdBQUcsSUFBQSw2QkFBYSxFQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNwRCxJQUFJLENBQUM7UUFDSCxPQUFPO1lBQ0wsT0FBTyxFQUFFLElBQUEsOEJBQWMsRUFBQyxLQUFLLENBQUM7WUFDOUIsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztTQUNuRCxDQUFDO0lBQ0osQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLFNBQVM7YUFDTixPQUFPLENBQVMsaUNBQXlCLENBQUMsTUFBTSxDQUFDO2FBQ2pELElBQUksQ0FBQyx5REFBeUQsQ0FBQyxDQUFDO1FBQ25FLE9BQU8sVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ3ZELENBQUM7QUFDSCxDQUFDLENBQUM7QUFFSyxNQUFNLHlCQUF5QixHQUFHLEtBQUssRUFDNUMsU0FBMEIsRUFDMUIsS0FBcUMsRUFDSyxFQUFFO0lBQzVDLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENB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
|
|
@@ -3,12 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareOrderReceivedEmailWorkflow = exports.prepareOrderReceivedEmail = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
6
7
|
const business_keys_1 = require("../../email/domain/business-keys");
|
|
8
|
+
const order_summary_1 = require("../../email/domain/order-summary");
|
|
7
9
|
const email_1 = require("../../modules/email");
|
|
8
10
|
const dispatch_email_message_1 = require("./dispatch-email-message");
|
|
11
|
+
/**
|
|
12
|
+
* The summary must never block the order confirmation: an order Medusa
|
|
13
|
+
* returns in an unexpected shape is confirmed without it.
|
|
14
|
+
*/
|
|
15
|
+
const orderSummaryData = (container, order) => {
|
|
16
|
+
try {
|
|
17
|
+
return { summary: (0, order_summary_1.toOrderSummary)(order) };
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
container
|
|
21
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
22
|
+
.warn("Email: order summary unavailable; confirming without it.");
|
|
23
|
+
return {};
|
|
24
|
+
}
|
|
25
|
+
};
|
|
9
26
|
const prepareOrderReceivedEmail = async (container, input) => {
|
|
10
|
-
const
|
|
11
|
-
|
|
27
|
+
const { result } = await (0, core_flows_1.getOrderDetailWorkflow)(container).run({
|
|
28
|
+
input: {
|
|
29
|
+
order_id: input.order_id,
|
|
30
|
+
fields: ["id", "no_notification", ...order_summary_1.ORDER_SUMMARY_FIELDS],
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
if (!result) {
|
|
34
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Order ${input.order_id} was not found.`);
|
|
35
|
+
}
|
|
36
|
+
const order = result;
|
|
37
|
+
const summaryData = orderSummaryData(container, order);
|
|
12
38
|
const email = container.resolve(email_1.EMAIL_MODULE);
|
|
13
39
|
const customerMessage = await email.upsertMessageFact({
|
|
14
40
|
kind: "order.received",
|
|
@@ -18,7 +44,7 @@ const prepareOrderReceivedEmail = async (container, input) => {
|
|
|
18
44
|
recipient: order.email ?? null,
|
|
19
45
|
required_facts: ["placed"],
|
|
20
46
|
fact: "placed",
|
|
21
|
-
template_data: { order_id: order.id },
|
|
47
|
+
template_data: { order_id: order.id, ...summaryData },
|
|
22
48
|
suppression_code: order.no_notification === true ? "notifications_disabled" : null,
|
|
23
49
|
terms_effective_at: new Date(order.created_at),
|
|
24
50
|
});
|
|
@@ -30,7 +56,7 @@ const prepareOrderReceivedEmail = async (container, input) => {
|
|
|
30
56
|
recipient: email.getDispatchConfiguration().orderNotificationEmail,
|
|
31
57
|
required_facts: ["placed"],
|
|
32
58
|
fact: "placed",
|
|
33
|
-
template_data: { order_id: order.id },
|
|
59
|
+
template_data: { order_id: order.id, ...summaryData },
|
|
34
60
|
suppression_code: null,
|
|
35
61
|
});
|
|
36
62
|
const [{ result: customerDelivery }, { result: adminDelivery }] = await Promise.all([
|
|
@@ -53,4 +79,4 @@ const prepareOrderReceivedEmail = async (container, input) => {
|
|
|
53
79
|
exports.prepareOrderReceivedEmail = prepareOrderReceivedEmail;
|
|
54
80
|
const prepareOrderReceivedEmailStep = (0, workflows_sdk_1.createStep)("email-prepare-order-received", async (input, { container }) => new workflows_sdk_1.StepResponse(await (0, exports.prepareOrderReceivedEmail)(container, input)));
|
|
55
81
|
exports.prepareOrderReceivedEmailWorkflow = (0, workflows_sdk_1.createWorkflow)("email-prepare-order-received", (input) => new workflows_sdk_1.WorkflowResponse(prepareOrderReceivedEmailStep(input)));
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1vcmRlci1yZWNlaXZlZC1lbWFpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3MvZW1haWwvcHJlcGFyZS1vcmRlci1yZWNlaXZlZC1lbWFpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFHbUM7QUFDbkMscUVBSzJDO0FBQzNDLDREQUFxRTtBQUVyRSxvRUFHMEM7QUFDMUMsb0VBRzBDO0FBRTFDLCtDQUFtRDtBQUVuRCxxRUFBd0U7QUFtQnhFOzs7R0FHRztBQUNILE1BQU0sZ0JBQWdCLEdBQUcsQ0FDdkIsU0FBMEIsRUFDMUIsS0FBYyxFQUNjLEVBQUU7SUFDOUIsSUFBSSxDQUFDO1FBQ0gsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFBLDhCQUFjLEVBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztJQUM1QyxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsU0FBUzthQUNOLE9BQU8sQ0FBUyxpQ0FBeUIsQ0FBQyxNQUFNLENBQUM7YUFDakQsSUFBSSxDQUFDLDBEQUEwRCxDQUFDLENBQUM7UUFDcEUsT0FBTyxFQUFFLENBQUM7SUFDWixDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUssTUFBTSx5QkFBeUIsR0FBRyxLQUFLLEVBQzVDLFNBQTBCLEVBQzFCLEtBQXFDLEVBQ0ssRUFBRTtJQUM1QyxNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLG1DQUFzQixFQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUM3RCxLQUFLLEVBQUU7WUFDTCxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDeEIsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLGlCQUFpQixFQUFFLEdBQUcsb0NBQW9CLENBQUM7U0FDM0Q7S0FDRixDQUFDLENBQUM7SUFDSCxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDWixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxL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
|
|
@@ -5,8 +5,30 @@ const utils_1 = require("@medusajs/framework/utils");
|
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
6
|
const business_keys_1 = require("../../email/domain/business-keys");
|
|
7
7
|
const documents_fact_fingerprint_1 = require("../../email/domain/documents-fact-fingerprint");
|
|
8
|
+
const refund_summary_1 = require("../../email/domain/refund-summary");
|
|
8
9
|
const email_1 = require("../../modules/email");
|
|
9
10
|
const dispatch_email_message_1 = require("./dispatch-email-message");
|
|
11
|
+
/**
|
|
12
|
+
* The snapshot must never block the refund confirmation: a refund that
|
|
13
|
+
* cannot be read or mapped is confirmed without it.
|
|
14
|
+
*/
|
|
15
|
+
const refundSummaryData = async (container, order, input) => {
|
|
16
|
+
try {
|
|
17
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
18
|
+
const { data } = await query.graph({
|
|
19
|
+
entity: "payment",
|
|
20
|
+
fields: [...refund_summary_1.REFUND_PAYMENT_FIELDS],
|
|
21
|
+
filters: { id: input.payment_id },
|
|
22
|
+
});
|
|
23
|
+
return { summary: (0, refund_summary_1.toRefundSummary)(order, data[0], input.refund_id) };
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
container
|
|
27
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
28
|
+
.warn("Email: refund summary unavailable; confirming without it.");
|
|
29
|
+
return {};
|
|
30
|
+
}
|
|
31
|
+
};
|
|
10
32
|
const prepareRefundEmail = async (container, input) => {
|
|
11
33
|
const orders = container.resolve(utils_1.Modules.ORDER);
|
|
12
34
|
const order = await orders.retrieveOrder(input.order_id);
|
|
@@ -22,6 +44,8 @@ const prepareRefundEmail = async (container, input) => {
|
|
|
22
44
|
template_data: {
|
|
23
45
|
order_id: order.id,
|
|
24
46
|
refund_id: input.refund_id,
|
|
47
|
+
cancellation_attached: input.artifact !== null,
|
|
48
|
+
...(await refundSummaryData(container, order, input)),
|
|
25
49
|
documents_fact_fingerprint: (0, documents_fact_fingerprint_1.fingerprintDocumentsFact)({
|
|
26
50
|
schema_version: input.schema_version,
|
|
27
51
|
order_id: input.order_id,
|
|
@@ -44,4 +68,4 @@ const prepareRefundEmail = async (container, input) => {
|
|
|
44
68
|
exports.prepareRefundEmail = prepareRefundEmail;
|
|
45
69
|
const prepareRefundEmailStep = (0, workflows_sdk_1.createStep)("email-prepare-refund", async (input, { container }) => new workflows_sdk_1.StepResponse(await (0, exports.prepareRefundEmail)(container, input)));
|
|
46
70
|
exports.prepareRefundEmailWorkflow = (0, workflows_sdk_1.createWorkflow)("email-prepare-refund", (input) => new workflows_sdk_1.WorkflowResponse(prepareRefundEmailStep(input)));
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1yZWZ1bmQtZW1haWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2VtYWlsL3ByZXBhcmUtcmVmdW5kLWVtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUtBLHFEQUErRTtBQUMvRSxxRUFLMkM7QUFHM0Msb0VBQTRFO0FBQzVFLDhGQUF5RjtBQUN6RixzRUFHMkM7QUFFM0MsK0NBQW1EO0FBRW5ELHFFQUF3RTtBQVd4RTs7O0dBR0c7QUFDSCxNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFDN0IsU0FBMEIsRUFDMUIsS0FBYyxFQUNkLEtBQThCLEVBQ1EsRUFBRTtJQUN4QyxJQUFJLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7WUFDakMsTUFBTSxFQUFFLFNBQVM7WUFDakIsTUFBTSxFQUFFLENBQUMsR0FBRyxzQ0FBcUIsQ0FBQztZQUNsQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLFVBQVUsRUFBRTtTQUNsQyxDQUFDLENBQUM7UUFDSCxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUEsZ0NBQWUsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO0lBQ3ZFLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxTQUFTO2FBQ04sT0FBTyxDQUFTLGlDQUF5QixDQUFDLE1BQU0sQ0FBQzthQUNqRCxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQztRQUNyRSxPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFSyxNQUFNLGtCQUFrQixHQUFHLEtBQUssRUFDckMsU0FBMEIsRUFD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
|
|
@@ -4,8 +4,61 @@ exports.prepareReturnEmailWorkflow = exports.prepareReturnEmail = void 0;
|
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
6
|
const business_keys_1 = require("../../email/domain/business-keys");
|
|
7
|
+
const return_summary_1 = require("../../email/domain/return-summary");
|
|
8
|
+
const load_email_shop_details_1 = require("../../email/rendering/load-email-shop-details");
|
|
7
9
|
const email_1 = require("../../modules/email");
|
|
8
10
|
const dispatch_email_message_1 = require("./dispatch-email-message");
|
|
11
|
+
/**
|
|
12
|
+
* The snapshot must never block the return confirmation: a return that
|
|
13
|
+
* cannot be read or mapped is confirmed without it.
|
|
14
|
+
*/
|
|
15
|
+
const returnSummaryData = async (container, orderReturn) => {
|
|
16
|
+
try {
|
|
17
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
18
|
+
const { data: returns } = await query.graph({
|
|
19
|
+
entity: "return",
|
|
20
|
+
fields: [...return_summary_1.RETURN_SUMMARY_FIELDS],
|
|
21
|
+
filters: { id: orderReturn.id },
|
|
22
|
+
});
|
|
23
|
+
const { data: locations } = orderReturn.location_id
|
|
24
|
+
? await query.graph({
|
|
25
|
+
entity: "stock_location",
|
|
26
|
+
fields: [...return_summary_1.RETURN_LOCATION_FIELDS],
|
|
27
|
+
filters: { id: orderReturn.location_id },
|
|
28
|
+
})
|
|
29
|
+
: { data: [] };
|
|
30
|
+
return {
|
|
31
|
+
summary: (0, return_summary_1.toReturnSummary)(returns[0], locations[0] ?? null, await (0, load_email_shop_details_1.loadEmailShopDetails)(container)),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
container
|
|
36
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
37
|
+
.warn("Email: return summary unavailable; confirming without it.");
|
|
38
|
+
return {};
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
/**
|
|
42
|
+
* The snapshot must never block the return receipt: a return that cannot be
|
|
43
|
+
* read or mapped is confirmed without it.
|
|
44
|
+
*/
|
|
45
|
+
const returnReceivedSummaryData = async (container, returnId) => {
|
|
46
|
+
try {
|
|
47
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
48
|
+
const { data } = await query.graph({
|
|
49
|
+
entity: "return",
|
|
50
|
+
fields: [...return_summary_1.RETURN_RECEIVED_SUMMARY_FIELDS],
|
|
51
|
+
filters: { id: returnId },
|
|
52
|
+
});
|
|
53
|
+
return { summary: (0, return_summary_1.toReturnReceivedSummary)(data[0]) };
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
container
|
|
57
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
58
|
+
.warn("Email: received return summary unavailable; confirming without it.");
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
};
|
|
9
62
|
const prepareReturnEmail = async (container, input) => {
|
|
10
63
|
const orders = container.resolve(utils_1.Modules.ORDER);
|
|
11
64
|
const orderReturn = (await orders.retrieveReturn(input.return_id));
|
|
@@ -32,7 +85,11 @@ const prepareReturnEmail = async (container, input) => {
|
|
|
32
85
|
...requestedIdentity,
|
|
33
86
|
recipient: order.email ?? null,
|
|
34
87
|
fact: "requested",
|
|
35
|
-
template_data: {
|
|
88
|
+
template_data: {
|
|
89
|
+
order_id: order.id,
|
|
90
|
+
return_id: orderReturn.id,
|
|
91
|
+
...(await returnSummaryData(container, orderReturn)),
|
|
92
|
+
},
|
|
36
93
|
});
|
|
37
94
|
}
|
|
38
95
|
const receivedIdentity = {
|
|
@@ -53,7 +110,11 @@ const prepareReturnEmail = async (container, input) => {
|
|
|
53
110
|
...receivedIdentity,
|
|
54
111
|
recipient: order.email ?? null,
|
|
55
112
|
fact: "received",
|
|
56
|
-
template_data: {
|
|
113
|
+
template_data: {
|
|
114
|
+
order_id: order.id,
|
|
115
|
+
return_id: orderReturn.id,
|
|
116
|
+
...(await returnReceivedSummaryData(container, orderReturn.id)),
|
|
117
|
+
},
|
|
57
118
|
});
|
|
58
119
|
}
|
|
59
120
|
await (0, dispatch_email_message_1.dispatchEmailMessageWorkflow)(container).run({
|
|
@@ -72,4 +133,4 @@ const prepareReturnEmail = async (container, input) => {
|
|
|
72
133
|
exports.prepareReturnEmail = prepareReturnEmail;
|
|
73
134
|
const prepareReturnEmailStep = (0, workflows_sdk_1.createStep)("email-prepare-return", async (input, { container }) => new workflows_sdk_1.StepResponse(await (0, exports.prepareReturnEmail)(container, input)));
|
|
74
135
|
exports.prepareReturnEmailWorkflow = (0, workflows_sdk_1.createWorkflow)("email-prepare-return", (input) => new workflows_sdk_1.WorkflowResponse(prepareReturnEmailStep(input)));
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1yZXR1cm4tZW1haWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2VtYWlsL3ByZXBhcmUtcmV0dXJuLWVtYWlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUtBLHFEQUltQztBQUNuQyxxRUFLMkM7QUFFM0Msb0VBRzBDO0FBQzFDLHNFQU0yQztBQUMzQywyRkFBcUY7QUFFckYsK0NBQW1EO0FBRW5ELHFFQUF3RTtBQXNCeEU7OztHQUdHO0FBQ0gsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLEVBQzdCLFNBQTBCLEVBQzFCLFdBQXlCLEVBQ2EsRUFBRTtJQUN4QyxJQUFJLENBQUM7UUFDSCxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1lBQzFDLE1BQU0sRUFBRSxRQUFRO1lBQ2hCLE1BQU0sRUFBRSxDQUFDLEdBQUcsc0NBQXFCLENBQUM7WUFDbEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLFdBQVcsQ0FBQyxFQUFFLEVBQUU7U0FDaEMsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsR0FBRyxXQUFXLENBQUMsV0FBVztZQUNqRCxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO2dCQUNoQixNQUFNLEVBQUUsZ0JBQWdCO2dCQUN4QixNQUFNLEVBQUUsQ0FBQyxHQUFHLHVDQUFzQixDQUFDO2dCQUNuQyxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsV0FBVyxDQUFDLFdBQVcsRUFBRTthQUN6QyxDQUFDO1lBQ0osQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQ2pCLE9BQU87WUFDTCxPQUFPLEVBQUUsSUFBQSxn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
|
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.prepareShipmentEmailWorkflow = exports.prepareShipmentEmail = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
6
7
|
const business_keys_1 = require("../../email/domain/business-keys");
|
|
7
8
|
const documents_fact_fingerprint_1 = require("../../email/domain/documents-fact-fingerprint");
|
|
9
|
+
const shipment_summary_1 = require("../../email/domain/shipment-summary");
|
|
8
10
|
const email_1 = require("../../modules/email");
|
|
9
11
|
const dispatch_email_message_1 = require("./dispatch-email-message");
|
|
10
12
|
const documents_required_facts_1 = require("./documents-required-facts");
|
|
@@ -17,6 +19,27 @@ const findOrderIdForFulfillment = async (container, fulfillmentId) => {
|
|
|
17
19
|
}
|
|
18
20
|
return records[0].order_id;
|
|
19
21
|
};
|
|
22
|
+
/**
|
|
23
|
+
* The shipment snapshot must never block the shipping confirmation: a
|
|
24
|
+
* fulfillment that cannot be read or mapped is confirmed without it.
|
|
25
|
+
*/
|
|
26
|
+
const shipmentSummaryData = async (container, order, fulfillmentId) => {
|
|
27
|
+
try {
|
|
28
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
29
|
+
const { data } = await query.graph({
|
|
30
|
+
entity: "fulfillment",
|
|
31
|
+
fields: [...shipment_summary_1.SHIPMENT_FULFILLMENT_FIELDS],
|
|
32
|
+
filters: { id: fulfillmentId },
|
|
33
|
+
});
|
|
34
|
+
return { shipment: (0, shipment_summary_1.toShipmentSummary)(order, data[0]) };
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
container
|
|
38
|
+
.resolve(utils_1.ContainerRegistrationKeys.LOGGER)
|
|
39
|
+
.warn("Email: shipment summary unavailable; confirming without it.");
|
|
40
|
+
return {};
|
|
41
|
+
}
|
|
42
|
+
};
|
|
20
43
|
const prepareShipmentEmail = async (container, input) => {
|
|
21
44
|
const email = container.resolve(email_1.EMAIL_MODULE);
|
|
22
45
|
const businessKey = (0, business_keys_1.orderShippedBusinessKey)(input.fulfillment_id);
|
|
@@ -39,6 +62,7 @@ const prepareShipmentEmail = async (container, input) => {
|
|
|
39
62
|
template_data: {
|
|
40
63
|
order_id: input.order_id,
|
|
41
64
|
fulfillment_id: input.fulfillment_id,
|
|
65
|
+
invoice_attached: input.decision === "carrier",
|
|
42
66
|
documents_fact_fingerprint: (0, documents_fact_fingerprint_1.fingerprintDocumentsFact)({
|
|
43
67
|
schema_version: input.schema_version,
|
|
44
68
|
order_id: input.order_id,
|
|
@@ -54,8 +78,16 @@ const prepareShipmentEmail = async (container, input) => {
|
|
|
54
78
|
})
|
|
55
79
|
: await (async () => {
|
|
56
80
|
const orderId = await findOrderIdForFulfillment(container, input.fulfillment_id);
|
|
57
|
-
const
|
|
58
|
-
|
|
81
|
+
const { result } = await (0, core_flows_1.getOrderDetailWorkflow)(container).run({
|
|
82
|
+
input: {
|
|
83
|
+
order_id: orderId,
|
|
84
|
+
fields: ["id", "email", ...shipment_summary_1.SHIPMENT_ORDER_FIELDS],
|
|
85
|
+
},
|
|
86
|
+
});
|
|
87
|
+
if (!result) {
|
|
88
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, "The shipped fulfillment's order was not found.");
|
|
89
|
+
}
|
|
90
|
+
const order = result;
|
|
59
91
|
return await email.upsertMessageFact({
|
|
60
92
|
...identity,
|
|
61
93
|
fact: "shipment",
|
|
@@ -63,6 +95,7 @@ const prepareShipmentEmail = async (container, input) => {
|
|
|
63
95
|
template_data: {
|
|
64
96
|
order_id: order.id,
|
|
65
97
|
fulfillment_id: input.fulfillment_id,
|
|
98
|
+
...(await shipmentSummaryData(container, order, input.fulfillment_id)),
|
|
66
99
|
},
|
|
67
100
|
suppression_code: input.no_notification === true ? "notifications_disabled" : null,
|
|
68
101
|
});
|
|
@@ -79,4 +112,4 @@ const prepareShipmentEmail = async (container, input) => {
|
|
|
79
112
|
exports.prepareShipmentEmail = prepareShipmentEmail;
|
|
80
113
|
const prepareShipmentEmailStep = (0, workflows_sdk_1.createStep)("email-prepare-shipment", async (input, { container }) => new workflows_sdk_1.StepResponse(await (0, exports.prepareShipmentEmail)(container, input)));
|
|
81
114
|
exports.prepareShipmentEmailWorkflow = (0, workflows_sdk_1.createWorkflow)("email-prepare-shipment", (input) => new workflows_sdk_1.WorkflowResponse(prepareShipmentEmailStep(input)));
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1zaGlwbWVudC1lbWFpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3MvZW1haWwvcHJlcGFyZS1zaGlwbWVudC1lbWFpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFJbUM7QUFDbkMscUVBSzJDO0FBQzNDLDREQUFxRTtBQUdyRSxvRUFBMkU7QUFDM0UsOEZBQXlGO0FBQ3pGLDBFQUk2QztBQUU3QywrQ0FBbUQ7QUFFbkQscUVBQXdFO0FBQ3hFLHlFQUEyRTtBQXdDM0UsTUFBTSx5QkFBeUIsR0FBRyxLQUFLLEVBQ3JDLFNBQTBCLEVBQzFCLGFBQXFCLEVBQ0osRUFBRTtJQUNuQixNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsT0FBTyxDQUM3QixpQ0FBeUIsQ0FBQyxJQUFJLENBQ0wsQ0FBQztJQUM1QixNQUFNLG9CQUFvQixHQUFHLEtBQUssQ0FBQyxhQUFhLENBQzlDLGVBQU8sQ0FBQyxLQUFLLEVBQ2IsVUFBVSxFQUNWLGVBQU8sQ0FBQyxXQUFXLEVBQ25CLGdCQUFnQixDQUNqQixDQUFDO0lBQ0YsTUFBTSxPQUFPLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyxJQUFJLENBQzdDLEVBQUUsY0FBYyxFQUFFLGFBQWEsRUFBRSxFQUNqQyxFQUFFLE1BQU0sRUFBRSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQ3pCLENBQUM7SUFDRixJQUFJLE9BQU8sQ0FBQyxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSxDQUFDO1FBQ2xELE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLG1EQUFtRCxDQUNwRCxDQUFDO0lBQ0osQ0FBQztJQUNELE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztBQUM3QixDQUFDLENBQUM7QUFFRjs7O0dBR0c7QUFD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
|