@rovela-ai/sdk 0.19.8 → 0.21.0

package/dist/core/db/queries.js

@@ -167,6 +167,11 @@ export async function countProducts(options = {}) {
     if (options.outOfStock) {
         conditions.push(buildOutOfStockCondition());
     }
+    // Keep in lockstep with findProducts' onSale condition — the public
+    // products API uses this count for pagination.
+    if (options.onSale) {
+        conditions.push(sql `${schema.products.comparePrice} IS NOT NULL AND ${schema.products.comparePrice} > ${schema.products.price}`);
+    }
     const result = await db
         .select({ count: sql `count(*)` })
         .from(schema.products)
@@ -1003,6 +1008,87 @@ export async function updateOrderShipping(orderId, shippingData) {
         .returning();
     return order || null;
 }
+// =============================================================================
+// Shipping Labels (carrier label bytes, SDK 0.20.0)
+// =============================================================================
+/**
+ * Self-heal for the shipping_labels table (Colissimo labels are returned as
+ * bytes exactly once — they must be persisted at purchase time). Idempotent;
+ * cached in-process.
+ */
+let shippingLabelsSchemaEnsured = false;
+export async function ensureShippingLabelsSchema() {
+    if (shippingLabelsSchemaEnsured)
+        return;
+    const db = getDb();
+    try {
+        await db.execute(sql `
+      CREATE TABLE IF NOT EXISTS shipping_labels (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        order_id uuid NOT NULL REFERENCES orders(id) ON DELETE CASCADE,
+        carrier varchar(50) NOT NULL,
+        format varchar(30) NOT NULL,
+        data text NOT NULL,
+        created_at timestamp NOT NULL DEFAULT now()
+      )
+    `);
+        await db.execute(sql `CREATE INDEX IF NOT EXISTS shipping_labels_order_id_idx ON shipping_labels (order_id)`);
+        shippingLabelsSchemaEnsured = true;
+    }
+    catch (err) {
+        console.error('[ensureShippingLabelsSchema] migration failed:', err);
+        throw err;
+    }
+}
+/** Persist a carrier label document (base64 bytes). */
+export async function saveShippingLabel(params) {
+    await ensureShippingLabelsSchema();
+    const db = getDb();
+    await db.insert(schema.shippingLabels).values({
+        orderId: params.orderId,
+        carrier: params.carrier,
+        format: params.format,
+        data: params.dataBase64,
+    });
+}
+/** Latest stored label for an order (admin-gated download route). */
+export async function findShippingLabelByOrderId(orderId) {
+    await ensureShippingLabelsSchema();
+    const db = getDb();
+    const [label] = await db
+        .select()
+        .from(schema.shippingLabels)
+        .where(eq(schema.shippingLabels.orderId, orderId))
+        .orderBy(desc(schema.shippingLabels.createdAt))
+        .limit(1);
+    return label || null;
+}
+/**
+ * Per-line weights for parcel-weight estimation (Colissimo). Product weight
+ * lives in the `weight` metafield (kg — the PrestaShop-import convention);
+ * lines whose product has no weight metafield return null so the caller can
+ * apply the store's default item weight.
+ */
+export async function getOrderItemWeights(orderId) {
+    const db = getDb();
+    const rows = await db
+        .select({
+        quantity: schema.orderItems.quantity,
+        metafields: schema.products.metafields,
+    })
+        .from(schema.orderItems)
+        .leftJoin(schema.products, eq(schema.products.id, schema.orderItems.productId))
+        .where(eq(schema.orderItems.orderId, orderId));
+    return rows.map((r) => {
+        const list = r.metafields ?? [];
+        const raw = list.find((m) => m?.key === 'weight')?.value;
+        const parsed = raw !== undefined ? Number.parseFloat(String(raw)) : NaN;
+        return {
+            quantity: r.quantity,
+            weightKg: Number.isFinite(parsed) && parsed > 0 ? parsed : null,
+        };
+    });
+}
 /**
  * Find order by Stripe Payment Intent ID
  * Used for idempotency in webhook handling
@@ -1807,6 +1893,10 @@ export async function ensurePaymentMethodsSchema() {
         // Email locale (i18n B3): the locale the order was placed in — drives its
         // lifecycle emails. customers.locale rides ensureCustomerGroupsSchema.
         await db.execute(sql `ALTER TABLE orders ADD COLUMN IF NOT EXISTS locale varchar(5)`);
+        // Carrier relay delivery (SDK 0.20.0 — Colissimo Point Retrait): the
+        // carrier pickup-point the customer chose. shippingAddress snapshots the
+        // relay's address; this keeps the carrier point id/type for labels.
+        await db.execute(sql `ALTER TABLE orders ADD COLUMN IF NOT EXISTS relay jsonb`);
         // Group gating (Phase 4) — payment_methods reads all pass through here.
         await ensureVisibilityColumns();
         paymentMethodsSchemaEnsured = true;
@@ -2447,6 +2537,19 @@ export async function ensureStoreSettingsSchema() {
         await db.execute(sql `
       ALTER TABLE store_settings
       ADD COLUMN IF NOT EXISTS public_metafield_keys jsonb NOT NULL DEFAULT '[]'::jsonb
+    `);
+        // Colissimo carrier integration (SDK 0.20.0). Credentials are server-only
+        // secrets — excluded from the public settings allowlist by construction.
+        // Relay PRICING deliberately has no settings columns: relay offers are
+        // ordinary shipping_rates rows (fulfillment='relay') under a colissimo
+        // carrier — one pricing engine for every carrier.
+        await db.execute(sql `
+      ALTER TABLE store_settings
+      ADD COLUMN IF NOT EXISTS colissimo_contract_number varchar(20),
+      ADD COLUMN IF NOT EXISTS colissimo_password varchar(64),
+      ADD COLUMN IF NOT EXISTS colissimo_enabled boolean DEFAULT false,
+      ADD COLUMN IF NOT EXISTS colissimo_sender_address jsonb,
+      ADD COLUMN IF NOT EXISTS colissimo_default_weight_kg decimal(8,2)
     `);
         storeSettingsSchemaEnsured = true;
     }
@@ -2642,6 +2745,14 @@ export async function findSettings() {
         shippoTestMode: settings.shippoTestMode,
         shippoFromAddress: settings.shippoFromAddress,
         shippoDefaultParcel: settings.shippoDefaultParcel,
+        // Colissimo fields (SDK 0.20.0)
+        colissimoContractNumber: settings.colissimoContractNumber,
+        colissimoPassword: settings.colissimoPassword,
+        colissimoEnabled: settings.colissimoEnabled,
+        colissimoSenderAddress: settings.colissimoSenderAddress,
+        colissimoDefaultWeightKg: settings.colissimoDefaultWeightKg
+            ? Number(settings.colissimoDefaultWeightKg)
+            : null,
         // Discount/promotion configuration
         promotionCodesEnabled: settings.promotionCodesEnabled,
         // Cookie consent banner (R021)
@@ -2722,6 +2833,15 @@ export async function upsertSettings(data) {
         shippoTestMode: data.shippoTestMode ?? undefined,
         shippoFromAddress: data.shippoFromAddress ?? undefined,
         shippoDefaultParcel: data.shippoDefaultParcel ?? undefined,
+        // Colissimo (SDK 0.20.0). Credentials map explicit null -> NULL (the
+        // disconnect route clears them), like the branding pointers above.
+        colissimoContractNumber: data.colissimoContractNumber !== undefined ? data.colissimoContractNumber : undefined,
+        colissimoPassword: data.colissimoPassword !== undefined ? data.colissimoPassword : undefined,
+        colissimoEnabled: data.colissimoEnabled ?? undefined,
+        colissimoSenderAddress: data.colissimoSenderAddress ?? undefined,
+        colissimoDefaultWeightKg: data.colissimoDefaultWeightKg !== null && data.colissimoDefaultWeightKg !== undefined
+            ? String(data.colissimoDefaultWeightKg)
+            : undefined,
         // Discount/promotion configuration
         promotionCodesEnabled: data.promotionCodesEnabled ?? undefined,
         // Cookie consent banner (R021)
@@ -2773,6 +2893,14 @@ export async function upsertSettings(data) {
         shippoTestMode: result.shippoTestMode,
         shippoFromAddress: result.shippoFromAddress,
         shippoDefaultParcel: result.shippoDefaultParcel,
+        // Colissimo fields (SDK 0.20.0)
+        colissimoContractNumber: result.colissimoContractNumber,
+        colissimoPassword: result.colissimoPassword,
+        colissimoEnabled: result.colissimoEnabled,
+        colissimoSenderAddress: result.colissimoSenderAddress,
+        colissimoDefaultWeightKg: result.colissimoDefaultWeightKg
+            ? Number(result.colissimoDefaultWeightKg)
+            : null,
         // Discount/promotion configuration
         promotionCodesEnabled: result.promotionCodesEnabled,
         // Cookie consent banner (R021)
@@ -2781,10 +2909,72 @@ export async function upsertSettings(data) {
         publicMetafieldKeys: result.publicMetafieldKeys ?? [],
     };
 }
+/**
+ * Self-heal for the carrier-registry columns (SDK 0.20.0):
+ * shipping_carriers.provider/logo_url + shipping_rates.fulfillment. Drizzle
+ * `select()` enumerates every declared column, so every carrier/rate read
+ * chokepoint calls this first. Idempotent; cached in-process.
+ */
+let shippingCarrierSchemaEnsured = false;
+export async function ensureShippingCarrierSchema() {
+    if (shippingCarrierSchemaEnsured)
+        return;
+    const db = getDb();
+    try {
+        await db.execute(sql `
+      ALTER TABLE shipping_carriers
+      ADD COLUMN IF NOT EXISTS provider varchar(20) NOT NULL DEFAULT 'manual',
+      ADD COLUMN IF NOT EXISTS logo_url varchar(500)
+    `);
+        await db.execute(sql `
+      ALTER TABLE shipping_rates
+      ADD COLUMN IF NOT EXISTS fulfillment varchar(20) NOT NULL DEFAULT 'home'
+    `);
+        shippingCarrierSchemaEnsured = true;
+    }
+    catch (err) {
+        console.error('[ensureShippingCarrierSchema] migration failed:', err);
+        throw err;
+    }
+}
+/** Best-effort variant — never throws (the subsequent read surfaces real errors). */
+export async function ensureShippingCarrierSchemaSafe() {
+    try {
+        await ensureShippingCarrierSchema();
+    }
+    catch {
+        // Swallow — the caller's own query reports the real failure.
+    }
+}
+/**
+ * Legacy-mode self-heal: a store that ran `shipping_mode = 'shippo'` (the
+ * retired global either/or) gets a shippo carrier ROW in the registry so its
+ * live quotes keep flowing under the multi-carrier model. Idempotent
+ * (INSERT … WHERE NOT EXISTS); cached in-process.
+ */
+let legacyShippoCarrierEnsured = false;
+export async function ensureLegacyShippoCarrier(shippingMode) {
+    if (legacyShippoCarrierEnsured || shippingMode !== 'shippo')
+        return;
+    try {
+        await ensureShippingCarrierSchema();
+        const db = getDb();
+        await db.execute(sql `
+      INSERT INTO shipping_carriers (name, code, provider, is_active, sort_order)
+      SELECT 'Carrier rates', 'shippo', 'shippo', true, 0
+      WHERE NOT EXISTS (SELECT 1 FROM shipping_carriers WHERE provider = 'shippo')
+    `);
+        legacyShippoCarrierEnsured = true;
+    }
+    catch (err) {
+        console.error('[ensureLegacyShippoCarrier] failed (non-fatal):', err);
+    }
+}
 /**
  * Find all shipping carriers
  */
 export async function findShippingCarriers() {
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const carriers = await db
         .select()
@@ -2795,6 +2985,8 @@ export async function findShippingCarriers() {
         name: carrier.name,
         code: carrier.code,
         description: carrier.description,
+        provider: carrier.provider ?? 'manual',
+        logoUrl: carrier.logoUrl ?? null,
         isActive: carrier.isActive,
         sortOrder: carrier.sortOrder,
         createdAt: carrier.createdAt,
@@ -2805,6 +2997,7 @@ export async function findShippingCarriers() {
  * Find active shipping carriers only
  */
 export async function findActiveShippingCarriers() {
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const carriers = await db
         .select()
@@ -2816,6 +3009,8 @@ export async function findActiveShippingCarriers() {
         name: carrier.name,
         code: carrier.code,
         description: carrier.description,
+        provider: carrier.provider ?? 'manual',
+        logoUrl: carrier.logoUrl ?? null,
         isActive: carrier.isActive,
         sortOrder: carrier.sortOrder,
         createdAt: carrier.createdAt,
@@ -2826,6 +3021,7 @@ export async function findActiveShippingCarriers() {
  * Find a shipping carrier by ID
  */
 export async function findShippingCarrierById(id) {
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const [carrier] = await db
         .select()
@@ -2839,6 +3035,8 @@ export async function findShippingCarrierById(id) {
         name: carrier.name,
         code: carrier.code,
         description: carrier.description,
+        provider: carrier.provider ?? 'manual',
+        logoUrl: carrier.logoUrl ?? null,
         isActive: carrier.isActive,
         sortOrder: carrier.sortOrder,
         createdAt: carrier.createdAt,
@@ -2849,6 +3047,7 @@ export async function findShippingCarrierById(id) {
  * Create a new shipping carrier
  */
 export async function createShippingCarrier(data) {
+    await ensureShippingCarrierSchema();
     const db = getDb();
     const [carrier] = await db
         .insert(schema.shippingCarriers)
@@ -2856,6 +3055,8 @@ export async function createShippingCarrier(data) {
         name: data.name,
         code: data.code,
         description: data.description || null,
+        provider: data.provider || 'manual',
+        logoUrl: data.logoUrl ?? null,
         isActive: data.isActive ?? true,
         sortOrder: data.sortOrder ?? 0,
     })
@@ -2866,6 +3067,7 @@ export async function createShippingCarrier(data) {
  * Update a shipping carrier
  */
 export async function updateShippingCarrier(id, data) {
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const [carrier] = await db
         .update(schema.shippingCarriers)
@@ -2909,8 +3111,10 @@ export async function findCarriersWithZonesAndRates() {
  * Find all shipping zones with their rates and carrier info
  */
 export async function findShippingZones() {
-    // Rate SELECTs enumerate visible_to_groups — self-heal older stores first.
+    // Rate SELECTs enumerate visible_to_groups + fulfillment — self-heal older
+    // stores first.
     await ensureVisibilityColumnsSafe();
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     // Get all zones with carrier info via join
     const zonesWithCarriers = await db
@@ -2920,6 +3124,9 @@ export async function findShippingZones() {
             id: schema.shippingCarriers.id,
             name: schema.shippingCarriers.name,
             code: schema.shippingCarriers.code,
+            provider: schema.shippingCarriers.provider,
+            logoUrl: schema.shippingCarriers.logoUrl,
+            isActive: schema.shippingCarriers.isActive,
         },
     })
         .from(schema.shippingZones)
@@ -2945,6 +3152,9 @@ export async function findShippingZones() {
             id: carrier.id,
             name: carrier.name,
             code: carrier.code,
+            provider: carrier.provider ?? 'manual',
+            logoUrl: carrier.logoUrl ?? null,
+            isActive: carrier.isActive ?? true,
         } : undefined,
         name: zone.name,
         countries: zone.countries || [],
@@ -2963,6 +3173,7 @@ export async function findShippingZones() {
             isActive: rate.isActive,
             sortOrder: rate.sortOrder,
             visibleToGroups: Array.isArray(rate.visibleToGroups) ? rate.visibleToGroups : [],
+            fulfillment: rate.fulfillment === 'relay' ? 'relay' : 'home',
         })),
     }));
 }
@@ -3025,6 +3236,7 @@ export async function deleteShippingZone(id) {
  */
 export async function createShippingRate(data) {
     await ensureVisibilityColumnsSafe();
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const [rate] = await db
         .insert(schema.shippingRates)
@@ -3039,6 +3251,7 @@ export async function createShippingRate(data) {
         isActive: data.isActive ?? true,
         sortOrder: data.sortOrder ?? 0,
         visibleToGroups: data.visibleToGroups ?? [],
+        fulfillment: data.fulfillment ?? 'home',
     })
         .returning();
     return rate;
@@ -3048,6 +3261,7 @@ export async function createShippingRate(data) {
  */
 export async function updateShippingRate(id, data) {
     await ensureVisibilityColumnsSafe();
+    await ensureShippingCarrierSchemaSafe();
     const db = getDb();
     const updateData = {};
     if (data.name !== undefined)
@@ -3068,6 +3282,8 @@ export async function updateShippingRate(id, data) {
         updateData.sortOrder = data.sortOrder;
     if (data.visibleToGroups !== undefined)
         updateData.visibleToGroups = data.visibleToGroups;
+    if (data.fulfillment !== undefined)
+        updateData.fulfillment = data.fulfillment;
     const [rate] = await db
         .update(schema.shippingRates)
         .set(updateData)
@@ -3101,6 +3317,10 @@ export async function findShippingRatesForCountry(country, orderAmount, groupId)
         // Skip zones without a carrier (shouldn't happen, but defensive)
         if (!zone.carrier)
             continue;
+        // A deactivated CARRIER withdraws all its offers (registry semantics —
+        // pre-0.20.0 the flag was cosmetic in the quote path).
+        if (!zone.carrier.isActive)
+            continue;
         // Check if zone covers this country
         // '*' means all countries (international catch-all)
         const coversCountry = zone.countries.includes('*') || zone.countries.includes(country.toUpperCase());
@@ -3124,11 +3344,14 @@ export async function findShippingRatesForCountry(country, orderAmount, groupId)
                 carrierId: zone.carrierId,
                 carrierName: zone.carrier.name,
                 carrierCode: zone.carrier.code,
+                carrierProvider: zone.carrier.provider,
+                carrierLogoUrl: zone.carrier.logoUrl,
                 zoneName: zone.name,
                 name: rate.name,
                 description: rate.description,
                 price: rate.price,
                 estimatedDays: rate.estimatedDays,
+                fulfillment: rate.fulfillment,
             });
         }
     }
@@ -3154,6 +3377,8 @@ export async function findShippingOptionsForCountry(country, orderAmount, groupI
                     id: rate.carrierId,
                     name: rate.carrierName,
                     code: rate.carrierCode,
+                    provider: rate.carrierProvider,
+                    logoUrl: rate.carrierLogoUrl,
                 },
                 options: [],
             };
@@ -3169,6 +3394,8 @@ export async function findShippingOptionsForCountry(country, orderAmount, groupI
             price: rate.price,
             estimatedDays: rate.estimatedDays ?? undefined,
             source: 'manual',
+            provider: rate.carrierProvider,
+            fulfillment: rate.fulfillment,
         });
     }
     // Convert to array and sort by carrier name