includio-cms 0.15.0 → 0.15.2

package/dist/shop/server/orders.js

@@ -6,6 +6,7 @@ import { hydrateCart } from './cart-hydrate.js';
 import { resolveShippingPrice } from './shipping.js';
 import { generateOrderNumber } from './order-number.js';
 import { sendOrderStatusEmail } from './email.js';
+import { isPaymentMethodAllowed } from './payment-compat.js';
 const STOCK_RESERVATION_TTL_MINUTES = 30;
 async function purgeExpiredReservations() {
     const db = getShopDb();
@@ -60,6 +61,10 @@ export async function createOrderFromCart(input) {
     if (!shippingMethod || !shippingMethod.isActive) {
         throw new Error('Shipping method not found or inactive.');
     }
+    // Shipping ↔ payment compatibility: empty/null list = all payment methods allowed.
+    if (!isPaymentMethodAllowed(input.paymentMethod, shippingMethod.allowedPaymentMethods)) {
+        throw new Error(`Payment method "${input.paymentMethod}" not available for the selected shipping method.`);
+    }
     // Hydrate cart server-side (authoritative pricing)
     const snapshot = await hydrateCart(input.cartItems, { language: input.language });
     if (snapshot.items.length === 0 || snapshot.itemCount === 0) {
@@ -244,6 +249,13 @@ export async function updateOrderStatus(orderId, status, opts = {}) {
     void sendOrderStatusEmail(orderId, status);
     return updated;
 }
+export async function setPaymentProviderRef(orderId, ref) {
+    const db = getShopDb();
+    await db
+        .update(shopOrdersTable)
+        .set({ paymentProviderRef: ref, updatedAt: new Date() })
+        .where(eq(shopOrdersTable.id, orderId));
+}
 export async function getOrderById(id) {
     const db = getShopDb();
     const [row] = await db.select().from(shopOrdersTable).where(eq(shopOrdersTable.id, id));

package/dist/shop/server/payment-compat.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Returns true when the payment method is allowed for the given shipping method.
+ * `allowedPaymentMethods` null/undefined/empty means "no restrictions".
+ */
+export declare function isPaymentMethodAllowed(paymentMethod: string, allowedPaymentMethods: string[] | null | undefined): boolean;

package/dist/shop/server/payment-compat.js

@@ -0,0 +1,9 @@
+/**
+ * Returns true when the payment method is allowed for the given shipping method.
+ * `allowedPaymentMethods` null/undefined/empty means "no restrictions".
+ */
+export function isPaymentMethodAllowed(paymentMethod, allowedPaymentMethods) {
+    if (!allowedPaymentMethods || allowedPaymentMethods.length === 0)
+        return true;
+    return allowedPaymentMethods.includes(paymentMethod);
+}

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

@@ -1,5 +1,6 @@
 import type { Field } from '../../types/fields.js';
 export interface PopulatedShopField {
+    /** Netto w PLN (number, ≤6dp). Od 0.15.2. */
     basePrice: number;
     vatRate: number;
     isActive: boolean;
@@ -7,6 +8,7 @@ export interface PopulatedShopField {
         id: string;
         sku: string | null;
         name: Record<string, string> | null;
+        /** Netto delta w PLN (number, ≤6dp). Od 0.15.2. */
         priceDelta: number;
         stock: number | null;
         attributes: Record<string, string> | null;

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

@@ -1,6 +1,9 @@
 import { shopShippingMethodsTable } from '../../db-postgres/schema/shop/index.js';
 import type { ShopCarrierType } from '../../db-postgres/schema/shop/shippingMethod.js';
-export type ShippingMethodRow = typeof shopShippingMethodsTable.$inferSelect;
+type RawShippingMethodRow = typeof shopShippingMethodsTable.$inferSelect;
+export type ShippingMethodRow = Omit<RawShippingMethodRow, 'price'> & {
+    price: number;
+};
 export interface ShippingConditions {
     freeAbove?: number;
 }
@@ -11,6 +14,7 @@ export interface ShippingMethodInput {
     vatRate: number;
     carrierType?: ShopCarrierType;
     conditions?: ShippingConditions | null;
+    allowedPaymentMethods?: string[] | null;
     isActive?: boolean;
     sortOrder?: number | null;
 }
@@ -25,10 +29,14 @@ export declare function deleteShippingMethod(id: string): Promise<void>;
 export declare function reorderShippingMethods(orderedIds: string[]): Promise<void>;
 /**
  * Resolve effective shipping cost for a given cart.
- * Applies `conditions.freeAbove` threshold against the cart gross total.
- * Returns integer (smallest currency unit).
+ * Applies `conditions.freeAbove` threshold against the cart gross total (grosze).
+ * method.price — PLN (numeric 20,6). Zwraca kwoty w groszach (integer) do snapshotu zamówienia.
  */
-export declare function resolveShippingPrice(method: Pick<ShippingMethodRow, 'price' | 'vatRate' | 'conditions'>, cartTotalGross: number): {
+export declare function resolveShippingPrice(method: {
+    price: number | string;
+    vatRate: number;
+    conditions: ShippingConditions | null | unknown;
+}, cartTotalGross: number): {
     net: number;
     gross: number;
     vat: number;

package/dist/shop/server/shipping.js

@@ -1,13 +1,16 @@
 import { asc, eq } from 'drizzle-orm';
 import { shopShippingMethodsTable } from '../../db-postgres/schema/shop/index.js';
-import { grossFromNet } from '../pricing.js';
+import { grossPlnFromNetPln, toCents } from '../pricing.js';
 import { getShopDb } from './db.js';
+function mapShippingRow(r) {
+    return { ...r, price: Number(r.price) };
+}
 function validate(input) {
     if (!input.name || Object.keys(input.name).length === 0) {
         throw new Error('Shipping method name (i18n) is required.');
     }
-    if (!Number.isInteger(input.price) || input.price < 0) {
-        throw new Error('price must be non-negative integer (smallest currency unit).');
+    if (!Number.isFinite(input.price) || input.price < 0 || input.price > 1e9) {
+        throw new Error('price must be non-negative finite number (PLN, ≤ 1e9).');
     }
     if (!Number.isInteger(input.vatRate) || input.vatRate < 0 || input.vatRate > 100) {
         throw new Error('vatRate must be integer 0..100.');
@@ -15,17 +18,18 @@ function validate(input) {
     if (input.conditions?.freeAbove != null) {
         const fa = input.conditions.freeAbove;
         if (!Number.isInteger(fa) || fa < 0) {
-            throw new Error('conditions.freeAbove must be non-negative integer.');
+            throw new Error('conditions.freeAbove must be non-negative integer (grosze).');
         }
     }
 }
 export async function listShippingMethods(opts = {}) {
     const db = getShopDb();
-    return db
+    const rows = await db
         .select()
         .from(shopShippingMethodsTable)
         .where(opts.activeOnly ? eq(shopShippingMethodsTable.isActive, true) : undefined)
         .orderBy(asc(shopShippingMethodsTable.sortOrder), asc(shopShippingMethodsTable.createdAt));
+    return rows.map(mapShippingRow);
 }
 export async function getShippingMethod(id) {
     const db = getShopDb();
@@ -33,7 +37,7 @@ export async function getShippingMethod(id) {
         .select()
         .from(shopShippingMethodsTable)
         .where(eq(shopShippingMethodsTable.id, id));
-    return row ?? null;
+    return row ? mapShippingRow(row) : null;
 }
 export async function createShippingMethod(input) {
     validate(input);
@@ -43,15 +47,16 @@ export async function createShippingMethod(input) {
         .values({
         name: input.name,
         description: input.description ?? null,
-        price: input.price,
+        price: String(input.price),
         vatRate: input.vatRate,
         carrierType: input.carrierType ?? 'none',
         conditions: input.conditions ?? null,
+        allowedPaymentMethods: input.allowedPaymentMethods ?? null,
         isActive: input.isActive ?? true,
         sortOrder: input.sortOrder ?? null
     })
         .returning();
-    return row;
+    return mapShippingRow(row);
 }
 export async function updateShippingMethod(id, input) {
     const db = getShopDb();
@@ -61,13 +66,15 @@ export async function updateShippingMethod(id, input) {
     if (input.description !== undefined)
         patch.description = input.description;
     if (input.price !== undefined)
-        patch.price = input.price;
+        patch.price = String(input.price);
     if (input.vatRate !== undefined)
         patch.vatRate = input.vatRate;
     if (input.carrierType !== undefined)
         patch.carrierType = input.carrierType;
     if (input.conditions !== undefined)
         patch.conditions = input.conditions;
+    if (input.allowedPaymentMethods !== undefined)
+        patch.allowedPaymentMethods = input.allowedPaymentMethods;
     if (input.isActive !== undefined)
         patch.isActive = input.isActive;
     if (input.sortOrder !== undefined)
@@ -79,7 +86,7 @@ export async function updateShippingMethod(id, input) {
         .returning();
     if (!row)
         throw new Error('Shipping method not found');
-    return row;
+    return mapShippingRow(row);
 }
 export async function deleteShippingMethod(id) {
     const db = getShopDb();
@@ -97,15 +104,18 @@ export async function reorderShippingMethods(orderedIds) {
 }
 /**
  * Resolve effective shipping cost for a given cart.
- * Applies `conditions.freeAbove` threshold against the cart gross total.
- * Returns integer (smallest currency unit).
+ * Applies `conditions.freeAbove` threshold against the cart gross total (grosze).
+ * method.price — PLN (numeric 20,6). Zwraca kwoty w groszach (integer) do snapshotu zamówienia.
  */
 export function resolveShippingPrice(method, cartTotalGross) {
     const cond = method.conditions ?? null;
     if (cond?.freeAbove != null && cartTotalGross >= cond.freeAbove) {
         return { net: 0, gross: 0, vat: 0, isFree: true };
     }
-    const gross = grossFromNet(method.price, method.vatRate);
-    return { net: method.price, gross, vat: gross - method.price, isFree: false };
+    const priceNetPln = Number(method.price);
+    const priceGrossPln = grossPlnFromNetPln(priceNetPln, method.vatRate);
+    const net = toCents(priceNetPln);
+    const gross = toCents(priceGrossPln);
+    return { net, gross, vat: gross - net, isFree: false };
 }
 export { validate as validateShippingMethodInput };

package/dist/shop/server/shop-data.d.ts

@@ -1,6 +1,12 @@
 import { shopProductsTable, shopProductVariantsTable } from '../../db-postgres/schema/shop/index.js';
-export type ShopDataRow = typeof shopProductsTable.$inferSelect;
-export type VariantRow = typeof shopProductVariantsTable.$inferSelect;
+type RawShopDataRow = typeof shopProductsTable.$inferSelect;
+type RawVariantRow = typeof shopProductVariantsTable.$inferSelect;
+export type ShopDataRow = Omit<RawShopDataRow, 'basePrice'> & {
+    basePrice: number;
+};
+export type VariantRow = Omit<RawVariantRow, 'priceDelta'> & {
+    priceDelta: number;
+};
 export interface ShopDataWithVariants extends ShopDataRow {
     variants: VariantRow[];
 }

package/dist/shop/server/shop-data.js

@@ -3,14 +3,21 @@ import { shopProductsTable, shopProductVariantsTable } from '../../db-postgres/s
 import { entriesTable } from '../../db-postgres/schema/entry.js';
 import { entryVersionsTable } from '../../db-postgres/schema/entryVersion.js';
 import { getShopDb } from './db.js';
+const MAX_PLN = 1e9;
 function validateShopData(input) {
-    if (!Number.isInteger(input.basePrice) || input.basePrice < 0) {
-        throw new Error('basePrice must be a non-negative integer (smallest currency unit).');
+    if (!Number.isFinite(input.basePrice) || input.basePrice < 0 || input.basePrice > MAX_PLN) {
+        throw new Error('basePrice must be a non-negative finite number (PLN, ≤ 1e9).');
     }
     if (!Number.isInteger(input.vatRate) || input.vatRate < 0 || input.vatRate > 100) {
         throw new Error('vatRate must be an integer between 0 and 100.');
     }
 }
+function mapShopRow(r) {
+    return { ...r, basePrice: Number(r.basePrice) };
+}
+function mapVariantRow(v) {
+    return { ...v, priceDelta: Number(v.priceDelta) };
+}
 export async function getShopDataByEntry(entryId) {
     const db = getShopDb();
     const [row] = await db
@@ -24,18 +31,19 @@ export async function getShopDataByEntry(entryId) {
         .from(shopProductVariantsTable)
         .where(eq(shopProductVariantsTable.productId, row.id))
         .orderBy(asc(shopProductVariantsTable.sortOrder), asc(shopProductVariantsTable.createdAt));
-    return { ...row, variants };
+    return { ...mapShopRow(row), variants: variants.map(mapVariantRow) };
 }
 export async function upsertShopData(entryId, input, variants) {
     validateShopData(input);
     const db = getShopDb();
     const existing = await getShopDataByEntry(entryId);
     let productId;
+    const basePriceSql = String(input.basePrice);
     if (existing) {
         const [updated] = await db
             .update(shopProductsTable)
             .set({
-            basePrice: input.basePrice,
+            basePrice: basePriceSql,
             vatRate: input.vatRate,
             isActive: input.isActive ?? existing.isActive,
             sortOrder: input.sortOrder ?? existing.sortOrder,
@@ -50,7 +58,7 @@ export async function upsertShopData(entryId, input, variants) {
             .insert(shopProductsTable)
             .values({
             entryId,
-            basePrice: input.basePrice,
+            basePrice: basePriceSql,
             vatRate: input.vatRate,
             isActive: input.isActive ?? true,
             sortOrder: input.sortOrder
@@ -73,7 +81,7 @@ export async function upsertShopData(entryId, input, variants) {
                     .set({
                     sku: v.sku ?? null,
                     name: v.name ?? null,
-                    priceDelta: v.priceDelta ?? 0,
+                    priceDelta: String(v.priceDelta ?? 0),
                     stock: v.stock ?? null,
                     attributes: v.attributes ?? null
                 })
@@ -84,7 +92,7 @@ export async function upsertShopData(entryId, input, variants) {
                     productId,
                     sku: v.sku ?? null,
                     name: v.name ?? null,
-                    priceDelta: v.priceDelta ?? 0,
+                    priceDelta: String(v.priceDelta ?? 0),
                     stock: v.stock ?? null,
                     attributes: v.attributes ?? null
                 });
@@ -101,7 +109,7 @@ export async function upsertShopData(entryId, input, variants) {
             productId,
             sku: null,
             name: null,
-            priceDelta: 0,
+            priceDelta: '0',
             stock: null,
             attributes: null
         });
@@ -123,7 +131,7 @@ export async function getDefaultVariant(productId) {
         .where(eq(shopProductVariantsTable.productId, productId))
         .orderBy(asc(shopProductVariantsTable.createdAt))
         .limit(1);
-    return v ?? null;
+    return v ? mapVariantRow(v) : null;
 }
 export async function deleteShopData(entryId) {
     const db = getShopDb();
@@ -170,7 +178,7 @@ export async function listShopEntries(opts = {}) {
             entryId: r.entryId,
             collectionSlug: r.collectionSlug,
             shopId: r.shopId,
-            basePrice: r.basePrice,
+            basePrice: Number(r.basePrice),
             vatRate: r.vatRate,
             isActive: r.isActive,
             variantCount: variants.length,