includio-cms 0.34.0 → 0.35.0

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

@@ -1,53 +1,166 @@
 <script lang="ts">
-	import Input from '../../../components/ui/input/input.svelte';
+	import { CalendarDate, type DateValue } from '@internationalized/date';
+	import { Calendar } from '../../../components/ui/calendar/index.js';
+	import * as Popover from '../../../components/ui/popover/index.js';
+	import * as Select from '../../../components/ui/select/index.js';
+	import CalendarIcon from '@lucide/svelte/icons/calendar';
+	import ClockIcon from '@lucide/svelte/icons/clock';
 	import type { DateTimeField } from '../../../types/fields.js';
+	import { useInterfaceLanguage } from '../../state/interface-language.svelte.js';
 	import { onMount } from 'svelte';
+	import { cn } from '../../../utils.js';
 
 	type Props = {
 		field: DateTimeField;
 		value: string | undefined;
+		id?: string;
+		'aria-invalid'?: string | boolean | undefined;
+		'aria-describedby'?: string | undefined;
 	};
 
 	let { field, value = $bindable(), ...props }: Props = $props();
 
-	// Convert ISO datetime to datetime-local format (YYYY-MM-DDTHH:mm)
-	function toDatetimeLocal(iso: string | undefined): string {
-		if (!iso) return '';
-		const date = new Date(iso);
-		if (isNaN(date.getTime())) return '';
-		return date.toISOString().slice(0, 16);
+	const interfaceLanguage = useInterfaceLanguage();
+	const localeMap: Record<string, string> = { pl: 'pl-PL', en: 'en-GB' };
+	const locale = $derived(localeMap[interfaceLanguage.current] ?? 'en-GB');
+
+	const lang = {
+		pl: { pick: 'Wybierz datę i godzinę', time: 'Godzina' },
+		en: { pick: 'Pick date and time', time: 'Time' }
+	} as const;
+	const t = $derived(lang[interfaceLanguage.current as 'pl' | 'en'] ?? lang.en);
+
+	function parseValue(iso: string | undefined): {
+		date: CalendarDate | undefined;
+		hour: string;
+		minute: string;
+	} {
+		if (!iso) return { date: undefined, hour: '09', minute: '00' };
+		const d = new Date(iso);
+		if (isNaN(d.getTime())) return { date: undefined, hour: '09', minute: '00' };
+		return {
+			date: new CalendarDate(d.getFullYear(), d.getMonth() + 1, d.getDate()),
+			hour: String(d.getHours()).padStart(2, '0'),
+			minute: String(d.getMinutes()).padStart(2, '0')
+		};
 	}
 
-	// Convert datetime-local to ISO format
-	function toIso(local: string): string {
-		if (!local) return '';
-		return new Date(local).toISOString();
+	function parseMinMax(iso: string | undefined): CalendarDate | undefined {
+		if (!iso) return undefined;
+		const d = new Date(iso);
+		if (isNaN(d.getTime())) return undefined;
+		return new CalendarDate(d.getFullYear(), d.getMonth() + 1, d.getDate());
 	}
 
-	let localValue = $state(toDatetimeLocal(value));
+	const initial = parseValue(value);
+	let dateValue = $state<DateValue | undefined>(initial.date);
+	let hour = $state(initial.hour);
+	let minute = $state(initial.minute);
+	let open = $state(false);
+
+	let lastEmittedValue: string | undefined = value;
 
 	$effect(() => {
-		localValue = toDatetimeLocal(value);
+		if (value === lastEmittedValue) return;
+		const next = parseValue(value);
+		dateValue = next.date;
+		hour = next.hour;
+		minute = next.minute;
+		lastEmittedValue = value;
 	});
 
-	function handleInput(e: Event) {
-		const target = e.target as HTMLInputElement;
-		localValue = target.value;
-		value = target.value ? toIso(target.value) : '';
-	}
+	$effect(() => {
+		const d = dateValue;
+		const h = hour;
+		const m = minute;
 
-	onMount(() => {
-		if (value === undefined) {
-			value = '';
+		let next: string;
+		if (!d) {
+			next = '';
+		} else {
+			const hourNum = Number.parseInt(h, 10);
+			const minuteNum = Number.parseInt(m, 10);
+			const js = new Date(
+				d.year,
+				d.month - 1,
+				d.day,
+				Number.isFinite(hourNum) ? hourNum : 0,
+				Number.isFinite(minuteNum) ? minuteNum : 0,
+				0,
+				0
+			);
+			next = js.toISOString();
+		}
+
+		if (next !== lastEmittedValue) {
+			lastEmittedValue = next;
+			value = next;
 		}
 	});
+
+	onMount(() => {
+		if (value === undefined) value = '';
+	});
+
+	const minDate = $derived(parseMinMax(field.minDate));
+	const maxDate = $derived(parseMinMax(field.maxDate));
+
+	const display = $derived.by(() => {
+		if (!value) return t.pick;
+		const d = new Date(value);
+		if (isNaN(d.getTime())) return t.pick;
+		return new Intl.DateTimeFormat(locale, {
+			dateStyle: 'long',
+			timeStyle: 'short'
+		}).format(d);
+	});
+
+	const hours = Array.from({ length: 24 }, (_, i) => String(i).padStart(2, '0'));
+	const minutes = ['00', '15', '30', '45'];
 </script>
 
-<Input
-	{...props}
-	value={localValue}
-	oninput={handleInput}
-	type="datetime-local"
-	min={field.minDate ? toDatetimeLocal(field.minDate) : undefined}
-	max={field.maxDate ? toDatetimeLocal(field.maxDate) : undefined}
-/>
+<Popover.Root bind:open>
+	<Popover.Trigger
+		{...props}
+		class={cn(
+			'border-input bg-card flex h-9 w-full items-center gap-2 rounded-md border px-3 py-1 text-left text-sm shadow-xs outline-none transition-[color,box-shadow]',
+			'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
+			'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
+			!value && 'text-muted-foreground'
+		)}
+	>
+		<CalendarIcon class="size-4 opacity-50" />
+		<span class="flex-1 truncate">{display}</span>
+	</Popover.Trigger>
+	<Popover.Content class="w-auto p-0" align="start">
+		<Calendar
+			type="single"
+			bind:value={dateValue}
+			{locale}
+			minValue={minDate}
+			maxValue={maxDate}
+			captionLayout="dropdown"
+		/>
+		<div class="border-border flex items-center gap-2 border-t p-3">
+			<ClockIcon class="size-4 opacity-50" />
+			<span class="text-muted-foreground text-xs font-semibold">{t.time}</span>
+			<Select.Root type="single" bind:value={hour}>
+				<Select.Trigger class="h-8 w-[68px]">{hour}</Select.Trigger>
+				<Select.Content>
+					{#each hours as h (h)}
+						<Select.Item value={h} label={h}>{h}</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<span class="text-muted-foreground">:</span>
+			<Select.Root type="single" bind:value={minute}>
+				<Select.Trigger class="h-8 w-[68px]">{minute}</Select.Trigger>
+				<Select.Content>
+					{#each minutes as m (m)}
+						<Select.Item value={m} label={m}>{m}</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+		</div>
+	</Popover.Content>
+</Popover.Root>

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/cli/scaffold/admin.js

@@ -160,7 +160,7 @@ export async function load({ params }) {
             path: 'admin/(afterLogin)/account/+page.svelte',
             content: `${GENERATED_COMMENT}
 <script lang="ts">
-	import { AccountPage } from 'includio-cms/admin/client/account';
+	import { AccountPage } from 'includio-cms/admin/client';
 </script>
 
 <AccountPage />

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/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/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/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 };
 }
 /**