includio-cms 0.15.2 → 0.15.3

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

@@ -43,6 +43,18 @@ export function createOrderHandler() {
                 getOrderItems(order.id),
                 getOrderStatusHistory(order.id)
             ]);
+            let trackingUrl = null;
+            if (order.carrierType && order.trackingNumber) {
+                const adapter = getCMS().shopConfig?.carriers.find((c) => c.id === order.carrierType);
+                if (adapter?.trackingUrl) {
+                    try {
+                        trackingUrl = adapter.trackingUrl(order.trackingNumber);
+                    }
+                    catch {
+                        trackingUrl = null;
+                    }
+                }
+            }
             return json({
                 order: {
                     id: order.id,
@@ -61,6 +73,8 @@ export function createOrderHandler() {
                     paymentMethod: order.paymentMethod,
                     carrierType: order.carrierType,
                     carrierRef: order.carrierRef,
+                    trackingNumber: order.trackingNumber,
+                    trackingUrl,
                     language: order.language,
                     createdAt: order.createdAt
                 },

package/dist/shop/http/shipment-label-handler.d.ts

@@ -0,0 +1,10 @@
+import { type RequestHandler } from '@sveltejs/kit';
+/**
+ * Admin-only PDF proxy that streams the carrier label without exposing the
+ * carrier's signed link or token to the browser.
+ *
+ * Mounted at `/api/shop/admin/orders/[id]/label`.
+ */
+export declare function createShipmentLabelHandler(): {
+    GET: RequestHandler;
+};

package/dist/shop/http/shipment-label-handler.js

@@ -0,0 +1,53 @@
+import { error } from '@sveltejs/kit';
+import { getCMS } from '../../core/cms.js';
+import { requireAuth } from '../../admin/remote/middleware/auth.js';
+import { getShipmentLabelForOrder } from '../server/shipments.js';
+function shopEnabled() {
+    try {
+        return getCMS().shopConfig !== null;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Admin-only PDF proxy that streams the carrier label without exposing the
+ * carrier's signed link or token to the browser.
+ *
+ * Mounted at `/api/shop/admin/orders/[id]/label`.
+ */
+export function createShipmentLabelHandler() {
+    return {
+        GET: async ({ params, url }) => {
+            if (!shopEnabled())
+                error(404, 'Shop not enabled');
+            try {
+                requireAuth();
+            }
+            catch {
+                error(401, 'Unauthorized');
+            }
+            const orderId = params.id;
+            if (!orderId)
+                error(400, 'Order id required');
+            const sizeParam = url.searchParams.get('size');
+            const size = sizeParam === 'A4' || sizeParam === 'A6' ? sizeParam : undefined;
+            let label;
+            try {
+                label = await getShipmentLabelForOrder(orderId, { size });
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : 'Label fetch failed';
+                error(400, message);
+            }
+            return new Response(new Uint8Array(label.body), {
+                status: 200,
+                headers: {
+                    'Content-Type': label.contentType,
+                    'Content-Disposition': `inline; filename="${label.filename ?? 'label.pdf'}"`,
+                    'Cache-Control': 'no-store'
+                }
+            });
+        }
+    };
+}

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

@@ -23,6 +23,9 @@ export function createShippingMethodsHandler() {
                     price: m.price,
                     vatRate: m.vatRate,
                     carrierType: m.carrierType,
+                    carrierConfig: m.carrierConfig
+                        ? { serviceType: m.carrierConfig.serviceType ?? null }
+                        : null,
                     conditions: m.conditions,
                     allowedPaymentMethods: m.allowedPaymentMethods ?? null
                 }))

package/dist/shop/index.d.ts

@@ -3,4 +3,6 @@ export declare function defineShop(config: ShopConfig): ResolvedShopConfig;
 export { manualAdapter } from './adapters/manual/index.js';
 export { payuAdapter } from './adapters/payu/index.js';
 export type { PayuAdapterOptions } from './adapters/payu/index.js';
-export type { ShopConfig, ResolvedShopConfig, Currency, OrderStatus, PaymentAdapter, PaymentCreateContext, CarrierAdapter, ConsentConfig, ShopFeatures, PaymentCreateResult, PaymentEvent, OrderRef, I18nText } from './types.js';
+export { inpostAdapter } from './adapters/inpost/index.js';
+export type { InpostAdapterOptions, InpostSenderAddress, GeowidgetConfigPreset, InpostEnvironment } from './adapters/inpost/index.js';
+export type { ShopConfig, ResolvedShopConfig, Currency, OrderStatus, PaymentAdapter, PaymentCreateContext, CarrierAdapter, CarrierEvent, ShipmentCreateInput, ShipmentCreateResult, ShipmentLabel, ConsentConfig, ShopFeatures, PaymentCreateResult, PaymentEvent, OrderRef, I18nText } from './types.js';

package/dist/shop/index.js

@@ -17,3 +17,4 @@ export function defineShop(config) {
 }
 export { manualAdapter } from './adapters/manual/index.js';
 export { payuAdapter } from './adapters/payu/index.js';
+export { inpostAdapter } from './adapters/inpost/index.js';

package/dist/shop/server/email.js

@@ -3,6 +3,10 @@ import { resolveI18n } from '../pricing.js';
 import { getOrderById, getOrderItems } from './orders.js';
 import { requireShopConfig } from './db.js';
 import { buildOrderViewUrl } from './order-access-url.js';
+const TRACKING_LABEL = {
+    pl: { label: 'Numer śledzenia', linkLabel: 'Sprawdź status przesyłki ↗' },
+    en: { label: 'Tracking number', linkLabel: 'Track your shipment ↗' }
+};
 function formatPrice(cents, currency) {
     return new Intl.NumberFormat('pl-PL', {
         style: 'currency',
@@ -77,6 +81,15 @@ function renderHtml(ctx, intro) {
       <div style="font-size:16px;">Razem (brutto): <strong style="color:#5B4A9E;">${ctx.order.totalGross}</strong></div>
       <div style="color:#8888A0;font-size:12px;">netto ${ctx.order.totalNet} · VAT ${ctx.order.vatAmount}</div>
     </div>
+    ${ctx.tracking
+        ? `<div style="margin-top:20px;padding:16px;background:#F4F2FA;border-radius:10px;font-size:14px;">
+    <div style="color:#555566;margin-bottom:4px;">${escapeHtml(ctx.tracking.label)}</div>
+    <div style="font-family:ui-monospace,monospace;font-weight:700;word-break:break-all;">${escapeHtml(ctx.tracking.number)}</div>
+    ${ctx.tracking.url
+            ? `<a href="${escapeHtml(ctx.tracking.url)}" style="display:inline-block;margin-top:8px;color:#5B4A9E;font-weight:600;text-decoration:none;">${escapeHtml(ctx.tracking.linkLabel)}</a>`
+            : ''}
+  </div>`
+        : ''}
     ${ctx.viewUrl
         ? `<div style="margin-top:24px;text-align:center;"><a href="${escapeHtml(ctx.viewUrl)}" style="display:inline-block;background:#5B4A9E;color:#fff;text-decoration:none;padding:10px 18px;border-radius:8px;font-weight:600;">${escapeHtml(ctx.viewLinkLabel)}</a></div>`
         : ''}
@@ -115,9 +128,33 @@ export async function sendOrderStatusEmail(orderId, status) {
             language: order.language
         })
         : null;
+    let tracking;
+    if (order.trackingNumber &&
+        (status === 'sent' || status === 'done' || status === 'preparing')) {
+        const carrier = order.carrierType
+            ? shop.carriers.find((c) => c.id === order.carrierType)
+            : undefined;
+        const url = carrier?.trackingUrl
+            ? (() => {
+                try {
+                    return carrier.trackingUrl(order.trackingNumber);
+                }
+                catch {
+                    return null;
+                }
+            })()
+            : null;
+        tracking = {
+            number: order.trackingNumber,
+            url,
+            label: TRACKING_LABEL[subjectKey].label,
+            linkLabel: TRACKING_LABEL[subjectKey].linkLabel
+        };
+    }
     const ctx = {
         viewUrl,
         viewLinkLabel: VIEW_LINK_LABEL[subjectKey],
+        tracking,
         order: {
             number: order.number,
             status: order.status,

package/dist/shop/server/orders.d.ts

@@ -33,6 +33,15 @@ export declare function updateOrderStatus(orderId: string, status: OrderStatus,
     changedBy?: string;
 }): Promise<OrderRow>;
 export declare function setPaymentProviderRef(orderId: string, ref: string | null): Promise<void>;
+export interface ShipmentInfoInput {
+    shipmentId: string;
+    trackingNumber?: string | null;
+    labelUrl?: string | null;
+}
+export declare function setShipmentInfo(orderId: string, info: ShipmentInfoInput): Promise<OrderRow>;
+export declare function updateTrackingNumber(orderId: string, trackingNumber: string): Promise<void>;
+export declare function clearShipmentInfo(orderId: string): Promise<void>;
+export declare function getOrderByShipmentId(shipmentId: string): Promise<OrderRow | null>;
 export declare function getOrderById(id: string): Promise<OrderRow | null>;
 export declare function getOrderByNumber(number: string): Promise<OrderRow | null>;
 export declare function getOrderItems(orderId: string): Promise<OrderItemRow[]>;

package/dist/shop/server/orders.js

@@ -256,6 +256,54 @@ export async function setPaymentProviderRef(orderId, ref) {
         .set({ paymentProviderRef: ref, updatedAt: new Date() })
         .where(eq(shopOrdersTable.id, orderId));
 }
+export async function setShipmentInfo(orderId, info) {
+    const db = getShopDb();
+    await db
+        .update(shopOrdersTable)
+        .set({
+        shipmentId: info.shipmentId,
+        trackingNumber: info.trackingNumber ?? null,
+        labelUrl: info.labelUrl ?? null,
+        shipmentCreatedAt: new Date(),
+        updatedAt: new Date()
+    })
+        .where(eq(shopOrdersTable.id, orderId));
+    const [row] = await db
+        .select()
+        .from(shopOrdersTable)
+        .where(eq(shopOrdersTable.id, orderId));
+    if (!row)
+        throw new Error('Order not found after shipment update.');
+    return row;
+}
+export async function updateTrackingNumber(orderId, trackingNumber) {
+    const db = getShopDb();
+    await db
+        .update(shopOrdersTable)
+        .set({ trackingNumber, updatedAt: new Date() })
+        .where(eq(shopOrdersTable.id, orderId));
+}
+export async function clearShipmentInfo(orderId) {
+    const db = getShopDb();
+    await db
+        .update(shopOrdersTable)
+        .set({
+        shipmentId: null,
+        trackingNumber: null,
+        labelUrl: null,
+        shipmentCreatedAt: null,
+        updatedAt: new Date()
+    })
+        .where(eq(shopOrdersTable.id, orderId));
+}
+export async function getOrderByShipmentId(shipmentId) {
+    const db = getShopDb();
+    const [row] = await db
+        .select()
+        .from(shopOrdersTable)
+        .where(eq(shopOrdersTable.shipmentId, shipmentId));
+    return row ?? null;
+}
 export async function getOrderById(id) {
     const db = getShopDb();
     const [row] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, id));

package/dist/shop/server/shipments.d.ts

@@ -0,0 +1,33 @@
+import type { CarrierEvent, ShipmentLabel } from '../types.js';
+import { type OrderRow } from './orders.js';
+/**
+ * Create a shipment for the order with the carrier configured on the order.
+ * Saves shipmentId/trackingNumber on the order and bumps status to `preparing`.
+ * Idempotent guard: throws if a shipment already exists (use `cancelShipmentForOrder` first).
+ */
+export declare function createShipmentForOrder(orderId: string): Promise<OrderRow>;
+/**
+ * Cancel an existing shipment with the carrier and clear shipment data on the order.
+ * Order status is left untouched (admin decides whether to drop back to `paid`).
+ */
+export declare function cancelShipmentForOrder(orderId: string): Promise<OrderRow>;
+/**
+ * Fetch the shipping label PDF (or other format) from the carrier. Used by the
+ * admin label proxy endpoint.
+ */
+export declare function getShipmentLabelForOrder(orderId: string, opts?: {
+    size?: 'A4' | 'A6';
+}): Promise<ShipmentLabel>;
+export interface ApplyCarrierEventResult {
+    matched: boolean;
+    orderId?: string;
+    statusChanged?: boolean;
+    trackingChanged?: boolean;
+}
+/**
+ * Apply an incoming carrier event (e.g. from a webhook) to the matching order:
+ * update the tracking number when supplied and bump the order status when the
+ * mapped status differs from the current one. Unknown carrier statuses are
+ * skipped — caller still gets `matched=true` so the webhook can return 200.
+ */
+export declare function applyCarrierEvent(event: CarrierEvent): Promise<ApplyCarrierEventResult>;

package/dist/shop/server/shipments.js

@@ -0,0 +1,145 @@
+import { eq } from 'drizzle-orm';
+import { shopShippingMethodsTable } from '../../db-postgres/schema/shop/index.js';
+import { clearShipmentInfo, getOrderById, getOrderByShipmentId, setShipmentInfo, updateOrderStatus, updateTrackingNumber } from './orders.js';
+import { getShopDb, requireShopConfig } from './db.js';
+function findAdapterFor(order) {
+    if (!order.carrierType || order.carrierType === 'none') {
+        throw new Error('Order has no carrier configured.');
+    }
+    const shop = requireShopConfig();
+    const adapter = shop.carriers.find((c) => c.id === order.carrierType);
+    if (!adapter) {
+        throw new Error(`No carrier adapter registered for "${order.carrierType}". Add it to defineShop({ carriers: [...] }).`);
+    }
+    return adapter;
+}
+async function loadServiceConfig(shippingMethodId) {
+    if (!shippingMethodId) {
+        throw new Error('Order has no shipping method — cannot create shipment.');
+    }
+    const db = getShopDb();
+    const [row] = await db
+        .select()
+        .from(shopShippingMethodsTable)
+        .where(eq(shopShippingMethodsTable.id, shippingMethodId));
+    if (!row) {
+        throw new Error('Shipping method not found.');
+    }
+    const cfg = row.carrierConfig ?? {};
+    if (!cfg.serviceType) {
+        throw new Error('Shipping method has no carrierConfig.serviceType. Set it in admin → shipping methods.');
+    }
+    return { serviceType: cfg.serviceType, defaultSize: cfg.defaultSize };
+}
+/**
+ * Create a shipment for the order with the carrier configured on the order.
+ * Saves shipmentId/trackingNumber on the order and bumps status to `preparing`.
+ * Idempotent guard: throws if a shipment already exists (use `cancelShipmentForOrder` first).
+ */
+export async function createShipmentForOrder(orderId) {
+    const order = await getOrderById(orderId);
+    if (!order)
+        throw new Error('Order not found.');
+    if (order.shipmentId) {
+        throw new Error(`Order already has a shipment (${order.shipmentId}). Cancel it first if you need to recreate.`);
+    }
+    const adapter = findAdapterFor(order);
+    if (!adapter.createShipment) {
+        throw new Error(`Carrier "${adapter.id}" does not support shipment creation.`);
+    }
+    const { serviceType, defaultSize } = await loadServiceConfig(order.shippingMethodId);
+    const result = await adapter.createShipment({
+        order: {
+            id: order.id,
+            number: order.number,
+            customerEmail: order.customerEmail,
+            customerName: order.customerName,
+            customerPhone: order.customerPhone
+        },
+        shippingAddress: order.shippingAddress,
+        carrierRef: order.carrierRef,
+        serviceType,
+        parcelSize: defaultSize,
+        cartTotalGross: order.totalGross,
+        language: order.language
+    });
+    await setShipmentInfo(order.id, {
+        shipmentId: result.shipmentId,
+        trackingNumber: result.trackingNumber || null,
+        labelUrl: result.labelUrl ?? null
+    });
+    if (order.status !== 'preparing' && order.status !== 'sent' && order.status !== 'done') {
+        await updateOrderStatus(order.id, 'preparing', {
+            note: `InPost shipment created (${result.shipmentId})`,
+            changedBy: 'admin'
+        });
+    }
+    const updated = await getOrderById(order.id);
+    if (!updated)
+        throw new Error('Order vanished after shipment update.');
+    return updated;
+}
+/**
+ * Cancel an existing shipment with the carrier and clear shipment data on the order.
+ * Order status is left untouched (admin decides whether to drop back to `paid`).
+ */
+export async function cancelShipmentForOrder(orderId) {
+    const order = await getOrderById(orderId);
+    if (!order)
+        throw new Error('Order not found.');
+    if (!order.shipmentId) {
+        throw new Error('Order has no shipment to cancel.');
+    }
+    const adapter = findAdapterFor(order);
+    if (!adapter.cancelShipment) {
+        throw new Error(`Carrier "${adapter.id}" does not support shipment cancellation.`);
+    }
+    await adapter.cancelShipment(order.shipmentId);
+    await clearShipmentInfo(order.id);
+    const updated = await getOrderById(order.id);
+    if (!updated)
+        throw new Error('Order vanished after shipment cancel.');
+    return updated;
+}
+/**
+ * Fetch the shipping label PDF (or other format) from the carrier. Used by the
+ * admin label proxy endpoint.
+ */
+export async function getShipmentLabelForOrder(orderId, opts = {}) {
+    const order = await getOrderById(orderId);
+    if (!order)
+        throw new Error('Order not found.');
+    if (!order.shipmentId)
+        throw new Error('Order has no shipment.');
+    const adapter = findAdapterFor(order);
+    if (!adapter.getShipmentLabel) {
+        throw new Error(`Carrier "${adapter.id}" does not support label fetching.`);
+    }
+    return adapter.getShipmentLabel(order.shipmentId, { size: opts.size });
+}
+/**
+ * Apply an incoming carrier event (e.g. from a webhook) to the matching order:
+ * update the tracking number when supplied and bump the order status when the
+ * mapped status differs from the current one. Unknown carrier statuses are
+ * skipped — caller still gets `matched=true` so the webhook can return 200.
+ */
+export async function applyCarrierEvent(event) {
+    const order = await getOrderByShipmentId(event.shipmentId);
+    if (!order) {
+        return { matched: false };
+    }
+    let trackingChanged = false;
+    if (event.trackingNumber && event.trackingNumber !== order.trackingNumber) {
+        await updateTrackingNumber(order.id, event.trackingNumber);
+        trackingChanged = true;
+    }
+    let statusChanged = false;
+    if (event.status !== 'unknown' && event.status !== order.status) {
+        await updateOrderStatus(order.id, event.status, {
+            note: `Carrier event (${event.shipmentId})`,
+            changedBy: 'carrier-webhook'
+        });
+        statusChanged = true;
+    }
+    return { matched: true, orderId: order.id, statusChanged, trackingChanged };
+}

package/dist/shop/server/shipping.d.ts

@@ -1,5 +1,5 @@
 import { shopShippingMethodsTable } from '../../db-postgres/schema/shop/index.js';
-import type { ShopCarrierType } from '../../db-postgres/schema/shop/shippingMethod.js';
+import type { ShippingCarrierConfig, ShopCarrierType } from '../../db-postgres/schema/shop/shippingMethod.js';
 type RawShippingMethodRow = typeof shopShippingMethodsTable.$inferSelect;
 export type ShippingMethodRow = Omit<RawShippingMethodRow, 'price'> & {
     price: number;
@@ -13,6 +13,7 @@ export interface ShippingMethodInput {
     price: number;
     vatRate: number;
     carrierType?: ShopCarrierType;
+    carrierConfig?: ShippingCarrierConfig | null;
     conditions?: ShippingConditions | null;
     allowedPaymentMethods?: string[] | null;
     isActive?: boolean;

package/dist/shop/server/shipping.js

@@ -21,6 +21,12 @@ function validate(input) {
             throw new Error('conditions.freeAbove must be non-negative integer (grosze).');
         }
     }
+    if (input.carrierType === 'inpost') {
+        const cfg = input.carrierConfig;
+        if (!cfg?.serviceType) {
+            throw new Error('InPost shipping method requires carrierConfig.serviceType.');
+        }
+    }
 }
 export async function listShippingMethods(opts = {}) {
     const db = getShopDb();
@@ -50,6 +56,7 @@ export async function createShippingMethod(input) {
         price: String(input.price),
         vatRate: input.vatRate,
         carrierType: input.carrierType ?? 'none',
+        carrierConfig: input.carrierConfig ?? null,
         conditions: input.conditions ?? null,
         allowedPaymentMethods: input.allowedPaymentMethods ?? null,
         isActive: input.isActive ?? true,
@@ -71,6 +78,8 @@ export async function updateShippingMethod(id, input) {
         patch.vatRate = input.vatRate;
     if (input.carrierType !== undefined)
         patch.carrierType = input.carrierType;
+    if (input.carrierConfig !== undefined)
+        patch.carrierConfig = input.carrierConfig;
     if (input.conditions !== undefined)
         patch.conditions = input.conditions;
     if (input.allowedPaymentMethods !== undefined)