includio-cms 0.15.2 → 0.15.3

package/dist/shop/svelte/InpostPicker.svelte

@@ -0,0 +1,270 @@
+<script lang="ts">
+	import { onMount, onDestroy } from 'svelte';
+
+	interface CarrierWidgetConfig {
+		token: string;
+		language?: string;
+		config?: string;
+	}
+
+	interface CarrierDescriptor {
+		id: string;
+		widget: {
+			scriptUrl: string | null;
+			stylesheetUrl: string | null;
+			config: CarrierWidgetConfig;
+		} | null;
+	}
+
+	interface InpostPoint {
+		name: string;
+		address?: { line1?: string; line2?: string };
+		address_details?: Record<string, string>;
+		[key: string]: unknown;
+	}
+
+	interface Props {
+		/** Currently selected paczkomat code (e.g. `KRA01M`). Two-way bindable. */
+		value?: string;
+		/** Optional pre-fetched config (skips network call). */
+		descriptor?: CarrierDescriptor | null;
+		/** Carrier id to fetch when no `descriptor` provided. Default: `inpost`. */
+		carrierId?: string;
+		/** Base URL prefix (when shop API lives on a different origin). */
+		apiBase?: string;
+		/** Override geowidget language. */
+		language?: string;
+		/** Override geowidget config preset (e.g. `parcelCollect247`). */
+		config?: string;
+		/** Custom fetch (e.g. SvelteKit `fetch` from a load function). */
+		fetchFn?: typeof fetch;
+		/**
+		 * Hide picker when `serviceType` is a courier service (no parcel locker
+		 * needed). Pass `shippingMethod.carrierConfig?.serviceType` from the
+		 * public shipping methods API.
+		 */
+		serviceType?: string | null;
+		/** Called when user picks a paczkomat with the full point payload. */
+		onSelect?: (point: InpostPoint) => void;
+		class?: string;
+		style?: string;
+	}
+
+	let {
+		value = $bindable(''),
+		descriptor = null,
+		carrierId = 'inpost',
+		apiBase = '',
+		language,
+		config,
+		fetchFn,
+		serviceType = null,
+		onSelect,
+		class: className = '',
+		style = ''
+	}: Props = $props();
+
+	let mountEl: HTMLDivElement | undefined = $state();
+	let loading = $state(false);
+	let error = $state<string | null>(null);
+	let resolved = $state<CarrierDescriptor | null>(descriptor);
+	let pointHandler: ((e: Event) => void) | null = null;
+	let pointEventName: string | null = null;
+	let geowidgetEl: HTMLElement | null = null;
+
+	const isCourier = $derived(
+		typeof serviceType === 'string' && serviceType.startsWith('inpost_courier_')
+	);
+
+	async function loadDescriptor(): Promise<CarrierDescriptor | null> {
+		if (resolved) return resolved;
+		const f = fetchFn ?? globalThis.fetch.bind(globalThis);
+		const res = await f(`${apiBase}/api/shop/carriers/${encodeURIComponent(carrierId)}`);
+		if (!res.ok) throw new Error(`Carrier config fetch failed: ${res.status}`);
+		return (await res.json()) as CarrierDescriptor;
+	}
+
+	function loadStylesheet(href: string): void {
+		const exists = document.querySelector(`link[data-inpost-css="${href}"]`);
+		if (exists) return;
+		const link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.href = href;
+		link.dataset.inpostCss = href;
+		document.head.appendChild(link);
+	}
+
+	function loadScript(src: string): Promise<void> {
+		return new Promise((resolve, reject) => {
+			const existing = document.querySelector<HTMLScriptElement>(
+				`script[data-inpost-script="${src}"]`
+			);
+			if (existing) {
+				if (existing.dataset.loaded === '1') return resolve();
+				existing.addEventListener('load', () => resolve(), { once: true });
+				existing.addEventListener(
+					'error',
+					() => reject(new Error(`Geowidget script failed: ${src}`)),
+					{ once: true }
+				);
+				return;
+			}
+			const s = document.createElement('script');
+			s.src = src;
+			s.async = true;
+			s.defer = true;
+			s.dataset.inpostScript = src;
+			s.addEventListener(
+				'load',
+				() => {
+					s.dataset.loaded = '1';
+					resolve();
+				},
+				{ once: true }
+			);
+			s.addEventListener(
+				'error',
+				() => reject(new Error(`Geowidget script failed: ${src}`)),
+				{ once: true }
+			);
+			document.head.appendChild(s);
+		});
+	}
+
+	function mountWidget(d: CarrierDescriptor): void {
+		if (!mountEl || !d.widget) return;
+		mountEl.innerHTML = '';
+
+		// `onpoint` attribute is the *name of a custom event* that Geowidget
+		// dispatches on `document` after a user picks a point. Use a unique name
+		// per instance so multiple pickers don't fight over the same listener.
+		pointEventName =
+			'aria-inpost-pick-' + Math.random().toString(36).slice(2, 10);
+
+		const el = document.createElement('inpost-geowidget');
+		el.setAttribute('token', d.widget.config.token);
+		el.setAttribute('language', language ?? d.widget.config.language ?? 'pl');
+		el.setAttribute('config', config ?? d.widget.config.config ?? 'parcelcollect');
+		el.setAttribute('onpoint', pointEventName);
+		if (value) el.setAttribute('selected_point', value);
+
+		pointHandler = (e: Event) => {
+			const ce = e as CustomEvent<InpostPoint> & { details?: InpostPoint };
+			const detail = ce.detail ?? ce.details;
+			if (!detail || typeof detail.name !== 'string') return;
+			value = detail.name;
+			onSelect?.(detail);
+		};
+		document.addEventListener(pointEventName, pointHandler);
+		mountEl.appendChild(el);
+		geowidgetEl = el;
+	}
+
+	onMount(async () => {
+		if (isCourier) return;
+		loading = true;
+		error = null;
+		try {
+			const d = await loadDescriptor();
+			resolved = d;
+			if (!d?.widget?.scriptUrl) {
+				throw new Error('Geowidget script URL missing in carrier config.');
+			}
+			if (d.widget.stylesheetUrl) loadStylesheet(d.widget.stylesheetUrl);
+			await loadScript(d.widget.scriptUrl);
+			mountWidget(d);
+		} catch (err) {
+			error = err instanceof Error ? err.message : 'Failed to load InPost widget.';
+		} finally {
+			loading = false;
+		}
+	});
+
+	onDestroy(() => {
+		if (pointEventName && pointHandler) {
+			document.removeEventListener(pointEventName, pointHandler);
+		}
+		geowidgetEl = null;
+		pointHandler = null;
+		pointEventName = null;
+	});
+</script>
+
+{#if isCourier}
+	<div class="aria-inpost-courier-note {className}" {style} part="courier-note">
+		Kurier dostarczy paczkę pod podany adres — wybór paczkomatu nie jest potrzebny.
+	</div>
+{:else}
+	<div class="aria-inpost-picker {className}" {style} part="root">
+		{#if loading && !resolved}
+			<div class="state-loading" part="loading" role="status" aria-live="polite">
+				Ładowanie wyboru paczkomatu…
+			</div>
+		{/if}
+		{#if error}
+			<div class="state-error" part="error" role="alert">{error}</div>
+		{/if}
+
+		<div class="mount" bind:this={mountEl} part="mount"></div>
+
+		{#if value}
+			<div class="selected" part="selected" aria-live="polite">
+				Wybrany paczkomat: <strong>{value}</strong>
+			</div>
+		{/if}
+	</div>
+{/if}
+
+<style>
+	.aria-inpost-picker {
+		--inpost-bg: #fafafe;
+		--inpost-fg: #1a1a2e;
+		--inpost-muted: #555566;
+		--inpost-accent: #5b4a9e;
+		--inpost-border: #e2dff0;
+		--inpost-radius: 12px;
+		--inpost-min-height: 520px;
+
+		display: block;
+		font-family: inherit;
+		color: var(--inpost-fg);
+	}
+
+	.aria-inpost-courier-note {
+		color: var(--inpost-muted, #555566);
+		font-size: 0.9rem;
+		padding: 0.75rem 1rem;
+		border: 1px dashed var(--inpost-border, #e2dff0);
+		border-radius: var(--inpost-radius, 12px);
+	}
+
+	.mount {
+		min-height: var(--inpost-min-height);
+		border: 1px solid var(--inpost-border);
+		border-radius: var(--inpost-radius);
+		overflow: hidden;
+		background: var(--inpost-bg);
+	}
+
+	.mount :global(inpost-geowidget) {
+		display: block;
+		width: 100%;
+		height: var(--inpost-min-height);
+	}
+
+	.state-loading,
+	.state-error {
+		padding: 0.75rem 1rem;
+		font-size: 0.9rem;
+		color: var(--inpost-muted);
+	}
+
+	.state-error {
+		color: #c44b4b;
+	}
+
+	.selected {
+		margin-top: 0.5rem;
+		font-size: 0.95rem;
+	}
+</style>

package/dist/shop/svelte/InpostPicker.svelte.d.ts

@@ -0,0 +1,51 @@
+interface CarrierWidgetConfig {
+    token: string;
+    language?: string;
+    config?: string;
+}
+interface CarrierDescriptor {
+    id: string;
+    widget: {
+        scriptUrl: string | null;
+        stylesheetUrl: string | null;
+        config: CarrierWidgetConfig;
+    } | null;
+}
+interface InpostPoint {
+    name: string;
+    address?: {
+        line1?: string;
+        line2?: string;
+    };
+    address_details?: Record<string, string>;
+    [key: string]: unknown;
+}
+interface Props {
+    /** Currently selected paczkomat code (e.g. `KRA01M`). Two-way bindable. */
+    value?: string;
+    /** Optional pre-fetched config (skips network call). */
+    descriptor?: CarrierDescriptor | null;
+    /** Carrier id to fetch when no `descriptor` provided. Default: `inpost`. */
+    carrierId?: string;
+    /** Base URL prefix (when shop API lives on a different origin). */
+    apiBase?: string;
+    /** Override geowidget language. */
+    language?: string;
+    /** Override geowidget config preset (e.g. `parcelCollect247`). */
+    config?: string;
+    /** Custom fetch (e.g. SvelteKit `fetch` from a load function). */
+    fetchFn?: typeof fetch;
+    /**
+     * Hide picker when `serviceType` is a courier service (no parcel locker
+     * needed). Pass `shippingMethod.carrierConfig?.serviceType` from the
+     * public shipping methods API.
+     */
+    serviceType?: string | null;
+    /** Called when user picks a paczkomat with the full point payload. */
+    onSelect?: (point: InpostPoint) => void;
+    class?: string;
+    style?: string;
+}
+declare const InpostPicker: import("svelte").Component<Props, {}, "value">;
+type InpostPicker = ReturnType<typeof InpostPicker>;
+export default InpostPicker;

package/dist/shop/svelte/OrderStatus.svelte

@@ -34,7 +34,8 @@
 		intro: { ...DEFAULT_LABELS_PL.intro, ...labelOverrides?.intro },
 		totals: { ...DEFAULT_LABELS_PL.totals, ...labelOverrides?.totals },
 		actions: { ...DEFAULT_LABELS_PL.actions, ...labelOverrides?.actions },
-		errors: { ...DEFAULT_LABELS_PL.errors, ...labelOverrides?.errors }
+		errors: { ...DEFAULT_LABELS_PL.errors, ...labelOverrides?.errors },
+		tracking: { ...DEFAULT_LABELS_PL.tracking, ...labelOverrides?.tracking }
 	});
 
 	const order: OrderState = createOrderState({ number, token, initialData });
@@ -187,6 +188,27 @@
 				</section>
 			{/if}
 
+			{#if o.trackingNumber}
+				<section class="tracking" part="tracking">
+					<h2 class="section-title">{labels.tracking.title}</h2>
+					<div class="tracking-row">
+						<span class="tracking-label">{labels.tracking.number}</span>
+						<span class="tracking-value">{o.trackingNumber}</span>
+					</div>
+					{#if o.trackingUrl}
+						<a
+							class="tracking-link"
+							part="tracking-link"
+							href={o.trackingUrl}
+							target="_blank"
+							rel="noopener noreferrer"
+						>
+							{labels.tracking.link}
+						</a>
+					{/if}
+				</section>
+			{/if}
+
 			{#if order.data.statusHistory.length > 0}
 				<section class="history" part="history">
 					<h2 class="section-title">{labels.statusHistory}</h2>
@@ -274,12 +296,42 @@
 	.summary,
 	.items,
 	.actions,
+	.tracking,
 	.history {
 		margin-top: 1.5rem;
 		padding-top: 1.5rem;
 		border-top: 1px solid var(--shop-border);
 	}
 
+	.tracking-row {
+		display: flex;
+		justify-content: space-between;
+		gap: 1rem;
+		padding: 0.4rem 0;
+		font-size: 0.95rem;
+	}
+
+	.tracking-label {
+		color: var(--shop-muted);
+	}
+
+	.tracking-value {
+		font-family: ui-monospace, monospace;
+		font-weight: 600;
+	}
+
+	.tracking-link {
+		display: inline-block;
+		margin-top: 0.5rem;
+		color: var(--shop-accent);
+		font-weight: 600;
+		text-decoration: none;
+	}
+
+	.tracking-link:hover {
+		text-decoration: underline;
+	}
+
 	.section-title {
 		font-size: 0.875rem;
 		font-weight: 600;

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

@@ -1,3 +1,4 @@
 export { default as OrderStatus } from './OrderStatus.svelte';
+export { default as InpostPicker } from './InpostPicker.svelte';
 export { DEFAULT_LABELS_PL } from './labels.js';
 export type { OrderStatusLabels } from './labels.js';

package/dist/shop/svelte/index.js

@@ -1,2 +1,3 @@
 export { default as OrderStatus } from './OrderStatus.svelte';
+export { default as InpostPicker } from './InpostPicker.svelte';
 export { DEFAULT_LABELS_PL } from './labels.js';

package/dist/shop/svelte/labels.d.ts

@@ -21,5 +21,10 @@ export interface OrderStatusLabels {
         forbidden: string;
     };
     statusHistory: string;
+    tracking: {
+        title: string;
+        number: string;
+        link: string;
+    };
 }
 export declare const DEFAULT_LABELS_PL: OrderStatusLabels;

package/dist/shop/svelte/labels.js

@@ -37,5 +37,10 @@ export const DEFAULT_LABELS_PL = {
         loadFailed: 'Nie udało się pobrać zamówienia.',
         forbidden: 'Link wygasł lub jest nieprawidłowy.'
     },
-    statusHistory: 'Historia statusów'
+    statusHistory: 'Historia statusów',
+    tracking: {
+        title: 'Śledzenie przesyłki',
+        number: 'Numer',
+        link: 'Sprawdź status przesyłki ↗'
+    }
 };

package/dist/shop/types.d.ts

@@ -40,11 +40,59 @@ export interface PaymentAdapter {
 }
 export interface CarrierAdapter {
     id: string;
+    label?: I18nText;
     widget?: {
         scriptUrl?: string;
+        stylesheetUrl?: string;
         config: Record<string, unknown>;
     };
-    validateSelection?(ref: string): Promise<boolean> | boolean;
+    validateSelection?(ref: string, ctx?: {
+        serviceType?: string;
+    }): Promise<boolean> | boolean;
+    createShipment?(input: ShipmentCreateInput): Promise<ShipmentCreateResult>;
+    getShipmentLabel?(shipmentId: string, opts?: {
+        format?: 'pdf';
+        size?: 'A4' | 'A6';
+    }): Promise<ShipmentLabel>;
+    cancelShipment?(shipmentId: string): Promise<void>;
+    handleWebhook?(req: Request): Promise<CarrierEvent>;
+    trackingUrl?(trackingNumber: string): string;
+}
+export interface ShipmentReceiver {
+    id: string;
+    number: string;
+    customerEmail: string;
+    customerName?: string | null;
+    customerPhone?: string | null;
+}
+export interface ShipmentCreateInput {
+    order: ShipmentReceiver;
+    shippingAddress: Record<string, string> | null;
+    carrierRef?: string | null;
+    serviceType: string;
+    parcelSize?: string;
+    cartTotalGross: number;
+    insuranceAmount?: number;
+    cod?: number;
+    language?: string | null;
+}
+export interface ShipmentCreateResult {
+    shipmentId: string;
+    trackingNumber: string;
+    labelUrl?: string;
+    raw?: unknown;
+}
+export interface ShipmentLabel {
+    contentType: string;
+    body: Uint8Array;
+    filename?: string;
+}
+export interface CarrierEvent {
+    shipmentId: string;
+    trackingNumber?: string;
+    orderNumber?: string;
+    status: 'preparing' | 'sent' | 'done' | 'cancelled' | 'unknown';
+    raw: unknown;
 }
 export interface OrderRef {
     id: string;

package/dist/updates/0.15.3/index.d.ts

@@ -0,0 +1,2 @@
+import type { CmsUpdate } from '../index.js';
+export declare const update: CmsUpdate;

package/dist/updates/0.15.3/index.js

@@ -0,0 +1,19 @@
+export const update = {
+    version: '0.15.3',
+    date: '2026-04-16',
+    description: 'Shop: InPost carrier adapter — Geowidget v5 picker + ShipX shipment + webhook auto-status.',
+    features: [
+        '`inpostAdapter()` ships in `includio-cms/shop` — wires Geowidget v5 (paczkomat picker on the frontend), ShipX (admin "Utwórz przesyłkę InPost" button creates the shipment, auto-buys the offer, fetches the label PDF) and a webhook receiver (`POST /api/shop/carriers/inpost/webhook?secret=...`) that updates order status + tracking number when ShipX events arrive.',
+        '`<InpostPicker>` Svelte component (`includio-cms/shop/svelte`) — drop-in widget with `bind:value={carrierRef}`, lazy-loads the geowidget script + CSS, hides itself for `inpost_courier_*` services. Raw API alternative: `GET /api/shop/carriers/inpost`.',
+        'Per-shipping-method service config — `shop_shipping_methods.carrier_config` jsonb with `serviceType` (`inpost_locker_standard` / `inpost_locker_express` / `inpost_courier_standard` / `inpost_courier_express`) and `defaultSize` (A/B/C → small/medium/large). Admin shipping form ungates the InPost option and shows the new fields when selected.',
+        'Customer order endpoint exposes `trackingNumber` + `trackingUrl` (resolved via `adapter.trackingUrl()`); `<OrderStatus>` renders a "Śledzenie przesyłki" section automatically. Status emails for `preparing` / `sent` / `done` include a tracking block with a clickable carrier link.',
+        'Admin order detail page gains a "Przesyłka {carrierType}" panel: Utwórz przesyłkę / Pobierz etykietę PDF / Anuluj przesyłkę. PDF is streamed through an admin-auth proxy at `/api/shop/admin/orders/[id]/label`.',
+        'Checkout validates `carrierRef` against the carrier (Operating-only paczkomats via InPost Points API, in-memory cached 5 min). Invalid selections reject with HTTP 400 before the order is created.',
+        'CLI scaffold (`pnpm includio scaffold admin`) emits the new routes: `api/shop/carriers/[id]/+server.ts`, `api/shop/carriers/[id]/webhook/+server.ts`, `api/shop/admin/orders/[id]/label/+server.ts`.',
+        'CLI scaffolder auto-detects shop usage by scanning `src/lib/cms/cms.config.ts` for an active `shop:` property — projects without the shop module get a clean route tree by default, no flag required. Override with `--shop` / `--no-shop` (or pass `scaffoldAdmin({ shop: false })` programmatically). Combined with the existing config-driven schema generator + admin sidebar guard, shop is now fully opt-in with zero footprint when unused.'
+    ],
+    fixes: [],
+    breakingChanges: [],
+    sql: 'ALTER TABLE shop_shipping_methods ADD COLUMN carrier_config jsonb;\nALTER TABLE shop_orders ADD COLUMN shipment_id text, ADD COLUMN tracking_number text, ADD COLUMN label_url text, ADD COLUMN shipment_created_at timestamptz;',
+    notes: 'Run the SQL once, then `pnpm db:push` to sync the rest of the schema. InPost requires two tokens: a public Geowidget v5 token (browser-side, from `manager.paczkomaty.pl`) and a private ShipX organization token (server-side). On sandbox, ShipX `POST /shipments/:id/buy` is asynchronous and often stalls in `offer_selected` because test accounts have no wallet to pay the offer — the webhook reconciles whatever ends up. See /docs/shop/inpost for full setup.'
+};

package/dist/updates/index.js

@@ -47,7 +47,8 @@ import { update as update0146 } from './0.14.6/index.js';
 import { update as update0150 } from './0.15.0/index.js';
 import { update as update0151 } from './0.15.1/index.js';
 import { update as update0152 } from './0.15.2/index.js';
-export const updates = [update0065, update0066, update0067, update0068, update0069, update010, update011, update012, update013, update014, update015, update020, update022, update050, update051, update052, update053, update054, update055, update056, update057, update058, update060, update061, update062, update070, update071, update072, update073, update080, update090, update0100, update0110, update0120, update0130, update0131, update0132, update0133, update0134, update0140, update0141, update0142, update0143, update0144, update0145, update0146, update0150, update0151, update0152];
+import { update as update0153 } from './0.15.3/index.js';
+export const updates = [update0065, update0066, update0067, update0068, update0069, update010, update011, update012, update013, update014, update015, update020, update022, update050, update051, update052, update053, update054, update055, update056, update057, update058, update060, update061, update062, update070, update071, update072, update073, update080, update090, update0100, update0110, update0120, update0130, update0131, update0132, update0133, update0134, update0140, update0141, update0142, update0143, update0144, update0145, update0146, update0150, update0151, update0152, update0153];
 export const getUpdatesFrom = (fromVersion) => {
     const fromParts = fromVersion.split('.').map(Number);
     return updates.filter((update) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "includio-cms",
-	"version": "0.15.2",
+	"version": "0.15.3",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",