@unchainedshop/platform 2.5.8 → 2.5.9

package/lib/templates/order-parser/formatAddress.d.ts

@@ -0,0 +1,2 @@
+import { Address } from '@unchainedshop/types/common.js';
+export declare const formatAddress: (address: Address) => string;

package/lib/templates/order-parser/formatAddress.js

@@ -0,0 +1,14 @@
+export const formatAddress = (address) => {
+    return [
+        [address.firstName, address.lastName].filter(Boolean).join(' '),
+        address.company,
+        address.addressLine,
+        address.addressLine2,
+        [address.postalCode, address.city].filter(Boolean).join(' '),
+        address.regionCode,
+        [address.countryCode].filter(Boolean).join(''),
+    ]
+        .filter(Boolean)
+        .join('\n');
+};
+//# sourceMappingURL=formatAddress.js.map

package/lib/templates/order-parser/formatAddress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatAddress.js","sourceRoot":"","sources":["../../../src/templates/order-parser/formatAddress.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAgB,EAAE,EAAE;IAChD,OAAO;QACL,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/D,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,YAAY;QACpB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC5D,OAAO,CAAC,UAAU;QAClB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;KAC/C;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}

package/lib/templates/order-parser/formatPrice.d.ts

@@ -0,0 +1,5 @@
+export declare const formatPrice: ({ amount, currency }: {
+    amount: number;
+    currency: string;
+}) => string;
+export default formatPrice;

package/lib/templates/order-parser/formatPrice.js

@@ -0,0 +1,6 @@
+export const formatPrice = ({ amount, currency }) => {
+    const fixedPrice = amount / 100;
+    return `${currency} ${fixedPrice}`;
+};
+export default formatPrice;
+//# sourceMappingURL=formatPrice.js.map

package/lib/templates/order-parser/formatPrice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatPrice.js","sourceRoot":"","sources":["../../../src/templates/order-parser/formatPrice.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAwC,EAAE,EAAE;IACxF,MAAM,UAAU,GAAG,MAAM,GAAG,GAAG,CAAC;IAChC,OAAO,GAAG,QAAQ,IAAI,UAAU,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/templates/order-parser/getOrderPositionsData.d.ts

@@ -0,0 +1,13 @@
+import { Locale } from '@unchainedshop/types/common.js';
+import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { Order } from '@unchainedshop/types/orders.js';
+export declare const getOrderPositionsData: (order: Order, params: {
+    locale?: Locale;
+}, context: UnchainedCore) => Promise<{
+    productId: string;
+    configuration: import("@unchainedshop/types/common.js").Configuration;
+    originalProductTexts: import("@unchainedshop/types/products.js").ProductText;
+    productTexts: import("@unchainedshop/types/products.js").ProductText;
+    quantity: number;
+    total: string;
+}[]>;

package/lib/templates/{utils → order-parser}/getOrderPositionsData.js

@@ -1,13 +1,10 @@
+import formatPrice from './formatPrice.js';
 export const getOrderPositionsData = async (order, params, context) => {
     const { modules } = context;
     const orderPositions = await modules.orders.positions.findOrderPositions({
         orderId: order._id,
     });
-    const formatPrice = (price) => {
-        const fixedPrice = price / 100;
-        return `${order.currency} ${fixedPrice}`;
-    };
-    await Promise.all(orderPositions.map(async (orderPosition) => {
+    return Promise.all(orderPositions.map(async (orderPosition) => {
         const productTexts = await modules.products.texts.findLocalizedText({
             productId: orderPosition.productId,
             locale: params.locale?.normalized,
@@ -16,13 +13,16 @@ export const getOrderPositionsData = async (order, params, context) => {
             productId: orderPosition.originalProductId,
             locale: params.locale?.normalized,
         });
-        const productTitle = productTexts?.title; // deprecated
         const positionPricing = modules.orders.positions.pricingSheet(orderPosition, order.currency, context);
-        const total = formatPrice(positionPricing.sum());
+        const total = formatPrice({
+            amount: positionPricing.sum(),
+            currency: order.currency,
+        });
         const { quantity } = positionPricing;
         return {
+            productId: orderPosition.productId,
+            configuration: orderPosition.configuration,
             originalProductTexts,
-            product: productTitle,
             productTexts,
             quantity,
             total,

package/lib/templates/order-parser/getOrderPositionsData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getOrderPositionsData.js","sourceRoot":"","sources":["../../../src/templates/order-parser/getOrderPositionsData.ts"],"names":[],"mappings":"AAGA,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,KAAY,EACZ,MAA2B,EAC3B,OAAsB,EACtB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;QACvE,OAAO,EAAE,KAAK,CAAC,GAAG;KACnB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,CAChB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACzC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAClE,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU;SAClC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC1E,SAAS,EAAE,aAAa,CAAC,iBAAiB;YAC1C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU;SAClC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAC3D,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,OAAO,CACR,CAAC;QACF,MAAM,KAAK,GAAG,WAAW,CAAC;YACxB,MAAM,EAAE,eAAe,CAAC,GAAG,EAAE;YAC7B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QAEH,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,OAAO;YACL,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,aAAa,EAAE,aAAa,CAAC,aAAa;YAC1C,oBAAoB;YACpB,YAAY;YACZ,QAAQ;YACR,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC"}

package/lib/templates/order-parser/getOrderSummaryData.d.ts

@@ -0,0 +1,40 @@
+import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { Order } from '@unchainedshop/types/orders.js';
+import { Locale } from '@unchainedshop/types/common.js';
+export declare const getOrderSummaryData: (order: Order, params: {
+    locale?: Locale;
+}, context: UnchainedCore) => Promise<{
+    rawPrices: {
+        items: {
+            amount: number;
+            currency: string;
+        };
+        taxes: {
+            amount: number;
+            currency: string;
+        };
+        delivery: {
+            amount: number;
+            currency: string;
+        };
+        payment: {
+            amount: number;
+            currency: string;
+        };
+        gross: {
+            amount: number;
+            currency: string;
+        };
+    };
+    prices: {
+        items: string;
+        taxes: string;
+        delivery: string;
+        payment: string;
+        gross: string;
+    };
+    payment: string;
+    delivery: string;
+    deliveryAddress: string;
+    billingAddress: string;
+}>;

package/lib/templates/order-parser/getOrderSummaryData.js

@@ -0,0 +1,61 @@
+import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+import formatPrice from './formatPrice.js';
+import { formatAddress } from './formatAddress.js';
+export const getOrderSummaryData = async (order, params, context) => {
+    const { modules } = context;
+    const orderDelivery = await modules.orders.deliveries.findDelivery({
+        orderDeliveryId: order.deliveryId,
+    });
+    const orderPayment = await modules.orders.payments.findOrderPayment({
+        orderPaymentId: order.paymentId,
+    });
+    const paymentProvider = await modules.payment.paymentProviders.findProvider({
+        paymentProviderId: orderPayment.paymentProviderId,
+    });
+    const deliveryProvider = await modules.delivery.findProvider({
+        deliveryProviderId: orderDelivery.deliveryProviderId,
+    });
+    const deliveryAddress = formatAddress(orderDelivery?.context?.deliveryAddress || order.billingAddress);
+    const billingAddress = formatAddress(order.billingAddress);
+    const orderPricing = modules.orders.pricingSheet(order);
+    const paymentTotal = orderPricing.total({
+        category: OrderPricingRowCategory.Payment,
+        useNetPrice: false,
+    });
+    const deliveryTotal = orderPricing.total({
+        category: OrderPricingRowCategory.Delivery,
+        useNetPrice: false,
+    });
+    const taxesTotal = orderPricing.total({
+        category: OrderPricingRowCategory.Taxes,
+        useNetPrice: false,
+    });
+    const itemsTotal = orderPricing.total({
+        category: OrderPricingRowCategory.Items,
+        useNetPrice: false,
+    });
+    const total = orderPricing.total({ useNetPrice: false });
+    const payment = paymentProvider.adapterKey;
+    const delivery = deliveryProvider.adapterKey;
+    return {
+        rawPrices: {
+            items: itemsTotal,
+            taxes: taxesTotal,
+            delivery: deliveryTotal,
+            payment: paymentTotal,
+            gross: total,
+        },
+        prices: {
+            items: formatPrice(itemsTotal),
+            taxes: formatPrice(taxesTotal),
+            delivery: formatPrice(deliveryTotal),
+            payment: formatPrice(paymentTotal),
+            gross: formatPrice(total),
+        },
+        payment,
+        delivery,
+        deliveryAddress,
+        billingAddress,
+    };
+};
+//# sourceMappingURL=getOrderSummaryData.js.map

package/lib/templates/order-parser/getOrderSummaryData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getOrderSummaryData.js","sourceRoot":"","sources":["../../../src/templates/order-parser/getOrderSummaryData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,KAAY,EACZ,MAA2B,EAC3B,OAAsB,EACtB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QACjE,eAAe,EAAE,KAAK,CAAC,UAAU;KAClC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc,EAAE,KAAK,CAAC,SAAS;KAChC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QAC1E,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC3D,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;KACrD,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,aAAa,CAAC,aAAa,EAAE,OAAO,EAAE,eAAe,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACvG,MAAM,cAAc,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC;QACtC,QAAQ,EAAE,uBAAuB,CAAC,OAAO;QACzC,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC;QACvC,QAAQ,EAAE,uBAAuB,CAAC,QAAQ;QAC1C,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC;QACpC,QAAQ,EAAE,uBAAuB,CAAC,KAAK;QACvC,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC;QACpC,QAAQ,EAAE,uBAAuB,CAAC,KAAK;QACvC,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;IAEzD,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC;IAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC;IAE7C,OAAO;QACL,SAAS,EAAE;YACT,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,UAAU;YACjB,QAAQ,EAAE,aAAa;YACvB,OAAO,EAAE,YAAY;YACrB,KAAK,EAAE,KAAK;SACb;QACD,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC;YAC9B,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC;YAC9B,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC;YACpC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC;YAClC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC;SAC1B;QACD,OAAO;QACP,QAAQ;QACR,eAAe;QACf,cAAc;KACf,CAAC;AACJ,CAAC,CAAC"}

package/lib/templates/order-parser/index.d.ts

@@ -0,0 +1,4 @@
+export declare const transformOrderToText: ({ order, locale }: {
+    order: any;
+    locale: any;
+}, context: any) => Promise<any>;

package/lib/templates/order-parser/index.js

@@ -0,0 +1,42 @@
+import { getOrderPositionsData } from './getOrderPositionsData.js';
+import { getOrderSummaryData } from './getOrderSummaryData.js';
+const textTemplate = `Order number: {{orderNumber}}
+Ordered: {{orderDate}}
+Payment method: {{summary.payment}}
+Delivery method: {{summary.delivery}}
+
+Delivery address:
+{{summary.deliveryAddress}}
+
+Billing address:
+{{summary.billingAddress}}
+
+Order Details:
+
+Items:
+{{#positions}}
+* {{quantity}} {{productTexts.title}}: {{total}}
+{{/positions}}
+
+{{#summary.rawPrices.delivery.amount}}
+Delivery Fees: {{summary.prices.delivery}}
+{{/summary.rawPrices.delivery.amount}}
+{{#summary.rawPrices.payment.amount}}
+Payment Fees: {{summary.prices.payment}}
+{{/summary.rawPrices.payment.amount}}
+Total: {{summary.prices.gross}}
+{{#summary.rawPrices.taxes.amount}}
+(VAT included: {{summary.prices.taxes}})
+{{/summary.rawPrices.taxes.amount}}
+`;
+export const transformOrderToText = async ({ order, locale }, context) => {
+    const { modules } = context;
+    const data = {
+        orderDate: new Date(order.ordered).toLocaleString(),
+        orderNumber: order.orderNumber,
+        summary: await getOrderSummaryData(order, { locale }, context),
+        positions: await getOrderPositionsData(order, { locale }, context),
+    };
+    return modules.messaging.renderToText(textTemplate, data);
+};
+//# sourceMappingURL=index.js.map

package/lib/templates/order-parser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/order-parser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BpB,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,IAAI,GAAG;QACX,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE;QACnD,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,OAAO,EAAE,MAAM,mBAAmB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;QAC9D,SAAS,EAAE,MAAM,qBAAqB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;KACnE,CAAC;IAEF,OAAO,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/lib/templates/resolveErrorReportTemplate.js

@@ -1,5 +1,13 @@
-import formatWorkItems from './utils/formatWorkItems.js';
+import util from 'util';
 const { EMAIL_FROM = 'noreply@unchained.local', EMAIL_ERROR_REPORT_RECIPIENT = 'support@unchained.local', EMAIL_WEBSITE_NAME = 'Unchained', ROOT_URL, } = process.env;
+const formatWorkItems = (workItems) => {
+    return workItems
+        .map(({ _id, type, started, error }) => {
+        const stringifiedErrors = util.inspect(error, false, 10, false);
+        return `${new Date(started).toLocaleString()} ${type} (${_id}): ${stringifiedErrors}`;
+    })
+        .join('\n');
+};
 const textTemplate = `
 -------------------------
 Unchained Endpoint: {{endpoint}}

package/lib/templates/resolveErrorReportTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveErrorReportTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveErrorReportTemplate.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAEzD,MAAM,EACJ,UAAU,GAAG,yBAAyB,EACtC,4BAA4B,GAAG,yBAAyB,EACxD,kBAAkB,GAAG,WAAW,EAChC,QAAQ,GACT,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,YAAY,GAAG;;;;;;;CAOpB,CAAC;AAEF,MAAM,0BAA0B,GAAqB,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU,IAAI,yBAAyB;gBAC7C,EAAE,EAAE,4BAA4B;gBAChC,OAAO,EAAE,GAAG,kBAAkB,gBAAgB;gBAC9C,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE;oBACjD,QAAQ,EAAE,QAAQ;oBAClB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC;oBACnC,IAAI,EAAE,kBAAkB;iBACzB,CAAC;aACH;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC;AAEtC,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"resolveErrorReportTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveErrorReportTemplate.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,EACJ,UAAU,GAAG,yBAAyB,EACtC,4BAA4B,GAAG,yBAAyB,EACxD,kBAAkB,GAAG,WAAW,EAChC,QAAQ,GACT,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,EAAE;IACpC,OAAO,SAAS;SACb,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;QACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAChE,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,IAAI,IAAI,KAAK,GAAG,MAAM,iBAAiB,EAAE,CAAC;IACxF,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG;;;;;;;CAOpB,CAAC;AAEF,MAAM,0BAA0B,GAAqB,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU,IAAI,yBAAyB;gBAC7C,EAAE,EAAE,4BAA4B;gBAChC,OAAO,EAAE,GAAG,kBAAkB,gBAAgB;gBAC9C,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE;oBACjD,QAAQ,EAAE,QAAQ;oBAClB,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC;oBACnC,IAAI,EAAE,kBAAkB;iBACzB,CAAC;aACH;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,CAAC;AAEtC,eAAe,0BAA0B,CAAC"}

package/lib/templates/resolveForwardDeliveryTemplate.js

@@ -1,67 +1,37 @@
 import { systemLocale } from '@unchainedshop/utils';
-import { getOrderAttachmentsData } from './utils/getOrderAttachmentsData.js';
-import { getOrderPositionsData } from './utils/getOrderPositionsData.js';
-const { EMAIL_FROM, EMAIL_WEBSITE_NAME, ROOT_URL } = process.env;
+import { transformOrderToText } from './order-parser/index.js';
+const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 const textTemplate = `
-  {{subject}}\n
-  \n
-  Order number: {{orderNumber}}\n
-  Order date: {{orderDate}}\n
-  Link: {{adminUILink}}\n
-  \n
-  Delivery address:\n
-  -----------------\n
-  {{address.firstName}} {{address.lastName}}\n
-  {{address.company}}\n
-  {{address.addressLine}}\n
-  {{address.addressLine2}}\n
-  {{address.postalCode}} {{address.city}}\n
-  {{address.regionCode}}\n
-  {{address.countryCode}}\n
-  \n
-  Articles:\n
-  -----------------\n
-  {{#items}}
-  * {{sku}} - {{name}}      CHF {{price}}     {{quantity}}\n
-  {{/items}}
+New Order received:
+
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
 `;
 export const resolveForwardDeliveryTemplate = async ({ config, orderId }, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId });
-    const orderPricing = modules.orders.pricingSheet(order);
-    const orderDate = new Date(order.ordered).toLocaleString();
-    const attachments = await getOrderAttachmentsData(order, { fileType: 'DELIVERY_NOTE' }, context);
-    const address = order.billingAddress;
     const configObject = config.reduce((acc, { key, value }) => {
         return {
             ...acc,
             [key]: value,
         };
     }, {});
-    const subject = `${EMAIL_WEBSITE_NAME}: New Order / ${order.orderNumber}`;
-    const adminUILink = `${ROOT_URL}/orders/view/?_id=${order._id}`;
+    const subject = `${EMAIL_WEBSITE_NAME} Order ${order.orderNumber}`;
     const data = {
-        contact: order.contact || {},
-        adminUILink,
-        items: getOrderPositionsData(order, { locale: systemLocale }, context),
-        orderDate,
-        orderNumber: order.orderNumber,
         shopName: EMAIL_WEBSITE_NAME,
-        subject,
-        total: orderPricing.total({ useNetPrice: false }).amount / 100,
-        ...configObject,
-        address,
+        shopUrl: EMAIL_WEBSITE_URL,
+        orderDetails: await transformOrderToText({ order, locale: systemLocale }, context),
     };
     return [
         {
             type: 'EMAIL',
             input: {
-                from: configObject.from || EMAIL_FROM || 'noreply@unchained.local',
+                from: `${EMAIL_WEBSITE_NAME} <${configObject.from || EMAIL_FROM || 'noreply@unchained.local'}>`,
                 to: configObject.to || 'orders@unchained.local',
                 cc: configObject.cc,
                 subject,
                 text: modules.messaging.renderToText(textTemplate, data),
-                attachments,
             },
         },
     ];

package/lib/templates/resolveForwardDeliveryTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveForwardDeliveryTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveForwardDeliveryTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjE,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;CAsBpB,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAqB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE;IACrG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,CAAC;IAE3D,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;IAEjG,MAAM,OAAO,GAAG,KAAK,CAAC,cAAc,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;QACzD,OAAO;YACL,GAAG,GAAG;YACN,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,GAAG,kBAAkB,iBAAiB,KAAK,CAAC,WAAW,EAAE,CAAC;IAE1E,MAAM,WAAW,GAAG,GAAG,QAAQ,qBAAqB,KAAK,CAAC,GAAG,EAAE,CAAC;IAEhE,MAAM,IAAI,GAAG;QACX,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE;QAC5B,WAAW;QACX,KAAK,EAAE,qBAAqB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC;QACtE,SAAS;QACT,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ,EAAE,kBAAkB;QAC5B,OAAO;QACP,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,GAAG;QAC9D,GAAG,YAAY;QACf,OAAO;KACR,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,UAAU,IAAI,yBAAyB;gBAClE,EAAE,EAAE,YAAY,CAAC,EAAE,IAAI,wBAAwB;gBAC/C,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;gBACxD,WAAW;aACZ;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"resolveForwardDeliveryTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveForwardDeliveryTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1E,MAAM,YAAY,GAAG;;;;;;CAMpB,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAqB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE;IACrG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1D,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;QACzD,OAAO;YACL,GAAG,GAAG;YACN,CAAC,GAAG,CAAC,EAAE,KAAK;SACb,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,GAAG,kBAAkB,UAAU,KAAK,CAAC,WAAW,EAAE,CAAC;IAEnE,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,iBAAiB;QAC1B,YAAY,EAAE,MAAM,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC;KACnF,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,GAAG,kBAAkB,KAAK,YAAY,CAAC,IAAI,IAAI,UAAU,IAAI,yBAAyB,GAAG;gBAC/F,EAAE,EAAE,YAAY,CAAC,EAAE,IAAI,wBAAwB;gBAC/C,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;aACzD;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/templates/resolveOrderConfirmationTemplate.js

@@ -1,84 +1,32 @@
-import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
-import { getOrderAttachmentsData } from './utils/getOrderAttachmentsData.js';
-import { getOrderPositionsData } from './utils/getOrderPositionsData.js';
+import { transformOrderToText } from './order-parser/index.js';
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 const textTemplate = `
-  {{subject}}\n
-  \n
-  {{thankyou}}\n
-  \n
-  -----------------\n
-  {{buttonText}}: {{url}}\n
-  -----------------\n
+Thank you very much for your order.
+
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
 `;
-const texts = {
-    en: {
-        buttonText: 'Follow purchase order status',
-        thankyou: 'Thank you for your order on',
-        subject: `${EMAIL_WEBSITE_NAME}: Order confirmation`,
-    },
-    de: {
-        buttonText: 'Bestellstatus verfolgen',
-        thankyou: 'Vielen Dank für deine Bestellung bei',
-        subject: `${EMAIL_WEBSITE_NAME}: Bestellbestätigung`,
-    },
-    fr: {
-        buttonText: 'Follow purchase order status',
-        thankyou: 'Thank you for your order on',
-        subject: `${EMAIL_WEBSITE_NAME}: Order confirmation`,
-    },
-};
 export const resolveOrderConfirmationTemplate = async ({ orderId, locale }, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId });
     if (order.status === 'PENDING') {
         return [];
     }
-    const formatPrice = (price) => {
-        const fixedPrice = price / 100;
-        return `${order.currency} ${fixedPrice}`;
-    };
-    // TODO: If order.status is PENDING, we should only send the user
-    // a notice that we have received the order but not confirming it
-    const attachments = await getOrderAttachmentsData(order, { fileType: 'ORDER_CONFIRMATION' }, context);
-    const orderPricing = modules.orders.pricingSheet(order);
-    const { subject } = texts[locale.language];
+    const subject = `Order ${order.orderNumber}`;
     const data = {
-        ...texts[locale.language],
         shopName: EMAIL_WEBSITE_NAME,
         shopUrl: EMAIL_WEBSITE_URL,
-        subject,
-        url: `${EMAIL_WEBSITE_URL}/order?_id=${order._id}`,
-        summary: {
-            items: formatPrice(orderPricing.total({
-                category: OrderPricingRowCategory.Items,
-                useNetPrice: false,
-            }).amount),
-            taxes: formatPrice(orderPricing.total({
-                category: OrderPricingRowCategory.Taxes,
-                useNetPrice: false,
-            }).amount),
-            delivery: formatPrice(orderPricing.total({
-                category: OrderPricingRowCategory.Delivery,
-                useNetPrice: false,
-            }).amount),
-            payment: formatPrice(orderPricing.total({
-                category: OrderPricingRowCategory.Payment,
-                useNetPrice: false,
-            }).amount),
-            gross: formatPrice(orderPricing.total({ useNetPrice: false }).amount),
-        },
-        positions: getOrderPositionsData(order, { locale }, context),
+        orderDetails: await transformOrderToText({ order, locale }, context),
     };
     return [
         {
             type: 'EMAIL',
             input: {
-                from: EMAIL_FROM || 'orders@unchained.local',
+                from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
                 to: order.contact.emailAddress,
                 subject,
                 text: modules.messaging.renderToText(textTemplate, data),
-                attachments,
             },
         },
     ];

package/lib/templates/resolveOrderConfirmationTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveOrderConfirmationTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveOrderConfirmationTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1E,MAAM,YAAY,GAAG;;;;;;;;CAQpB,CAAC;AAEF,MAAM,KAAK,GAAG;IACZ,EAAE,EAAE;QACF,UAAU,EAAE,8BAA8B;QAC1C,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,GAAG,kBAAkB,sBAAsB;KACrD;IACD,EAAE,EAAE;QACF,UAAU,EAAE,yBAAyB;QACrC,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE,GAAG,kBAAkB,sBAAsB;KACrD;IACD,EAAE,EAAE;QACF,UAAU,EAAE,8BAA8B;QAC1C,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,GAAG,kBAAkB,sBAAsB;KACrD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAqB,KAAK,EACrE,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,OAAO,EACP,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;QAC9B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;QACpC,MAAM,UAAU,GAAG,KAAK,GAAG,GAAG,CAAC;QAC/B,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,iEAAiE;IACjE,iEAAiE;IACjE,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtG,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,IAAI,GAAG;QACX,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzB,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,iBAAiB;QAC1B,OAAO;QACP,GAAG,EAAE,GAAG,iBAAiB,cAAc,KAAK,CAAC,GAAG,EAAE;QAClD,OAAO,EAAE;YACP,KAAK,EAAE,WAAW,CAChB,YAAY,CAAC,KAAK,CAAC;gBACjB,QAAQ,EAAE,uBAAuB,CAAC,KAAK;gBACvC,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC,MAAM,CACV;YACD,KAAK,EAAE,WAAW,CAChB,YAAY,CAAC,KAAK,CAAC;gBACjB,QAAQ,EAAE,uBAAuB,CAAC,KAAK;gBACvC,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC,MAAM,CACV;YACD,QAAQ,EAAE,WAAW,CACnB,YAAY,CAAC,KAAK,CAAC;gBACjB,QAAQ,EAAE,uBAAuB,CAAC,QAAQ;gBAC1C,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC,MAAM,CACV;YACD,OAAO,EAAE,WAAW,CAClB,YAAY,CAAC,KAAK,CAAC;gBACjB,QAAQ,EAAE,uBAAuB,CAAC,OAAO;gBACzC,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC,MAAM,CACV;YACD,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;SACtE;QACD,SAAS,EAAE,qBAAqB,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;KAC7D,CAAC;IACF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU,IAAI,wBAAwB;gBAC5C,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY;gBAC9B,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;gBACxD,WAAW;aACZ;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"resolveOrderConfirmationTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveOrderConfirmationTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1E,MAAM,YAAY,GAAG;;;;;;CAMpB,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAqB,KAAK,EACrE,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,OAAO,EACP,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;QAC9B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,WAAW,EAAE,CAAC;IAE7C,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,iBAAiB;QAC1B,YAAY,EAAE,MAAM,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;KACrE,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,GAAG,kBAAkB,KAAK,UAAU,IAAI,yBAAyB,GAAG;gBAC1E,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY;gBAC9B,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;aACzD;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/templates/resolveOrderRejectionTemplate.js

@@ -1,47 +1,33 @@
+import { transformOrderToText } from './order-parser/index.js';
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 const textTemplate = `
-  {{subject}}\n
-  \n
-  {{rejection}}\n
-  \n
-  -----------------\n
-  {{buttonText}}: {{url}}\n
-  -----------------\n
+I'm sorry we can't confirm your order.
+
+This can happen when the payment was not successful or the order was manually canceled because of product availability or fullfillment issues.
+
+The order in question is:
+
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
 `;
-const texts = {
-    en: {
-        buttonText: 'Details are available at',
-        rejection: 'Your order was cancelled.',
-        subject: `${EMAIL_WEBSITE_NAME}: Order cancelled`,
-    },
-    de: {
-        buttonText: 'Details abrufen',
-        rejection: 'Deine Bestellung wurde storniert',
-        subject: `${EMAIL_WEBSITE_NAME}: Bestellung storniert`,
-    },
-    fr: {
-        buttonText: 'Details are available at',
-        rejection: 'Your order was cancelled.',
-        subject: `${EMAIL_WEBSITE_NAME}: Order cancelled`,
-    },
-};
 export const resolveOrderRejectionTemplate = async ({ orderId, locale }, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId });
     if (order.status !== 'REJECTED') {
         return [];
     }
-    const { subject } = texts[locale.language];
+    const subject = `Order rejected ${order.orderNumber}`;
     const data = {
-        ...texts[locale.language],
-        subject,
-        url: `${EMAIL_WEBSITE_URL}/order?_id=${order._id}`,
+        shopName: EMAIL_WEBSITE_NAME,
+        shopUrl: EMAIL_WEBSITE_URL,
+        orderDetails: await transformOrderToText({ order, locale }, context),
     };
     return [
         {
             type: 'EMAIL',
             input: {
-                from: EMAIL_FROM || 'orders@unchained.local',
+                from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
                 to: order.contact.emailAddress,
                 subject,
                 text: modules.messaging.renderToText(textTemplate, data),

package/lib/templates/resolveOrderRejectionTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveOrderRejectionTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveOrderRejectionTemplate.ts"],"names":[],"mappings":"AAEA,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1E,MAAM,YAAY,GAAG;;;;;;;;CAQpB,CAAC;AAEF,MAAM,KAAK,GAAG;IACZ,EAAE,EAAE;QACF,UAAU,EAAE,0BAA0B;QACtC,SAAS,EAAE,2BAA2B;QACtC,OAAO,EAAE,GAAG,kBAAkB,mBAAmB;KAClD;IACD,EAAE,EAAE;QACF,UAAU,EAAE,iBAAiB;QAC7B,SAAS,EAAE,kCAAkC;QAC7C,OAAO,EAAE,GAAG,kBAAkB,wBAAwB;KACvD;IACD,EAAE,EAAE;QACF,UAAU,EAAE,0BAA0B;QACtC,SAAS,EAAE,2BAA2B;QACtC,OAAO,EAAE,GAAG,kBAAkB,mBAAmB;KAClD;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAqB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE;IACpG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU,EAAE;QAC/B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,IAAI,GAAG;QACX,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzB,OAAO;QACP,GAAG,EAAE,GAAG,iBAAiB,cAAc,KAAK,CAAC,GAAG,EAAE;KACnD,CAAC;IACF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,UAAU,IAAI,wBAAwB;gBAC5C,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY;gBAC9B,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;aACzD;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"resolveOrderRejectionTemplate.js","sourceRoot":"","sources":["../../src/templates/resolveOrderRejectionTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1E,MAAM,YAAY,GAAG;;;;;;;;;;CAUpB,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAqB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE;IACpG,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU,EAAE;QAC/B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,kBAAkB,KAAK,CAAC,WAAW,EAAE,CAAC;IAEtD,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,iBAAiB;QAC1B,YAAY,EAAE,MAAM,oBAAoB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC;KACrE,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACL,IAAI,EAAE,GAAG,kBAAkB,KAAK,UAAU,IAAI,yBAAyB,GAAG;gBAC1E,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY;gBAC9B,OAAO;gBACP,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC;aACzD;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/platform",
-  "version": "2.5.8",
+  "version": "2.5.9",
   "main": "lib/platform-index.js",
   "exports": {
     ".": "./lib/platform-index.js",
@@ -31,22 +31,22 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/api": "^2.5.8",
-    "@unchainedshop/core": "^2.5.8",
-    "@unchainedshop/events": "^2.5.8",
-    "@unchainedshop/file-upload": "^2.5.8",
-    "@unchainedshop/logger": "^2.5.8",
-    "@unchainedshop/mongodb": "^2.5.8",
-    "@unchainedshop/plugins": "^2.5.8",
-    "@unchainedshop/roles": "^2.5.8",
-    "@unchainedshop/utils": "^2.5.8",
+    "@unchainedshop/api": "^2.5.9",
+    "@unchainedshop/core": "^2.5.9",
+    "@unchainedshop/events": "^2.5.9",
+    "@unchainedshop/file-upload": "^2.5.9",
+    "@unchainedshop/logger": "^2.5.9",
+    "@unchainedshop/mongodb": "^2.5.9",
+    "@unchainedshop/plugins": "^2.5.9",
+    "@unchainedshop/roles": "^2.5.9",
+    "@unchainedshop/utils": "^2.5.9",
     "event-iterator": "^2.0.0",
     "JSONStream": "^1.3.5",
     "moniker": "0.1.2"
   },
   "devDependencies": {
-    "@types/node": "^18.18.8",
-    "@unchainedshop/types": "^2.5.8",
+    "@types/node": "^20.9.0",
+    "@unchainedshop/types": "^2.5.9",
     "cross-env": "^7.0.3",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",

package/src/templates/order-parser/formatAddress.ts

@@ -0,0 +1,15 @@
+import { Address } from '@unchainedshop/types/common.js';
+
+export const formatAddress = (address: Address) => {
+  return [
+    [address.firstName, address.lastName].filter(Boolean).join(' '),
+    address.company,
+    address.addressLine,
+    address.addressLine2,
+    [address.postalCode, address.city].filter(Boolean).join(' '),
+    address.regionCode,
+    [address.countryCode].filter(Boolean).join(''),
+  ]
+    .filter(Boolean)
+    .join('\n');
+};

package/src/templates/order-parser/formatPrice.ts

@@ -0,0 +1,6 @@
+export const formatPrice = ({ amount, currency }: { amount: number; currency: string }) => {
+  const fixedPrice = amount / 100;
+  return `${currency} ${fixedPrice}`;
+};
+
+export default formatPrice;

package/src/templates/{utils → order-parser}/getOrderPositionsData.ts

@@ -1,6 +1,7 @@
 import { Locale } from '@unchainedshop/types/common.js';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
 import { Order } from '@unchainedshop/types/orders.js';
+import formatPrice from './formatPrice.js';
 
 export const getOrderPositionsData = async (
   order: Order,
@@ -12,12 +13,7 @@ export const getOrderPositionsData = async (
     orderId: order._id,
   });
 
-  const formatPrice = (price: number) => {
-    const fixedPrice = price / 100;
-    return `${order.currency} ${fixedPrice}`;
-  };
-
-  await Promise.all(
+  return Promise.all(
     orderPositions.map(async (orderPosition) => {
       const productTexts = await modules.products.texts.findLocalizedText({
         productId: orderPosition.productId,
@@ -28,18 +24,21 @@ export const getOrderPositionsData = async (
         locale: params.locale?.normalized,
       });
 
-      const productTitle = productTexts?.title; // deprecated
-
       const positionPricing = modules.orders.positions.pricingSheet(
         orderPosition,
         order.currency,
         context,
       );
-      const total = formatPrice(positionPricing.sum());
+      const total = formatPrice({
+        amount: positionPricing.sum(),
+        currency: order.currency,
+      });
+
       const { quantity } = positionPricing;
       return {
+        productId: orderPosition.productId,
+        configuration: orderPosition.configuration,
         originalProductTexts,
-        product: productTitle,
         productTexts,
         quantity,
         total,

package/src/templates/order-parser/getOrderSummaryData.ts

@@ -0,0 +1,76 @@
+import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { Order } from '@unchainedshop/types/orders.js';
+import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
+import { Locale } from '@unchainedshop/types/common.js';
+import formatPrice from './formatPrice.js';
+import { formatAddress } from './formatAddress.js';
+
+export const getOrderSummaryData = async (
+  order: Order,
+  params: { locale?: Locale },
+  context: UnchainedCore,
+) => {
+  const { modules } = context;
+  const orderDelivery = await modules.orders.deliveries.findDelivery({
+    orderDeliveryId: order.deliveryId,
+  });
+  const orderPayment = await modules.orders.payments.findOrderPayment({
+    orderPaymentId: order.paymentId,
+  });
+  const paymentProvider = await modules.payment.paymentProviders.findProvider({
+    paymentProviderId: orderPayment.paymentProviderId,
+  });
+  const deliveryProvider = await modules.delivery.findProvider({
+    deliveryProviderId: orderDelivery.deliveryProviderId,
+  });
+
+  const deliveryAddress = formatAddress(orderDelivery?.context?.deliveryAddress || order.billingAddress);
+  const billingAddress = formatAddress(order.billingAddress);
+  const orderPricing = modules.orders.pricingSheet(order);
+
+  const paymentTotal = orderPricing.total({
+    category: OrderPricingRowCategory.Payment,
+    useNetPrice: false,
+  });
+
+  const deliveryTotal = orderPricing.total({
+    category: OrderPricingRowCategory.Delivery,
+    useNetPrice: false,
+  });
+
+  const taxesTotal = orderPricing.total({
+    category: OrderPricingRowCategory.Taxes,
+    useNetPrice: false,
+  });
+
+  const itemsTotal = orderPricing.total({
+    category: OrderPricingRowCategory.Items,
+    useNetPrice: false,
+  });
+
+  const total = orderPricing.total({ useNetPrice: false });
+
+  const payment = paymentProvider.adapterKey;
+  const delivery = deliveryProvider.adapterKey;
+
+  return {
+    rawPrices: {
+      items: itemsTotal,
+      taxes: taxesTotal,
+      delivery: deliveryTotal,
+      payment: paymentTotal,
+      gross: total,
+    },
+    prices: {
+      items: formatPrice(itemsTotal),
+      taxes: formatPrice(taxesTotal),
+      delivery: formatPrice(deliveryTotal),
+      payment: formatPrice(paymentTotal),
+      gross: formatPrice(total),
+    },
+    payment,
+    delivery,
+    deliveryAddress,
+    billingAddress,
+  };
+};

package/src/templates/order-parser/index.ts

@@ -0,0 +1,44 @@
+import { getOrderPositionsData } from './getOrderPositionsData.js';
+import { getOrderSummaryData } from './getOrderSummaryData.js';
+
+const textTemplate = `Order number: {{orderNumber}}
+Ordered: {{orderDate}}
+Payment method: {{summary.payment}}
+Delivery method: {{summary.delivery}}
+
+Delivery address:
+{{summary.deliveryAddress}}
+
+Billing address:
+{{summary.billingAddress}}
+
+Order Details:
+
+Items:
+{{#positions}}
+* {{quantity}} {{productTexts.title}}: {{total}}
+{{/positions}}
+
+{{#summary.rawPrices.delivery.amount}}
+Delivery Fees: {{summary.prices.delivery}}
+{{/summary.rawPrices.delivery.amount}}
+{{#summary.rawPrices.payment.amount}}
+Payment Fees: {{summary.prices.payment}}
+{{/summary.rawPrices.payment.amount}}
+Total: {{summary.prices.gross}}
+{{#summary.rawPrices.taxes.amount}}
+(VAT included: {{summary.prices.taxes}})
+{{/summary.rawPrices.taxes.amount}}
+`;
+
+export const transformOrderToText = async ({ order, locale }, context) => {
+  const { modules } = context;
+  const data = {
+    orderDate: new Date(order.ordered).toLocaleString(),
+    orderNumber: order.orderNumber,
+    summary: await getOrderSummaryData(order, { locale }, context),
+    positions: await getOrderPositionsData(order, { locale }, context),
+  };
+
+  return modules.messaging.renderToText(textTemplate, data);
+};

package/src/templates/resolveErrorReportTemplate.ts

@@ -1,5 +1,5 @@
 import { TemplateResolver } from '@unchainedshop/types/messaging.js';
-import formatWorkItems from './utils/formatWorkItems.js';
+import util from 'util';
 
 const {
   EMAIL_FROM = 'noreply@unchained.local',
@@ -8,6 +8,15 @@ const {
   ROOT_URL,
 } = process.env;
 
+const formatWorkItems = (workItems) => {
+  return workItems
+    .map(({ _id, type, started, error }) => {
+      const stringifiedErrors = util.inspect(error, false, 10, false);
+      return `${new Date(started).toLocaleString()} ${type} (${_id}): ${stringifiedErrors}`;
+    })
+    .join('\n');
+};
+
 const textTemplate = `
 -------------------------
 Unchained Endpoint: {{endpoint}}

package/src/templates/resolveForwardDeliveryTemplate.ts

@@ -1,44 +1,21 @@
 import { TemplateResolver } from '@unchainedshop/types/messaging.js';
 import { systemLocale } from '@unchainedshop/utils';
-import { getOrderAttachmentsData } from './utils/getOrderAttachmentsData.js';
-import { getOrderPositionsData } from './utils/getOrderPositionsData.js';
+import { transformOrderToText } from './order-parser/index.js';
 
-const { EMAIL_FROM, EMAIL_WEBSITE_NAME, ROOT_URL } = process.env;
+const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
 const textTemplate = `
-  {{subject}}\n
-  \n
-  Order number: {{orderNumber}}\n
-  Order date: {{orderDate}}\n
-  Link: {{adminUILink}}\n
-  \n
-  Delivery address:\n
-  -----------------\n
-  {{address.firstName}} {{address.lastName}}\n
-  {{address.company}}\n
-  {{address.addressLine}}\n
-  {{address.addressLine2}}\n
-  {{address.postalCode}} {{address.city}}\n
-  {{address.regionCode}}\n
-  {{address.countryCode}}\n
-  \n
-  Articles:\n
-  -----------------\n
-  {{#items}}
-  * {{sku}} - {{name}}      CHF {{price}}     {{quantity}}\n
-  {{/items}}
+New Order received:
+
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
 `;
 
 export const resolveForwardDeliveryTemplate: TemplateResolver = async ({ config, orderId }, context) => {
   const { modules } = context;
   const order = await modules.orders.findOrder({ orderId });
-  const orderPricing = modules.orders.pricingSheet(order);
-
-  const orderDate = new Date(order.ordered).toLocaleString();
 
-  const attachments = await getOrderAttachmentsData(order, { fileType: 'DELIVERY_NOTE' }, context);
-
-  const address = order.billingAddress;
   const configObject = config.reduce((acc, { key, value }) => {
     return {
       ...acc,
@@ -46,33 +23,23 @@ export const resolveForwardDeliveryTemplate: TemplateResolver = async ({ config,
     };
   }, {});
 
-  const subject = `${EMAIL_WEBSITE_NAME}: New Order / ${order.orderNumber}`;
-
-  const adminUILink = `${ROOT_URL}/orders/view/?_id=${order._id}`;
+  const subject = `${EMAIL_WEBSITE_NAME} Order ${order.orderNumber}`;
 
   const data = {
-    contact: order.contact || {},
-    adminUILink,
-    items: getOrderPositionsData(order, { locale: systemLocale }, context),
-    orderDate,
-    orderNumber: order.orderNumber,
     shopName: EMAIL_WEBSITE_NAME,
-    subject,
-    total: orderPricing.total({ useNetPrice: false }).amount / 100,
-    ...configObject,
-    address,
+    shopUrl: EMAIL_WEBSITE_URL,
+    orderDetails: await transformOrderToText({ order, locale: systemLocale }, context),
   };
 
   return [
     {
       type: 'EMAIL',
       input: {
-        from: configObject.from || EMAIL_FROM || 'noreply@unchained.local',
+        from: `${EMAIL_WEBSITE_NAME} <${configObject.from || EMAIL_FROM || 'noreply@unchained.local'}>`,
         to: configObject.to || 'orders@unchained.local',
         cc: configObject.cc,
         subject,
         text: modules.messaging.renderToText(textTemplate, data),
-        attachments,
       },
     },
   ];

package/src/templates/resolveOrderConfirmationTemplate.ts

@@ -1,37 +1,15 @@
 import { TemplateResolver } from '@unchainedshop/types/messaging.js';
-import { OrderPricingRowCategory } from '@unchainedshop/types/orders.pricing.js';
-import { getOrderAttachmentsData } from './utils/getOrderAttachmentsData.js';
-import { getOrderPositionsData } from './utils/getOrderPositionsData.js';
+import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
 const textTemplate = `
-  {{subject}}\n
-  \n
-  {{thankyou}}\n
-  \n
-  -----------------\n
-  {{buttonText}}: {{url}}\n
-  -----------------\n
-`;
+Thank you very much for your order.
 
-const texts = {
-  en: {
-    buttonText: 'Follow purchase order status',
-    thankyou: 'Thank you for your order on',
-    subject: `${EMAIL_WEBSITE_NAME}: Order confirmation`,
-  },
-  de: {
-    buttonText: 'Bestellstatus verfolgen',
-    thankyou: 'Vielen Dank für deine Bestellung bei',
-    subject: `${EMAIL_WEBSITE_NAME}: Bestellbestätigung`,
-  },
-  fr: {
-    buttonText: 'Follow purchase order status',
-    thankyou: 'Thank you for your order on',
-    subject: `${EMAIL_WEBSITE_NAME}: Order confirmation`,
-  },
-};
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
+`;
 
 export const resolveOrderConfirmationTemplate: TemplateResolver = async (
   { orderId, locale },
@@ -44,63 +22,22 @@ export const resolveOrderConfirmationTemplate: TemplateResolver = async (
     return [];
   }
 
-  const formatPrice = (price: number) => {
-    const fixedPrice = price / 100;
-    return `${order.currency} ${fixedPrice}`;
-  };
-
-  // TODO: If order.status is PENDING, we should only send the user
-  // a notice that we have received the order but not confirming it
-  const attachments = await getOrderAttachmentsData(order, { fileType: 'ORDER_CONFIRMATION' }, context);
-
-  const orderPricing = modules.orders.pricingSheet(order);
-
-  const { subject } = texts[locale.language];
+  const subject = `Order ${order.orderNumber}`;
 
   const data = {
-    ...texts[locale.language],
     shopName: EMAIL_WEBSITE_NAME,
     shopUrl: EMAIL_WEBSITE_URL,
-    subject,
-    url: `${EMAIL_WEBSITE_URL}/order?_id=${order._id}`,
-    summary: {
-      items: formatPrice(
-        orderPricing.total({
-          category: OrderPricingRowCategory.Items,
-          useNetPrice: false,
-        }).amount,
-      ),
-      taxes: formatPrice(
-        orderPricing.total({
-          category: OrderPricingRowCategory.Taxes,
-          useNetPrice: false,
-        }).amount,
-      ),
-      delivery: formatPrice(
-        orderPricing.total({
-          category: OrderPricingRowCategory.Delivery,
-          useNetPrice: false,
-        }).amount,
-      ),
-      payment: formatPrice(
-        orderPricing.total({
-          category: OrderPricingRowCategory.Payment,
-          useNetPrice: false,
-        }).amount,
-      ),
-      gross: formatPrice(orderPricing.total({ useNetPrice: false }).amount),
-    },
-    positions: getOrderPositionsData(order, { locale }, context),
+    orderDetails: await transformOrderToText({ order, locale }, context),
   };
+
   return [
     {
       type: 'EMAIL',
       input: {
-        from: EMAIL_FROM || 'orders@unchained.local',
+        from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
         to: order.contact.emailAddress,
         subject,
         text: modules.messaging.renderToText(textTemplate, data),
-        attachments,
       },
     },
   ];

package/src/templates/resolveOrderRejectionTemplate.ts

@@ -1,34 +1,19 @@
 import { TemplateResolver } from '@unchainedshop/types/messaging.js';
+import { transformOrderToText } from './order-parser/index.js';
 
 const { EMAIL_FROM, EMAIL_WEBSITE_NAME, EMAIL_WEBSITE_URL } = process.env;
 
 const textTemplate = `
-  {{subject}}\n
-  \n
-  {{rejection}}\n
-  \n
-  -----------------\n
-  {{buttonText}}: {{url}}\n
-  -----------------\n
-`;
+I'm sorry we can't confirm your order.
 
-const texts = {
-  en: {
-    buttonText: 'Details are available at',
-    rejection: 'Your order was cancelled.',
-    subject: `${EMAIL_WEBSITE_NAME}: Order cancelled`,
-  },
-  de: {
-    buttonText: 'Details abrufen',
-    rejection: 'Deine Bestellung wurde storniert',
-    subject: `${EMAIL_WEBSITE_NAME}: Bestellung storniert`,
-  },
-  fr: {
-    buttonText: 'Details are available at',
-    rejection: 'Your order was cancelled.',
-    subject: `${EMAIL_WEBSITE_NAME}: Order cancelled`,
-  },
-};
+This can happen when the payment was not successful or the order was manually canceled because of product availability or fullfillment issues.
+
+The order in question is:
+
+{{orderDetails}}
+
+{{shopName}}: {{shopUrl}}
+`;
 
 export const resolveOrderRejectionTemplate: TemplateResolver = async ({ orderId, locale }, context) => {
   const { modules } = context;
@@ -38,18 +23,19 @@ export const resolveOrderRejectionTemplate: TemplateResolver = async ({ orderId,
     return [];
   }
 
-  const { subject } = texts[locale.language];
+  const subject = `Order rejected ${order.orderNumber}`;
 
   const data = {
-    ...texts[locale.language],
-    subject,
-    url: `${EMAIL_WEBSITE_URL}/order?_id=${order._id}`,
+    shopName: EMAIL_WEBSITE_NAME,
+    shopUrl: EMAIL_WEBSITE_URL,
+    orderDetails: await transformOrderToText({ order, locale }, context),
   };
+
   return [
     {
       type: 'EMAIL',
       input: {
-        from: EMAIL_FROM || 'orders@unchained.local',
+        from: `${EMAIL_WEBSITE_NAME} <${EMAIL_FROM || 'noreply@unchained.local'}>`,
         to: order.contact.emailAddress,
         subject,
         text: modules.messaging.renderToText(textTemplate, data),

package/lib/templates/utils/formatWorkItems.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (workItems: any) => any;
-export default _default;

package/lib/templates/utils/formatWorkItems.js

@@ -1,10 +0,0 @@
-import util from 'util';
-export default (workItems) => {
-    return workItems
-        .map(({ _id, type, started, error }) => {
-        const stringifiedErrors = util.inspect(error, false, 10, false);
-        return `${new Date(started).toLocaleString()} ${type} (${_id}): ${stringifiedErrors}`;
-    })
-        .join('\n');
-};
-//# sourceMappingURL=formatWorkItems.js.map

package/lib/templates/utils/formatWorkItems.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"formatWorkItems.js","sourceRoot":"","sources":["../../../src/templates/utils/formatWorkItems.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,eAAe,CAAC,SAAS,EAAE,EAAE;IAC3B,OAAO,SAAS;SACb,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;QACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAChE,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,IAAI,IAAI,KAAK,GAAG,MAAM,iBAAiB,EAAE,CAAC;IACxF,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}

package/lib/templates/utils/getOrderAttachmentsData.d.ts

@@ -1,8 +0,0 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
-export declare const getOrderAttachmentsData: (order: Order, params: {
-    fileType: string;
-}, { modules }: UnchainedCore) => Promise<{
-    filename: string;
-    path: any;
-}[]>;

package/lib/templates/utils/getOrderAttachmentsData.js

@@ -1,21 +0,0 @@
-export const getOrderAttachmentsData = async (order, params, { modules }) => {
-    const attachments = [];
-    const orderFiles = await modules.files.findFiles({ 'meta.orderId': order._id, 'meta.type': params.fileType }, { limit: 1 });
-    attachments.concat(orderFiles);
-    const payment = await modules.orders.payments.findOrderPayment({
-        orderPaymentId: order.paymentId,
-    }, { limit: 1 });
-    if (modules.orders.payments.isBlockingOrderFullfillment(payment)) {
-        const invoices = await modules.files.findFiles({ 'meta.orderId': order._id, 'meta.type': 'INVOICE' }, { limit: 1 });
-        attachments.concat(invoices);
-    }
-    else {
-        const receipts = await modules.files.findFiles({ 'meta.orderId': order._id, 'meta.type': 'RECEIPT' }, { limit: 1 });
-        attachments.concat(receipts);
-    }
-    return attachments.map((file) => ({
-        filename: `${order.orderNumber}_${file.name}`,
-        path: file.path,
-    }));
-};
-//# sourceMappingURL=getOrderAttachmentsData.js.map

package/lib/templates/utils/getOrderAttachmentsData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOrderAttachmentsData.js","sourceRoot":"","sources":["../../../src/templates/utils/getOrderAttachmentsData.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,KAAY,EACZ,MAA4B,EAC5B,EAAE,OAAO,EAAiB,EAC1B,EAAE;IACF,MAAM,WAAW,GAAG,EAAE,CAAC;IAEvB,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAC9C,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,EAC3D,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;IACF,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAC5D;QACE,cAAc,EAAE,KAAK,CAAC,SAAS;KAChC,EACD,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,OAAO,CAAC,EAAE;QAChE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAC5C,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,EACrD,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;QACF,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;KAC9B;SAAM;QACL,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAC5C,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,EACrD,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;QACF,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;KAC9B;IAED,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChC,QAAQ,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE;QAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC,CAAC;AACN,CAAC,CAAC"}

package/lib/templates/utils/getOrderPositionsData.d.ts

@@ -1,6 +0,0 @@
-import { Locale } from '@unchainedshop/types/common.js';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
-export declare const getOrderPositionsData: (order: Order, params: {
-    locale?: Locale;
-}, context: UnchainedCore) => Promise<void>;

package/lib/templates/utils/getOrderPositionsData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOrderPositionsData.js","sourceRoot":"","sources":["../../../src/templates/utils/getOrderPositionsData.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,KAAY,EACZ,MAA2B,EAC3B,OAAsB,EACtB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;QACvE,OAAO,EAAE,KAAK,CAAC,GAAG;KACnB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;QACpC,MAAM,UAAU,GAAG,KAAK,GAAG,GAAG,CAAC;QAC/B,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACzC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAClE,SAAS,EAAE,aAAa,CAAC,SAAS;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU;SAClC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC1E,SAAS,EAAE,aAAa,CAAC,iBAAiB;YAC1C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU;SAClC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,YAAY,EAAE,KAAK,CAAC,CAAC,aAAa;QAEvD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAC3D,aAAa,EACb,KAAK,CAAC,QAAQ,EACd,OAAO,CACR,CAAC;QACF,MAAM,KAAK,GAAG,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;QACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,OAAO;YACL,oBAAoB;YACpB,OAAO,EAAE,YAAY;YACrB,YAAY;YACZ,QAAQ;YACR,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC"}

package/src/templates/utils/formatWorkItems.ts

@@ -1,10 +0,0 @@
-import util from 'util';
-
-export default (workItems) => {
-  return workItems
-    .map(({ _id, type, started, error }) => {
-      const stringifiedErrors = util.inspect(error, false, 10, false);
-      return `${new Date(started).toLocaleString()} ${type} (${_id}): ${stringifiedErrors}`;
-    })
-    .join('\n');
-};

package/src/templates/utils/getOrderAttachmentsData.ts

@@ -1,40 +0,0 @@
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { Order } from '@unchainedshop/types/orders.js';
-
-export const getOrderAttachmentsData = async (
-  order: Order,
-  params: { fileType: string },
-  { modules }: UnchainedCore,
-) => {
-  const attachments = [];
-
-  const orderFiles = await modules.files.findFiles(
-    { 'meta.orderId': order._id, 'meta.type': params.fileType },
-    { limit: 1 },
-  );
-  attachments.concat(orderFiles);
-  const payment = await modules.orders.payments.findOrderPayment(
-    {
-      orderPaymentId: order.paymentId,
-    },
-    { limit: 1 },
-  );
-  if (modules.orders.payments.isBlockingOrderFullfillment(payment)) {
-    const invoices = await modules.files.findFiles(
-      { 'meta.orderId': order._id, 'meta.type': 'INVOICE' },
-      { limit: 1 },
-    );
-    attachments.concat(invoices);
-  } else {
-    const receipts = await modules.files.findFiles(
-      { 'meta.orderId': order._id, 'meta.type': 'RECEIPT' },
-      { limit: 1 },
-    );
-    attachments.concat(receipts);
-  }
-
-  return attachments.map((file) => ({
-    filename: `${order.orderNumber}_${file.name}`,
-    path: file.path,
-  }));
-};