includio-cms 0.34.1 → 0.36.0

package/dist/admin/components/fields/datetime-field.svelte.d.ts

@@ -2,6 +2,9 @@ import type { DateTimeField } from '../../../types/fields.js';
 type Props = {
     field: DateTimeField;
     value: string | undefined;
+    id?: string;
+    'aria-invalid'?: string | boolean | undefined;
+    'aria-describedby'?: string | undefined;
 };
 declare const DatetimeField: import("svelte").Component<Props, {}, "value">;
 type DatetimeField = ReturnType<typeof DatetimeField>;

package/dist/admin/remote/shop.remote.d.ts

@@ -413,6 +413,7 @@ export declare const listCouponsAdmin: import("@sveltejs/kit").RemoteQueryFuncti
     code: string;
     type: import("../../db-postgres/schema/shop/index.js").ShopCouponType;
     value: string;
+    appliesTo: import("../../db-postgres/schema/shop/index.js").ShopCouponAppliesTo;
     minOrderAmount: number | null;
     maxUses: number | null;
     usedCount: number;
@@ -426,6 +427,7 @@ export declare const getCouponAdmin: import("@sveltejs/kit").RemoteQueryFunction
     code: string;
     type: import("../../db-postgres/schema/shop/index.js").ShopCouponType;
     value: string;
+    appliesTo: import("../../db-postgres/schema/shop/index.js").ShopCouponAppliesTo;
     minOrderAmount: number | null;
     maxUses: number | null;
     usedCount: number;
@@ -438,6 +440,7 @@ export declare const createCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     code: string;
     type: "fixed" | "percent";
     value: number;
+    appliesTo?: "net" | "gross" | undefined;
     minOrderAmount?: number | null | undefined;
     maxUses?: number | null | undefined;
     expiresAt?: string | null | undefined;
@@ -451,6 +454,7 @@ export declare const createCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     expiresAt: Date | null;
     value: string;
     type: import("../../db-postgres/schema/shop/index.js").ShopCouponType;
+    appliesTo: import("../../db-postgres/schema/shop/index.js").ShopCouponAppliesTo;
     minOrderAmount: number | null;
     maxUses: number | null;
     usedCount: number;
@@ -460,6 +464,7 @@ export declare const updateCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     input: {
         code?: string | undefined;
         type?: "fixed" | "percent" | undefined;
+        appliesTo?: "net" | "gross" | undefined;
         value?: number | undefined;
         minOrderAmount?: number | null | undefined;
         maxUses?: number | null | undefined;
@@ -471,6 +476,7 @@ export declare const updateCouponCmd: import("@sveltejs/kit").RemoteCommand<{
     code: string;
     type: import("../../db-postgres/schema/shop/index.js").ShopCouponType;
     value: string;
+    appliesTo: import("../../db-postgres/schema/shop/index.js").ShopCouponAppliesTo;
     minOrderAmount: number | null;
     maxUses: number | null;
     usedCount: number;

package/dist/admin/remote/shop.remote.js

@@ -346,6 +346,7 @@ export const generateBalanceLinkForOrder = command(z.string(), async (orderId) =
 const couponInputSchema = z.object({
     code: z.string().min(1).max(64),
     type: z.enum(['percent', 'fixed']),
+    appliesTo: z.enum(['net', 'gross']).optional(),
     value: z.number().nonnegative().max(1e9),
     minOrderAmount: z.number().int().nonnegative().nullable().optional(),
     maxUses: z.number().int().positive().nullable().optional(),
@@ -372,6 +373,7 @@ export const createCouponCmd = command(couponInputSchema, async (input) => {
         .values({
         code,
         type: input.type,
+        appliesTo: input.appliesTo ?? 'net',
         value: String(input.value),
         minOrderAmount: input.minOrderAmount ?? null,
         maxUses: input.maxUses ?? null,
@@ -389,6 +391,8 @@ export const updateCouponCmd = command(z.object({ id: z.string(), input: couponI
         patch.code = input.code.trim().toUpperCase();
     if (input.type !== undefined)
         patch.type = input.type;
+    if (input.appliesTo !== undefined)
+        patch.appliesTo = input.appliesTo;
     if (input.value !== undefined)
         patch.value = String(input.value);
     if (input.minOrderAmount !== undefined)

package/dist/core/server/generator/generator.js

@@ -178,10 +178,11 @@ function generateAPI(config) {
     const cmsDir = join(process.cwd(), 'src/lib/cms/runtime');
     const filePath = join(cmsDir, 'api.ts');
     let code = `// This file is auto-generated. Do not edit directly.\n\n`;
+    const hasForms = !!(config.forms && config.forms.length > 0);
     code += `
 
-		import type { SingleEntryMap, SingleSlug, CollectionEntryMap, CollectionSlug, FormEntryMap, SiteLanguage } from './types';
-		import { resolveEntry, resolveEntries, countEntries, createFormSubmission, type PopulateConfig } from 'includio-cms/sveltekit/server';
+		import type { SingleEntryMap, SingleSlug, CollectionEntryMap, CollectionSlug,${hasForms ? ' FormEntryMap,' : ''} SiteLanguage } from './types';
+		import { resolveEntry, resolveEntries, countEntries,${hasForms ? ' createFormSubmission,' : ''} type PopulateConfig } from 'includio-cms/sveltekit/server';
 
 	`;
     code += `

package/dist/db-postgres/schema/shop/coupons.d.ts

@@ -1,4 +1,5 @@
 export type ShopCouponType = 'percent' | 'fixed';
+export type ShopCouponAppliesTo = 'net' | 'gross';
 export declare const shopCouponsTable: import("drizzle-orm/pg-core/table", { with: { "resolution-mode": "require" } }).PgTableWithColumns<{
     name: "shop_coupons";
     schema: undefined;
@@ -73,6 +74,25 @@ export declare const shopCouponsTable: import("drizzle-orm/pg-core/table", { wit
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        appliesTo: import("drizzle-orm/pg-core", { with: { "resolution-mode": "require" } }).PgColumn<{
+            name: "applies_to";
+            tableName: "shop_coupons";
+            dataType: "string";
+            columnType: "PgText";
+            data: ShopCouponAppliesTo;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: ShopCouponAppliesTo;
+        }>;
         minOrderAmount: import("drizzle-orm/pg-core", { with: { "resolution-mode": "require" } }).PgColumn<{
             name: "min_order_amount";
             tableName: "shop_coupons";

package/dist/db-postgres/schema/shop/coupons.js

@@ -6,6 +6,9 @@ export const shopCouponsTable = pgTable('shop_coupons', {
     type: text('type').$type().notNull(),
     // percent → integer 0-100 stored as numeric for symmetry; fixed → PLN value (precision 20,6 like product.basePrice)
     value: numeric('value', { precision: 20, scale: 6 }).notNull(),
+    // Whether `value` applies to the net or gross subtotal. Storage of the
+    // resulting discount is always net (canonical) — see calculateCouponDiscountNet.
+    appliesTo: text('applies_to').$type().notNull().default('net'),
     minOrderAmount: integer('min_order_amount'),
     maxUses: integer('max_uses'),
     usedCount: integer('used_count').notNull().default(0),

package/dist/paraglide/messages/_index.d.ts

@@ -1,3 +1,36 @@
-export * from "./hello_world.js";
-export * from "./login_hello.js";
-export * from "./login_please_login.js";
+export function hello_world(inputs: {
+    name: NonNullable<unknown>;
+}, options?: {
+    locale?: "en" | "pl";
+}): string;
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+*
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+declare function login_hello(inputs?: {}, options?: {
+    locale?: "en" | "pl";
+}): string;
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+*
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+declare function login_please_login(inputs?: {}, options?: {
+    locale?: "en" | "pl";
+}): string;
+export { login_hello as login.hello, login_please_login as login.please_login };

package/dist/paraglide/messages/_index.js

@@ -1,4 +1,72 @@
 /* eslint-disable */
-export * from './hello_world.js'
-export * from './login_hello.js'
-export * from './login_please_login.js'
+import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from "../runtime.js"
+import * as en from "./en.js"
+import * as pl from "./pl.js"
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{ name: NonNullable<unknown> }} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+export const hello_world = (inputs, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.hello_world(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("hello_world", locale)
+	if (locale === "en") return en.hello_world(inputs)
+	return pl.hello_world(inputs)
+};
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+const login_hello = (inputs = {}, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.login_hello(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("login_hello", locale)
+	if (locale === "en") return en.login_hello(inputs)
+	return pl.login_hello(inputs)
+};
+export { login_hello as "login.hello" }
+/**
+* This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
+*
+* - Changing this function will be over-written by the next build.
+*
+* - If you want to change the translations, you can either edit the source files e.g. `en.json`, or
+* use another inlang app like [Fink](https://inlang.com/m/tdozzpar) or the [VSCode extension Sherlock](https://inlang.com/m/r7kp499g).
+* 
+* @param {{}} inputs
+* @param {{ locale?: "en" | "pl" }} options
+* @returns {string}
+*/
+/* @__NO_SIDE_EFFECTS__ */
+const login_please_login = (inputs = {}, options = {}) => {
+	if (experimentalMiddlewareLocaleSplitting && isServer === false) {
+		return /** @type {any} */ (globalThis).__paraglide_ssr.login_please_login(inputs) 
+	}
+	const locale = options.locale ?? getLocale()
+	trackMessageCall("login_please_login", locale)
+	if (locale === "en") return en.login_please_login(inputs)
+	return pl.login_please_login(inputs)
+};
+export { login_please_login as "login.please_login" }

package/dist/paraglide/messages/en.d.ts

@@ -0,0 +1,5 @@
+export const hello_world: (inputs: {
+    name: NonNullable<unknown>;
+}) => string;
+export const login_hello: (inputs: {}) => string;
+export const login_please_login: (inputs: {}) => string;

package/dist/paraglide/messages/en.js

@@ -0,0 +1,14 @@
+/* eslint-disable */
+
+
+export const hello_world = /** @type {(inputs: { name: NonNullable<unknown> }) => string} */ (i) => {
+	return `Hello, ${i.name} from en!`
+};
+
+export const login_hello = /** @type {(inputs: {}) => string} */ () => {
+	return `Welcome back`
+};
+
+export const login_please_login = /** @type {(inputs: {}) => string} */ () => {
+	return `Login to your account`
+};

package/dist/paraglide/messages/pl.d.ts

@@ -0,0 +1,5 @@
+export const hello_world: (inputs: {
+    name: NonNullable<unknown>;
+}) => string;
+export const login_hello: (inputs: {}) => string;
+export const login_please_login: (inputs: {}) => string;

package/dist/paraglide/messages/pl.js

@@ -0,0 +1,14 @@
+/* eslint-disable */
+
+
+export const hello_world = /** @type {(inputs: { name: NonNullable<unknown> }) => string} */ (i) => {
+	return `Hello, ${i.name} from pl!`
+};
+
+export const login_hello = /** @type {(inputs: {}) => string} */ () => {
+	return `Witaj ponownie`
+};
+
+export const login_please_login = /** @type {(inputs: {}) => string} */ () => {
+	return `Zaloguj się na swoje konto`
+};

package/dist/shop/cart/types.d.ts

@@ -9,6 +9,13 @@ export interface CartLine extends CartItemRef {
     variantName: Record<string, string> | null;
     variantSku: string | null;
     productTitle: string | null;
+    /**
+     * Frozen invoice-line name rendered from `ShopConfig.invoiceName` at hydrate
+     * time. Null when `invoiceName` is not configured. Carried separately from
+     * `productTitle` so order creation can snapshot the cart copy and the
+     * invoice copy independently.
+     */
+    invoiceTitle: string | null;
     productSlug: string | null;
     priceNet: number;
     priceGross: number;

package/dist/shop/client/index.d.ts

@@ -90,6 +90,7 @@ export interface OrderDetailResponse {
         trackingUrl: string | null;
         language: string | null;
         createdAt: string;
+        notes: string | null;
     };
     items: Array<{
         id: string;

package/dist/shop/http/order-handler.js

@@ -76,7 +76,8 @@ export function createOrderHandler() {
                     trackingNumber: order.trackingNumber,
                     trackingUrl,
                     language: order.language,
-                    createdAt: order.createdAt
+                    createdAt: order.createdAt,
+                    notes: order.notes ?? null
                 },
                 items: items.map((i) => ({
                     id: i.id,

package/dist/shop/index.d.ts

@@ -13,4 +13,5 @@ export { fakturowniaAdapter } from './adapters/fakturownia/index.js';
 export type { FakturowniaAdapterOptions } from './adapters/fakturownia/index.js';
 export { isValidNip } from './nip.js';
 export type { ShopConfig, ResolvedShopConfig, Currency, Order, OrderStatus, PaymentAdapter, PaymentCreateContext, PaymentRefundInput, PaymentRefundResult, CarrierAdapter, CarrierEvent, ShipmentCreateInput, ShipmentCreateResult, ShipmentLabel, ConsentConfig, ShopFeatures, PaymentCreateResult, PaymentEvent, OrderRef, CouponRef, I18nText, VariantAttribute, VariantAttributeText, VariantAttributeNumber, VariantAttributeDatetime, VariantAttributeSelect, VariantAttributeBoolean, VariantAttributeImage, VariantAttributeEntry, VariantAttributeSlug, VariantLabelConfig, VariantExpiryConfig, PaymentPolicy, DepositAmount, PartialPayment, InvoicingAdapter, InvoiceIssuePolicy, InvoiceBuyer, InvoiceLineItem, InvoicePayload, InvoiceCreateResult, InvoiceContext } from './types.js';
-export { interpolateTemplate } from './template.js';
+export { interpolateTemplate, renderShopName } from './template.js';
+export type { I18nTemplate } from './template.js';

package/dist/shop/index.js

@@ -17,7 +17,9 @@ export function defineShop(config) {
         orderViewUrl: config.orderViewUrl ?? '/shop/order/{orderNumber}?token={accessToken}',
         variantAttributes: config.variantAttributes ?? {},
         variantLabel: config.variantLabel ?? null,
-        variantExpiry: config.variantExpiry ?? null
+        variantExpiry: config.variantExpiry ?? null,
+        invoiceName: config.invoiceName ?? null,
+        cartName: config.cartName ?? null
     };
 }
 export { InvalidVariantAttributesError } from './variant-attributes.js';
@@ -28,4 +30,4 @@ export { stripeAdapter } from './adapters/stripe/index.js';
 export { inpostAdapter } from './adapters/inpost/index.js';
 export { fakturowniaAdapter } from './adapters/fakturownia/index.js';
 export { isValidNip } from './nip.js';
-export { interpolateTemplate } from './template.js';
+export { interpolateTemplate, renderShopName } from './template.js';

package/dist/shop/pricing.d.ts

@@ -21,14 +21,26 @@ export interface CouponDiscountInput {
     type: 'percent' | 'fixed';
     /** percent: 0-100; fixed: PLN value (precision 20,6). */
     value: number;
+    /** Whether `value` is applied to the net or gross subtotal. Defaults to 'net'. */
+    appliesTo?: 'net' | 'gross';
 }
 /**
  * Compute discount in cents (minor units) applied to a net subtotal.
- * - `percent`: subtotalNet × (value / 100), rounded to nearest cent.
- * - `fixed`: PLN value converted to cents, capped at subtotalNet (never negative).
  *
- * Discount is calculated on the net subtotal — VAT is then applied to lines
- * after the discount factor, so the discount appears proportionally on each
- * line. Result is bounded to `[0, subtotalNet]`.
+ * Behavior by mode:
+ * - `appliesTo='net'` (default):
+ *   - `percent`: subtotalNet × (value / 100), rounded to nearest cent.
+ *   - `fixed`: PLN value converted to cents, capped at subtotalNet.
+ * - `appliesTo='gross'` (requires `subtotalGross`):
+ *   - `percent`: discount expressed against the gross subtotal, then converted
+ *     to net via the aggregate net/gross ratio (handles mixed VAT rates).
+ *     Mathematically yields the same proportional factor as net-percent —
+ *     kept explicit for clarity and rounding parity with the fixed-gross path.
+ *   - `fixed`: PLN value interpreted as a gross amount, capped at subtotalGross,
+ *     then converted to net via `× subtotalNet / subtotalGross`.
+ *
+ * Discount storage is always net (canonical) — VAT is applied to lines after
+ * the discount factor, so the rebate appears proportionally on each line.
+ * Result is bounded to `[0, subtotalNet]`.
  */
-export declare function calculateCouponDiscountNet(subtotalNet: number, coupon: CouponDiscountInput): number;
+export declare function calculateCouponDiscountNet(subtotalNet: number, coupon: CouponDiscountInput, subtotalGross?: number): number;

package/dist/shop/pricing.js

@@ -49,23 +49,48 @@ export function resolveI18n(value, language, fallback) {
 }
 /**
  * Compute discount in cents (minor units) applied to a net subtotal.
- * - `percent`: subtotalNet × (value / 100), rounded to nearest cent.
- * - `fixed`: PLN value converted to cents, capped at subtotalNet (never negative).
  *
- * Discount is calculated on the net subtotal — VAT is then applied to lines
- * after the discount factor, so the discount appears proportionally on each
- * line. Result is bounded to `[0, subtotalNet]`.
+ * Behavior by mode:
+ * - `appliesTo='net'` (default):
+ *   - `percent`: subtotalNet × (value / 100), rounded to nearest cent.
+ *   - `fixed`: PLN value converted to cents, capped at subtotalNet.
+ * - `appliesTo='gross'` (requires `subtotalGross`):
+ *   - `percent`: discount expressed against the gross subtotal, then converted
+ *     to net via the aggregate net/gross ratio (handles mixed VAT rates).
+ *     Mathematically yields the same proportional factor as net-percent —
+ *     kept explicit for clarity and rounding parity with the fixed-gross path.
+ *   - `fixed`: PLN value interpreted as a gross amount, capped at subtotalGross,
+ *     then converted to net via `× subtotalNet / subtotalGross`.
+ *
+ * Discount storage is always net (canonical) — VAT is applied to lines after
+ * the discount factor, so the rebate appears proportionally on each line.
+ * Result is bounded to `[0, subtotalNet]`.
  */
-export function calculateCouponDiscountNet(subtotalNet, coupon) {
+export function calculateCouponDiscountNet(subtotalNet, coupon, subtotalGross) {
     if (subtotalNet <= 0)
         return 0;
+    const appliesTo = coupon.appliesTo ?? 'net';
+    const useGross = appliesTo === 'gross' && typeof subtotalGross === 'number' && subtotalGross > 0;
     let raw = 0;
     if (coupon.type === 'percent') {
         const pct = Math.max(0, Math.min(100, coupon.value));
-        raw = Math.round(subtotalNet * (pct / 100));
+        if (useGross) {
+            const discountGross = Math.round(subtotalGross * (pct / 100));
+            raw = Math.round((discountGross * subtotalNet) / subtotalGross);
+        }
+        else {
+            raw = Math.round(subtotalNet * (pct / 100));
+        }
     }
     else if (coupon.type === 'fixed') {
-        raw = toCents(Math.max(0, coupon.value));
+        const fixedCents = toCents(Math.max(0, coupon.value));
+        if (useGross) {
+            const cappedGross = Math.min(fixedCents, subtotalGross);
+            raw = Math.round((cappedGross * subtotalNet) / subtotalGross);
+        }
+        else {
+            raw = fixedCents;
+        }
     }
     return Math.max(0, Math.min(raw, subtotalNet));
 }

package/dist/shop/server/cart-hydrate.js

@@ -1,4 +1,4 @@
-import { eq, inArray } from 'drizzle-orm';
+import { desc, inArray } from 'drizzle-orm';
 import { shopProductsTable, shopProductVariantsTable } from '../../db-postgres/schema/shop/index.js';
 import { entriesTable } from '../../db-postgres/schema/entry.js';
 import { entryVersionsTable } from '../../db-postgres/schema/entryVersion.js';
@@ -6,6 +6,7 @@ import { getCMS } from '../../core/cms.js';
 import { getShopDb, requireShopConfig } from './db.js';
 import { grossFromNet, grossPlnFromNetPln, toCents } from '../pricing.js';
 import { buildAppliedCoupon, validateCoupon, CouponError } from './coupons.js';
+import { renderShopName } from '../template.js';
 export async function hydrateCart(items, opts = {}) {
     const shop = requireShopConfig();
     const cms = getCMS();
@@ -42,10 +43,16 @@ export async function hydrateCart(items, opts = {}) {
             .select()
             .from(entryVersionsTable)
             .where(inArray(entryVersionsTable.entryId, entryIds))
+            .orderBy(desc(entryVersionsTable.versionNumber))
         : [];
     const publishedByEntry = new Map();
+    const now = new Date();
     for (const v of versions) {
-        if (v.publishedAt != null)
+        if (v.lang !== language)
+            continue;
+        if (v.publishedAt == null || v.publishedAt > now)
+            continue;
+        if (!publishedByEntry.has(v.entryId))
             publishedByEntry.set(v.entryId, v);
     }
     const productById = new Map(products.map((p) => [p.id, p]));
@@ -62,6 +69,19 @@ export async function hydrateCart(items, opts = {}) {
         }
         return null;
     }
+    function readVariantLabel(name, lang) {
+        if (!name || typeof name !== 'object')
+            return '';
+        const map = name;
+        const direct = map[lang];
+        if (typeof direct === 'string' && direct.length > 0)
+            return direct;
+        const base = map[lang.split('-')[0]];
+        if (typeof base === 'string' && base.length > 0)
+            return base;
+        const first = Object.values(map).find((v) => typeof v === 'string' && v.length > 0);
+        return first ?? '';
+    }
     function readSlug(data) {
         if (!data || typeof data !== 'object')
             return null;
@@ -95,6 +115,11 @@ export async function hydrateCart(items, opts = {}) {
         const version = publishedByEntry.get(product.entryId);
         const title = readTitle(version?.data);
         const slug = readSlug(version?.data);
+        const entryData = (version?.data ?? null);
+        const variantLabel = readVariantLabel(variant.name, language);
+        const renderedInvoice = renderShopName(shop.invoiceName, { entryData, variant: variantLabel, language }, language);
+        const renderedCart = renderShopName(shop.cartName, { entryData, variant: variantLabel, language }, language) ?? renderedInvoice;
+        const cartTitle = renderedCart ?? title;
         // basePrice/priceDelta są numeric(20,6) → drizzle zwraca string. Konwertujemy do PLN (number).
         const priceNetPln = Number(product.basePrice) + Number(variant.priceDelta ?? 0);
         const priceGrossPln = grossPlnFromNetPln(priceNetPln, product.vatRate);
@@ -130,7 +155,8 @@ export async function hydrateCart(items, opts = {}) {
             productId: product.id,
             variantName: variant.name ?? null,
             variantSku: variant.sku,
-            productTitle: title,
+            productTitle: cartTitle,
+            invoiceTitle: renderedInvoice,
             productSlug: slug,
             priceNet,
             priceGross,
@@ -210,6 +236,7 @@ export async function hydrateCart(items, opts = {}) {
             variantName: null,
             variantSku: null,
             productTitle: null,
+            invoiceTitle: null,
             productSlug: null,
             priceNet: 0,
             priceGross: 0,

package/dist/shop/server/coupons.js

@@ -40,8 +40,9 @@ export async function validateCoupon(input) {
     }
     const discountNet = calculateCouponDiscountNet(input.subtotalNet, {
         type: row.type,
-        value: Number(row.value)
-    });
+        value: Number(row.value),
+        appliesTo: (row.appliesTo ?? 'net')
+    }, input.subtotalGross);
     return { row, discountNet };
 }
 /**

package/dist/shop/server/email.js

@@ -1,5 +1,4 @@
 import { getCMS } from '../../core/cms.js';
-import { resolveI18n } from '../pricing.js';
 import { getOrderById, getOrderItems } from './orders.js';
 import { getOrderCoupon } from './coupons.js';
 import { requireShopConfig } from './db.js';
@@ -70,6 +69,30 @@ export async function sendOrderStatusEmail(orderId, status) {
     catch (err) {
         console.error('[shop] Failed to load order coupon for email context:', err);
     }
+    let participants = [];
+    if (order.notes) {
+        try {
+            const parsed = JSON.parse(order.notes);
+            if (Array.isArray(parsed?.participants)) {
+                participants = parsed.participants
+                    .map((p) => {
+                    const fn = typeof p?.firstName === 'string'
+                        ? p.firstName.trim()
+                        : '';
+                    const ln = typeof p?.lastName === 'string'
+                        ? p.lastName.trim()
+                        : '';
+                    if (!fn && !ln)
+                        return null;
+                    return { firstName: fn, lastName: ln };
+                })
+                    .filter((p) => p !== null);
+            }
+        }
+        catch {
+            // notes nie jest JSON-em (legacy free-form) — pomijamy
+        }
+    }
     const lang = (order.language || cms.languages[0] || 'pl');
     const subjectKey = (lang in STATUS_SUBJECTS[status] ? lang : 'pl');
     const viewUrl = /^https?:\/\//i.test(shop.orderViewUrl)
@@ -121,13 +144,24 @@ export async function sendOrderStatusEmail(orderId, status) {
             discountAmount: coupon ? formatPrice(coupon.discountAmount, order.currency) : null,
             hasDiscount: Boolean(coupon && coupon.discountAmount > 0)
         },
-        items: items.map((i) => ({
-            name: resolveI18n(i.nameSnapshot?.product
-                ? { pl: i.nameSnapshot.product }
-                : undefined, lang) || '—',
-            qty: i.qty,
-            lineGross: formatPrice(i.priceGrossSnapshot * i.qty, order.currency)
+        participants: participants.map((p, idx) => ({
+            number: idx + 1,
+            firstName: p.firstName,
+            lastName: p.lastName
         })),
+        hasParticipants: participants.length > 0,
+        items: items.map((i) => {
+            const snap = (i.nameSnapshot ?? {});
+            const composed = snap.invoice ||
+                (snap.product && snap.variant
+                    ? `${snap.product} — ${snap.variant}`
+                    : snap.product || snap.variant || '');
+            return {
+                name: composed || '—',
+                qty: i.qty,
+                lineGross: formatPrice(i.priceGrossSnapshot * i.qty, order.currency)
+            };
+        }),
         shop: {
             currency: order.currency,
             adminEmail: shop.adminEmail ?? null

package/dist/shop/server/invoices.js

@@ -43,10 +43,16 @@ export function decideInvoiceAction(order, existing, policy, opts = {}) {
         return 'create';
     return 'skip';
 }
-// Order-item `nameSnapshot` is `{ product, variant }` (see createOrderFromCart).
-// The invoice line shows both so the customer sees the exact session they paid
-// for (e.g. "Odporność psychiczna — Poznań • 20 września 2026").
+// Order-item `nameSnapshot` is `{ product, variant, invoice? }` (see
+// createOrderFromCart). When `invoice` is present it was rendered from
+// `ShopConfig.invoiceName` at order time and is treated as a full override —
+// the variant suffix is NOT appended (template author controls whether to
+// include `{variant}`). Otherwise the legacy `product — variant` format is
+// used (e.g. "Odporność psychiczna — Poznań • 20 września 2026").
 function lineName(name) {
+    const invoice = name.invoice ?? '';
+    if (invoice)
+        return invoice;
     const product = name.product ?? '';
     const variant = name.variant ?? '';
     if (product && variant)

package/dist/shop/server/orders.js

@@ -327,7 +327,8 @@ export async function createOrderFromCart(input) {
                 product: line.productTitle ?? '',
                 variant: line.variantName && typeof line.variantName === 'object'
                     ? (Object.values(line.variantName)[0] ?? '')
-                    : ''
+                    : '',
+                ...(line.invoiceTitle ? { invoice: line.invoiceTitle } : {})
             },
             skuSnapshot: line.variantSku ?? null,
             priceNetSnapshot: line.priceNet,