includio-cms 0.28.0 → 0.34.0

package/dist/shop/server/orders.js

@@ -1,4 +1,4 @@
-import { and, asc, desc, eq, inArray, isNull, lt, sql } from 'drizzle-orm';
+import { and, asc, desc, eq, ilike, inArray, isNotNull, isNull, lt, or, sql } from 'drizzle-orm';
 import { shopOrderItemsTable, shopOrderStatusHistoryTable, shopOrdersTable, shopProductVariantsTable, shopProductsTable, shopShippingMethodsTable, shopStockReservationsTable } from '../../db-postgres/schema/shop/index.js';
 import { getCMS } from '../../core/cms.js';
 import { getShopDb, requireShopConfig } from './db.js';
@@ -9,7 +9,7 @@ import { sendLowStockEmail, sendOrderStatusEmail } from './email.js';
 import { isPaymentMethodAllowed } from './payment-compat.js';
 import { isVariantExpired, VariantExpiredError } from '../expiry.js';
 import { resolvePaymentAmount } from './payment-policy.js';
-import { maybeIssueInvoiceForOrder } from './invoices.js';
+import { getInvoiceByOrderId, maybeIssueInvoiceForOrder } from './invoices.js';
 import { CouponError, recordCouponRedemption, releaseCouponSlot, reserveCouponSlot, validateCoupon } from './coupons.js';
 /**
  * @public
@@ -27,6 +27,55 @@ export class MixedPaymentPolicyError extends Error {
     }
 }
 const STOCK_RESERVATION_TTL_MINUTES = 30;
+/**
+ * @public
+ * Order statuses an admin is allowed to soft-delete (hide from the admin list).
+ * Restricted to states that never carry a settled payment or an issued invoice,
+ * so hiding one can't bury accounting/audit data. Paid-or-later and `refunded`
+ * orders are never deletable. The invoice guard in `softDeleteOrder` is the
+ * second line of defence.
+ */
+export const DELETABLE_ORDER_STATUSES = new Set([
+    'new',
+    'awaitingPayment',
+    'cancelled',
+    'paymentRejected'
+]);
+/** @public Pure status-level deletability check (no DB / invoice lookup). */
+export function isOrderDeletable(status) {
+    return DELETABLE_ORDER_STATUSES.has(status);
+}
+/**
+ * @public
+ * Pure decision: may this order be soft-deleted? Encodes both guards (status +
+ * existing invoice) so they're testable without a DB. `invoice` is the order's
+ * current invoice record (or null). An `issued`/`sent` invoice hard-blocks the
+ * delete; `pending`/`failed` invoices don't (no legal document was produced).
+ */
+export function decideOrderDeletion(status, invoice) {
+    if (!isOrderDeletable(status))
+        return { ok: false, reason: 'status' };
+    if (invoice && (invoice.status === 'issued' || invoice.status === 'sent')) {
+        return { ok: false, reason: 'invoice' };
+    }
+    return { ok: true };
+}
+/**
+ * @public
+ * Thrown by `softDeleteOrder` when the order can't be hidden: either its status
+ * isn't in {@link DELETABLE_ORDER_STATUSES} or it already has an issued invoice.
+ */
+export class OrderNotDeletableError extends Error {
+    reason;
+    code = 'ORDER_NOT_DELETABLE';
+    constructor(reason) {
+        super(reason === 'invoice'
+            ? 'Order has an issued invoice and cannot be deleted.'
+            : 'Order status does not allow deletion.');
+        this.reason = reason;
+        this.name = 'OrderNotDeletableError';
+    }
+}
 async function purgeExpiredReservations() {
     const db = getShopDb();
     await db
@@ -361,9 +410,18 @@ export async function updateOrderStatus(orderId, status, opts = {}) {
         })
             .where(eq(shopOrdersTable.id, orderId));
     }
+    // Auto-restore: a soft-deleted order may only sit in a deletable status. If
+    // it transitions out of that set (e.g. a late payment webhook flips a hidden
+    // `awaitingPayment` order to `paid`), un-hide it so settled orders are never
+    // buried in the trash.
+    const autoRestore = order.deletedAt != null && !isOrderDeletable(status);
     await db
         .update(shopOrdersTable)
-        .set({ status, updatedAt: new Date() })
+        .set({
+        status,
+        updatedAt: new Date(),
+        ...(autoRestore ? { deletedAt: null, deletedBy: null } : {})
+    })
         .where(eq(shopOrdersTable.id, orderId));
     await db.insert(shopOrderStatusHistoryTable).values({
         orderId,
@@ -439,6 +497,14 @@ export async function updateOrderStatus(orderId, status, opts = {}) {
     // the guard inside skips deposit orders that still owe a balance.
     if (status === 'paid')
         void maybeIssueInvoiceForOrder(orderId);
+    // User-land `onOrderPaid` hook — fires on transition INTO `paid` only
+    // (no-op when oldStatus === 'paid'). Errors swallowed so a buggy callback
+    // never blocks the webhook / status write.
+    if (order.status !== 'paid' && status === 'paid' && shop.onOrderPaid && updated) {
+        Promise.resolve(shop.onOrderPaid(updated)).catch((e) => {
+            console.error('[onOrderPaid] callback failed', e);
+        });
+    }
     return updated;
 }
 /**
@@ -533,7 +599,12 @@ export async function getOrderById(id) {
 }
 export async function getOrderByNumber(number) {
     const db = getShopDb();
-    const [row] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.number, number));
+    // Customer-facing lookup — a soft-deleted order must not resolve on the
+    // storefront. (Admin uses getOrderById, which intentionally ignores deletedAt.)
+    const [row] = await db
+        .select()
+        .from(shopOrdersTable)
+        .where(and(eq(shopOrdersTable.number, number), isNull(shopOrdersTable.deletedAt)));
     return row ?? null;
 }
 export async function getOrderItems(orderId) {
@@ -548,16 +619,28 @@ export async function getOrderStatusHistory(orderId) {
         .where(eq(shopOrderStatusHistoryTable.orderId, orderId))
         .orderBy(asc(shopOrderStatusHistoryTable.changedAt));
 }
-export async function listOrders(opts = {}) {
-    const db = getShopDb();
+function escapeLike(value) {
+    return value.replace(/[\\%_]/g, (m) => `\\${m}`);
+}
+function buildOrderListConditions(opts) {
     const conditions = [];
+    const deleted = opts.deleted ?? 'exclude';
+    if (deleted === 'exclude')
+        conditions.push(isNull(shopOrdersTable.deletedAt));
+    else if (deleted === 'only')
+        conditions.push(isNotNull(shopOrdersTable.deletedAt));
     if (opts.status)
         conditions.push(eq(shopOrdersTable.status, opts.status));
-    if (opts.email)
-        conditions.push(eq(shopOrdersTable.customerEmail, opts.email));
-    // Exclude soft-deleted if such a column existed; none now
-    // Avoid unused import warning
-    void isNull;
+    const search = opts.search?.trim();
+    if (search) {
+        const pattern = `%${escapeLike(search)}%`;
+        conditions.push(or(ilike(shopOrdersTable.number, pattern), ilike(shopOrdersTable.customerEmail, pattern), ilike(shopOrdersTable.customerName, pattern)));
+    }
+    return conditions;
+}
+export async function listOrders(opts = {}) {
+    const db = getShopDb();
+    const conditions = buildOrderListConditions(opts);
     const where = conditions.length > 0 ? and(...conditions) : undefined;
     return db
         .select()
@@ -569,11 +652,7 @@ export async function listOrders(opts = {}) {
 }
 export async function countOrders(opts = {}) {
     const db = getShopDb();
-    const conditions = [];
-    if (opts.status)
-        conditions.push(eq(shopOrdersTable.status, opts.status));
-    if (opts.email)
-        conditions.push(eq(shopOrdersTable.customerEmail, opts.email));
+    const conditions = buildOrderListConditions(opts);
     const where = conditions.length > 0 ? and(...conditions) : undefined;
     const [row] = await db
         .select({ count: sql `count(*)::int` })
@@ -581,3 +660,53 @@ export async function countOrders(opts = {}) {
         .where(where);
     return row?.count ?? 0;
 }
+/**
+ * @public
+ * Soft-delete an order: hide it from the admin/customer list without removing
+ * the row (accounting/audit safety). Idempotent — a no-op on an already-deleted
+ * order. Guards on {@link decideOrderDeletion}: throws {@link OrderNotDeletableError}
+ * when the status isn't deletable or an issued/sent invoice exists. Releases any
+ * active stock reservation immediately so a hidden, abandoned order never locks
+ * stock waiting for the TTL.
+ */
+export async function softDeleteOrder(orderId, deletedBy) {
+    const db = getShopDb();
+    const [order] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, orderId));
+    if (!order)
+        throw new Error('Order not found');
+    if (order.deletedAt)
+        return order;
+    const invoice = await getInvoiceByOrderId(orderId);
+    const decision = decideOrderDeletion(order.status, invoice);
+    if (!decision.ok)
+        throw new OrderNotDeletableError(decision.reason);
+    // Free held stock right away (no rows when the stock feature is off).
+    await db
+        .delete(shopStockReservationsTable)
+        .where(eq(shopStockReservationsTable.orderId, orderId));
+    await db
+        .update(shopOrdersTable)
+        .set({ deletedAt: new Date(), deletedBy, updatedAt: new Date() })
+        .where(eq(shopOrdersTable.id, orderId));
+    const [updated] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, orderId));
+    return updated;
+}
+/**
+ * @public
+ * Restore a soft-deleted order back to the visible list. Idempotent — a no-op
+ * on an order that isn't deleted.
+ */
+export async function restoreOrder(orderId) {
+    const db = getShopDb();
+    const [order] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, orderId));
+    if (!order)
+        throw new Error('Order not found');
+    if (!order.deletedAt)
+        return order;
+    await db
+        .update(shopOrdersTable)
+        .set({ deletedAt: null, deletedBy: null, updatedAt: new Date() })
+        .where(eq(shopOrdersTable.id, orderId));
+    const [updated] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, orderId));
+    return updated;
+}

package/dist/shop/templates/_partials/footer.en.html

@@ -0,0 +1,4 @@
+  </div>
+  <p style="text-align:center;color:#8888A0;font-size:12px;margin-top:16px;">AriaCMS · {{order.customerEmail}}</p>
+</div>
+</body></html>

package/dist/shop/templates/_partials/footer.pl.html

@@ -0,0 +1,4 @@
+  </div>
+  <p style="text-align:center;color:#8888A0;font-size:12px;margin-top:16px;">AriaCMS · {{order.customerEmail}}</p>
+</div>
+</body></html>

package/dist/shop/templates/_partials/header.en.html

@@ -0,0 +1,4 @@
+<!doctype html>
+<html lang="en"><body style="margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;background:#f5f5f8;color:#1a1a2e;">
+<div style="max-width:560px;margin:0 auto;padding:24px;">
+  <div style="background:#fff;border-radius:12px;padding:28px;">

package/dist/shop/templates/_partials/header.pl.html

@@ -0,0 +1,4 @@
+<!doctype html>
+<html lang="pl"><body style="margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;background:#f5f5f8;color:#1a1a2e;">
+<div style="max-width:560px;margin:0 auto;padding:24px;">
+  <div style="background:#fff;border-radius:12px;padding:28px;">

package/dist/shop/templates/_partials/items.en.html

@@ -0,0 +1,14 @@
+<table style="width:100%;border-collapse:collapse;font-size:14px;">
+  <thead><tr style="background:#f4f2fa;"><th align="left" style="padding:8px;">Item</th><th style="padding:8px;">Qty</th><th align="right" style="padding:8px;">Total</th></tr></thead>
+  <tbody>
+    {{#each items}}
+      <tr><td style="padding:6px 8px;border-bottom:1px solid #eee;">{{name}}</td><td style="padding:6px 8px;border-bottom:1px solid #eee;text-align:center;">{{qty}}</td><td style="padding:6px 8px;border-bottom:1px solid #eee;text-align:right;">{{lineGross}}</td></tr>
+    {{/each}}
+  </tbody>
+</table>
+<div style="margin-top:16px;text-align:right;font-size:14px;line-height:1.7;">
+  <div>Shipping: <strong>{{order.shippingGross}}</strong></div>
+  {{#if order.hasDiscount}}<div>Discount ({{order.couponCode}}): <strong style="color:#5B4A9E;">−{{order.discountAmount}}</strong></div>{{/if}}
+  <div style="font-size:16px;">Total (gross): <strong style="color:#5B4A9E;">{{order.totalGross}}</strong></div>
+  <div style="color:#8888A0;font-size:12px;">net {{order.totalNet}} · VAT {{order.vatAmount}}</div>
+</div>

package/dist/shop/templates/_partials/items.pl.html

@@ -0,0 +1,14 @@
+<table style="width:100%;border-collapse:collapse;font-size:14px;">
+  <thead><tr style="background:#f4f2fa;"><th align="left" style="padding:8px;">Pozycja</th><th style="padding:8px;">Ilość</th><th align="right" style="padding:8px;">Suma</th></tr></thead>
+  <tbody>
+    {{#each items}}
+      <tr><td style="padding:6px 8px;border-bottom:1px solid #eee;">{{name}}</td><td style="padding:6px 8px;border-bottom:1px solid #eee;text-align:center;">{{qty}}</td><td style="padding:6px 8px;border-bottom:1px solid #eee;text-align:right;">{{lineGross}}</td></tr>
+    {{/each}}
+  </tbody>
+</table>
+<div style="margin-top:16px;text-align:right;font-size:14px;line-height:1.7;">
+  <div>Wysyłka: <strong>{{order.shippingGross}}</strong></div>
+  {{#if order.hasDiscount}}<div>Rabat ({{order.couponCode}}): <strong style="color:#5B4A9E;">−{{order.discountAmount}}</strong></div>{{/if}}
+  <div style="font-size:16px;">Razem (brutto): <strong style="color:#5B4A9E;">{{order.totalGross}}</strong></div>
+  <div style="color:#8888A0;font-size:12px;">netto {{order.totalNet}} · VAT {{order.vatAmount}}</div>
+</div>

package/dist/shop/templates/_partials/tracking.en.html

@@ -0,0 +1,7 @@
+{{#if tracking}}
+<div style="margin-top:20px;padding:16px;background:#F4F2FA;border-radius:10px;font-size:14px;">
+  <div style="color:#555566;margin-bottom:4px;">{{tracking.label}}</div>
+  <div style="font-family:ui-monospace,monospace;font-weight:700;word-break:break-all;">{{tracking.number}}</div>
+  {{#if tracking.url}}<a href="{{tracking.url}}" style="display:inline-block;margin-top:8px;color:#5B4A9E;font-weight:600;text-decoration:none;">{{tracking.linkLabel}}</a>{{/if}}
+</div>
+{{/if}}

package/dist/shop/templates/_partials/tracking.pl.html

@@ -0,0 +1,7 @@
+{{#if tracking}}
+<div style="margin-top:20px;padding:16px;background:#F4F2FA;border-radius:10px;font-size:14px;">
+  <div style="color:#555566;margin-bottom:4px;">{{tracking.label}}</div>
+  <div style="font-family:ui-monospace,monospace;font-weight:700;word-break:break-all;">{{tracking.number}}</div>
+  {{#if tracking.url}}<a href="{{tracking.url}}" style="display:inline-block;margin-top:8px;color:#5B4A9E;font-weight:600;text-decoration:none;">{{tracking.linkLabel}}</a>{{/if}}
+</div>
+{{/if}}

package/dist/shop/templates/awaiting-payment.en.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Awaiting payment</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Your order {{order.number}} has been placed. Waiting for payment per the chosen method.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/awaiting-payment.pl.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Czekamy na płatność</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Otrzymaliśmy zamówienie {{order.number}}. Czekamy na płatność zgodnie z wybraną metodą.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/cancelled.en.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Order cancelled</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Order {{order.number}} has been cancelled.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/cancelled.pl.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zamówienie anulowane</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Zamówienie {{order.number}} zostało anulowane.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/low-stock.en.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en"><body style="margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;background:#f5f5f8;color:#1a1a2e;">
+<div style="max-width:560px;margin:0 auto;padding:24px;">
+  <div style="background:#fff;border-radius:12px;padding:28px;">
+    <h1 style="font-size:20px;font-weight:800;margin:0 0 8px;color:#C4893A;">Low stock alert</h1>
+    <p style="margin:0 0 16px;color:#555566;line-height:1.5;">
+      Product <strong>{{product.title}}</strong>{{#if product.variantSku}} (SKU {{product.variantSku}}){{/if}}
+      has only <strong>{{product.stock}}</strong> units left in stock (alert threshold: {{product.threshold}}).
+    </p>
+    <p style="margin:0;color:#8888A0;font-size:13px;">Restock in the admin panel to avoid running out.</p>
+  </div>
+  <p style="text-align:center;color:#8888A0;font-size:12px;margin-top:16px;">AriaCMS · {{shop.adminEmail}}</p>
+</div>
+</body></html>

package/dist/shop/templates/low-stock.pl.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="pl"><body style="margin:0;padding:0;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;background:#f5f5f8;color:#1a1a2e;">
+<div style="max-width:560px;margin:0 auto;padding:24px;">
+  <div style="background:#fff;border-radius:12px;padding:28px;">
+    <h1 style="font-size:20px;font-weight:800;margin:0 0 8px;color:#C4893A;">Niski stan magazynowy</h1>
+    <p style="margin:0 0 16px;color:#555566;line-height:1.5;">
+      Produkt <strong>{{product.title}}</strong>{{#if product.variantSku}} (SKU {{product.variantSku}}){{/if}}
+      ma już tylko <strong>{{product.stock}}</strong> sztuk w magazynie (próg alertu: {{product.threshold}}).
+    </p>
+    <p style="margin:0;color:#8888A0;font-size:13px;">Uzupełnij stan w panelu admina, żeby uniknąć przerwy w sprzedaży.</p>
+  </div>
+  <p style="text-align:center;color:#8888A0;font-size:12px;margin-top:16px;">AriaCMS · {{shop.adminEmail}}</p>
+</div>
+</body></html>

package/dist/shop/templates/order-completed.en.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Order completed</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Order {{order.number}} is complete. Thanks for shopping with us!</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/order-completed.pl.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zamówienie zrealizowane</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Zamówienie {{order.number}} zostało zakończone. Dziękujemy za zakupy!</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/order-received.en.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Order {{order.number}}</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Thanks! We received your order and will process it shortly.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/order-received.pl.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zamówienie {{order.number}}</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Dziękujemy! Otrzymaliśmy Twoje zamówienie i wkrótce je przetworzymy.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/payment-received.en.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Payment received</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Payment for order {{order.number}} has been received. Your order is moving to fulfilment.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/payment-received.pl.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Płatność zaksięgowana</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Płatność za zamówienie {{order.number}} została zaksięgowana. Przekazujemy zamówienie do realizacji.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/payment-rejected.en.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Payment rejected</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Payment for order {{order.number}} was not received. Please contact us if you have questions.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/payment-rejected.pl.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Płatność odrzucona</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Płatność za zamówienie {{order.number}} nie została zaksięgowana. Skontaktuj się z nami w razie pytań.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/preparing.en.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Preparing order</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Your order {{order.number}} is being prepared.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/preparing.pl.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zamówienie w przygotowaniu</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Twoje zamówienie {{order.number}} jest pakowane.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/refunded.en.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Order refunded</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Your refund for order {{order.number}} has been issued. It should reach your account within a few business days.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/refunded.pl.html

@@ -0,0 +1,6 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zwrot zaksięgowany</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Środki za zamówienie {{order.number}} zostały zwrócone. Powinny pojawić się na koncie w ciągu kilku dni roboczych.</p>
+{{> items}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/shipped.en.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Order shipped</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Order {{order.number}} has been shipped.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/templates/shipped.pl.html

@@ -0,0 +1,7 @@
+{{> header}}
+<h1 style="font-size:20px;font-weight:800;margin:0 0 8px;">Zamówienie wysłane</h1>
+<p style="margin:0 0 20px;color:#555566;line-height:1.5;">Zamówienie {{order.number}} zostało wysłane.</p>
+{{> items}}
+{{> tracking}}
+{{#if viewUrl}}<div style="margin-top:24px;text-align:center;"><a href="{{viewUrl}}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">{{viewLinkLabel}}</a></div>{{/if}}
+{{> footer}}

package/dist/shop/types.d.ts

@@ -1,5 +1,12 @@
 import type { Language } from '../types/languages.js';
+import type { shopOrdersTable } from '../db-postgres/schema/shop/order.js';
 export type Currency = 'PLN';
+/**
+ * Public row type for a single shop order — mirrors the Drizzle `shop_orders`
+ * table. Use this in `ShopConfig.onOrderPaid` and similar hooks.
+ * @public
+ */
+export type Order = typeof shopOrdersTable.$inferSelect;
 export type OrderStatus = 'new' | 'awaitingPayment' | 'paid' | 'preparing' | 'sent' | 'done' | 'cancelled' | 'paymentRejected' | 'refunded';
 export type I18nText = {
     [lang: string]: string;
@@ -27,11 +34,28 @@ export interface PaymentCreateContext {
     customerIp?: string;
     language?: string | null;
 }
+/**
+ * Result of a non-invasive integration connectivity check. Returned by an
+ * adapter's optional `healthCheck()` — `ok` reflects reachability + auth, and
+ * `message` carries a human-readable detail (error text on failure, optional
+ * note on success). MUST NOT leak secrets.
+ * @public
+ */
+export interface IntegrationHealthResult {
+    ok: boolean;
+    message?: string;
+}
 export interface PaymentAdapter {
     id: string;
     label: I18nText;
     createPayment(order: OrderRef, ctx?: PaymentCreateContext): Promise<PaymentCreateResult>;
     handleWebhook?(req: Request): Promise<PaymentEvent>;
+    /**
+     * Non-invasive connectivity check (e.g. an OAuth token fetch). Optional —
+     * adapters omitting this are reported as "health-check unsupported". MUST
+     * NOT create real transactions.
+     */
+    healthCheck?(): Promise<IntegrationHealthResult>;
     /**
      * Poll the provider for the latest payment status. Used as a fallback
      * when a webhook is lost. `providerRef` is the external id the adapter
@@ -323,6 +347,12 @@ export interface InvoicingAdapter {
     issueWhen?: InvoiceIssuePolicy;
     createInvoice(payload: InvoicePayload, ctx?: InvoiceContext): Promise<InvoiceCreateResult>;
     send?(externalId: string, ctx?: InvoiceContext): Promise<void>;
+    /**
+     * Non-invasive connectivity check (e.g. a read-only account lookup).
+     * Optional — adapters omitting this are reported as "health-check
+     * unsupported". MUST NOT issue real invoices.
+     */
+    healthCheck?(): Promise<IntegrationHealthResult>;
 }
 export interface ShopConfig {
     currency: Currency;
@@ -370,6 +400,39 @@ export interface ShopConfig {
      * @public
      */
     variantExpiry?: VariantExpiryConfig;
+    /**
+     * Optional shop email templates configuration. Templates are looked up
+     * first in the consumer project's `dir` (override), then in the bundled
+     * defaults. Files are named `<name>.<lang>.html` (per-lang) with a
+     * lang-agnostic project fallback (`<name>.html`). Handlebars syntax with
+     * partials in `_partials/<name>.<lang>.html`. CMS singletons accessible
+     * via `{{cms.<slug>.<field>}}` tokens (auto-fetched per template).
+     * @public
+     */
+    emailTemplates?: {
+        /** Project directory holding overrides. Default `'src/emails/shop'`. */
+        dir?: string;
+        /** Throw on missing tokens / unknown CMS slugs. Default `false` (lenient → ""). */
+        strict?: boolean;
+    };
+    /**
+     * Optional callback fired after an order transitions to `paid`.
+     *
+     * Triggered inside `updateOrderStatus` only when the previous status was
+     * NOT `paid` and the new status is `paid` (transition guard) — so a manual
+     * `cancelled → paid` flip will fire, but a no-op `paid → paid` call will not.
+     * Runs AFTER `sendOrderStatusEmail` and `maybeIssueInvoiceForOrder`; receives
+     * the fresh order row (post-update snapshot, with the latest `consents` etc).
+     *
+     * Errors are caught and logged — the callback never blocks the webhook,
+     * the status write, or the invoice. Use for fire-and-forget side effects
+     * (admin notifications, CRM sync, slack ping). If you need strict
+     * once-per-order semantics across refund→repay cycles, persist your own
+     * idempotency flag in userland (the transition guard alone fires once per
+     * `paid` entry, which may not match "lifetime once" for refunded orders).
+     * @public
+     */
+    onOrderPaid?: (order: Order) => Promise<void> | void;
 }
 export interface ResolvedShopConfig extends Omit<ShopConfig, 'variantLabel' | 'variantExpiry' | 'invoicing'> {
     features: Required<ShopFeatures>;

package/dist/sveltekit/index.d.ts

@@ -12,4 +12,3 @@ export { enableHybridEditing } from './components/hybrid-context.js';
 export { setPreferMp4 } from './components/video-context.js';
 export { getLink, isImageFieldData, isVideoFieldData } from './utils/index.js';
 export { structuredToHtml } from '../core/fields/structuredToHtml.js';
-export { extractBlocks, extractInlineBlocks, extractText, extractMediaRefs } from '../core/server/fields/queryStructuredContent.js';

package/dist/sveltekit/index.js

@@ -12,4 +12,3 @@ export { enableHybridEditing } from './components/hybrid-context.js';
 export { setPreferMp4 } from './components/video-context.js';
 export { getLink, isImageFieldData, isVideoFieldData } from './utils/index.js';
 export { structuredToHtml } from '../core/fields/structuredToHtml.js';
-export { extractBlocks, extractInlineBlocks, extractText, extractMediaRefs } from '../core/server/fields/queryStructuredContent.js';

package/dist/sveltekit/server/index.d.ts

@@ -1,6 +1,7 @@
 export { includioCMS } from './handle.js';
 export { cmsLayoutLoad } from './layout.js';
 export { resolveEntry, resolveEntries, countEntries, type ResolveEntryOptions, type ResolveEntriesOptions, type CountEntriesOptions, type PopulateConfig, type ResolveStatus } from '../../core/server/entries/operations/resolveEntry.js';
+export { getMailer, sendMail } from '../../core/cms.js';
 export { createFormSubmission } from '../../core/server/forms/submissions/operations/create.js';
 export { parseFormDataForSubmission } from '../../core/server/forms/submissions/utils/parseMultipart.js';
 export { createConsentLog } from '../../core/server/consentLogs/operations/create.js';
@@ -8,3 +9,4 @@ export { getPreviewEntry } from './preview.js';
 export { createRestApiHandler } from '../../admin/api/rest/handler.js';
 export { generateApiKey } from '../../admin/api/rest/middleware/generateApiKey.js';
 export { createAdminApiHandler } from '../../admin/api/handler.js';
+export { extractBlocks, extractInlineBlocks, extractText, extractMediaRefs } from '../../core/server/fields/queryStructuredContent.js';

package/dist/sveltekit/server/index.js

@@ -1,6 +1,9 @@
 export { includioCMS } from './handle.js';
 export { cmsLayoutLoad } from './layout.js';
 export { resolveEntry, resolveEntries, countEntries } from '../../core/server/entries/operations/resolveEntry.js';
+// Moved from `includio-cms/core` (0.34.x): keep on the server entry so the
+// client-safe `core` barrel (`resolveSeo`) no longer drags in the server graph.
+export { getMailer, sendMail } from '../../core/cms.js';
 export { createFormSubmission } from '../../core/server/forms/submissions/operations/create.js';
 export { parseFormDataForSubmission } from '../../core/server/forms/submissions/utils/parseMultipart.js';
 export { createConsentLog } from '../../core/server/consentLogs/operations/create.js';
@@ -10,3 +13,4 @@ export { createRestApiHandler } from '../../admin/api/rest/handler.js';
 export { generateApiKey } from '../../admin/api/rest/middleware/generateApiKey.js';
 // Folded from `./admin/api/handler` (dropped as separate export in 0.26.1)
 export { createAdminApiHandler } from '../../admin/api/handler.js';
+export { extractBlocks, extractInlineBlocks, extractText, extractMediaRefs } from '../../core/server/fields/queryStructuredContent.js';