@porulle/plugin-pos-restaurant 0.7.0 → 0.9.0

package/dist/services/kds-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kds-service.d.ts","sourceRoot":"","sources":["../../src/services/kds-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kds-service.d.ts","sourceRoot":"","sources":["../../src/services/kds-service.ts"],"names":[],"mappings":"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"}

package/dist/services/kds-service.js

@@ -112,7 +112,7 @@ export class KDSService {
                 .from(kdsTickets)
                 .where(and(eq(kdsTickets.transactionId, input.transactionId), eq(kdsTickets.stationId, station.id)));
             const ticketType = existingTickets.length > 0 ? "modified" : "new_order";
-            const ticketNumber = await this.generateTicketNumber(station.id);
+            const ticketNumber = await this.generateTicketNumber(orgId, station.id);
             const ticketRows = await this.db
                 .insert(kdsTickets)
                 .values({
@@ -232,14 +232,14 @@ export class KDSService {
         return Ok(result);
     }
     // ─── Helpers ───────────────────────────────────────────────────────
-    async generateTicketNumber(stationId) {
+    async generateTicketNumber(orgId, stationId) {
         const today = new Date();
         const startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
         const startOfDayISO = startOfDay.toISOString();
         const countRows = await this.db
             .select({ count: sql `COUNT(*)`.as("count") })
             .from(kdsTickets)
-            .where(and(eq(kdsTickets.stationId, stationId), sql `${kdsTickets.createdAt} >= ${startOfDayISO}::timestamptz`));
+            .where(and(eq(kdsTickets.organizationId, orgId), eq(kdsTickets.stationId, stationId), sql `${kdsTickets.createdAt} >= ${startOfDayISO}::timestamptz`));
         const seq = Number(countRows[0]?.count ?? 0) + 1;
         return `KDS-${String(seq).padStart(4, "0")}`;
     }

package/dist/services/recipe-deduction-service.d.ts

@@ -48,7 +48,8 @@ export declare class RecipeDeductionService {
      *   - Used when services are not available (standalone scripts, tests)
      *   - Same oversell protection via UPDATE ... WHERE quantity_on_hand >= N
      */
-    applyDeductions(tx: Db, deductions: DeductionItem[], warehouseId: string, referenceType: string, referenceId: string, performedBy: string): Promise<PluginResult<number>>;
+    applyDeductions(tx: Db, deductions: DeductionItem[], warehouseId: string, referenceType: string, referenceId: string, performedBy: string, orgId?: string): Promise<PluginResult<number>>;
+    private resolveOrgIdFromWarehouse;
     /**
      * Strategy 1: Deduct via kernel.services.inventory.adjust().
      * Each deduction becomes a negative adjustment with a reason.

package/dist/services/recipe-deduction-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipe-deduction-service.d.ts","sourceRoot":"","sources":["../../src/services/recipe-deduction-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAUtC,UAAU,aAAa;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,EAAE;IAHZ,OAAO,CAAC,YAAY,CAAC,CAAoB;gBAG/B,EAAE,EAAE,EAAE,EACd,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQpC;;;OAGG;IACG,iBAAiB,CACrB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAwCzC;;;;;;;;;;;OAWG;IACG,eAAe,CACnB,EAAE,EAAE,EAAE,EACN,UAAU,EAAE,aAAa,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAQhC;;;OAGG;YACW,eAAe;IAwC7B;;;OAGG;YACW,cAAc;CA6C7B"}
+{"version":3,"file":"recipe-deduction-service.d.ts","sourceRoot":"","sources":["../../src/services/recipe-deduction-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAUtC,UAAU,aAAa;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,sBAAsB;IAI/B,OAAO,CAAC,EAAE;IAHZ,OAAO,CAAC,YAAY,CAAC,CAAoB;gBAG/B,EAAE,EAAE,EAAE,EACd,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQpC;;;OAGG;IACG,iBAAiB,CACrB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,GACnD,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAwCzC;;;;;;;;;;;OAWG;IACG,eAAe,CACnB,EAAE,EAAE,EAAE,EACN,UAAU,EAAE,aAAa,EAAE,EAC3B,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAmBlB,yBAAyB;IAUvC;;;OAGG;YACW,eAAe;IAwC7B;;;OAGG;YACW,cAAc;CA+C7B"}

package/dist/services/recipe-deduction-service.js

@@ -15,7 +15,7 @@
  * falls back to raw SQL with the same atomic guard.
  */
 import { eq, and, sql } from "@porulle/core/drizzle";
-import { Ok } from "@porulle/core";
+import { Ok, Err } from "@porulle/core";
 import { posRecipes, posRecipeIngredients } from "../schema.js";
 export class RecipeDeductionService {
     db;
@@ -73,11 +73,21 @@ export class RecipeDeductionService {
      *   - Used when services are not available (standalone scripts, tests)
      *   - Same oversell protection via UPDATE ... WHERE quantity_on_hand >= N
      */
-    async applyDeductions(tx, deductions, warehouseId, referenceType, referenceId, performedBy) {
+    async applyDeductions(tx, deductions, warehouseId, referenceType, referenceId, performedBy, orgId) {
         if (this.inventorySvc) {
             return this.applyViaService(deductions, warehouseId, performedBy);
         }
-        return this.applyViaRawSQL(tx, deductions, warehouseId, referenceType, referenceId, performedBy);
+        const resolvedOrgId = orgId ?? await this.resolveOrgIdFromWarehouse(tx, warehouseId);
+        if (!resolvedOrgId)
+            return Err("Warehouse not found");
+        return this.applyViaRawSQL(tx, deductions, warehouseId, referenceType, referenceId, performedBy, resolvedOrgId);
+    }
+    async resolveOrgIdFromWarehouse(tx, warehouseId) {
+        const result = await tx.execute(sql `SELECT organization_id FROM warehouses WHERE id = ${warehouseId} LIMIT 1`);
+        const rows = Array.isArray(result)
+            ? result
+            : result.rows;
+        return rows[0]?.organization_id ?? null;
     }
     /**
      * Strategy 1: Deduct via kernel.services.inventory.adjust().
@@ -115,7 +125,7 @@ export class RecipeDeductionService {
      * Strategy 2: Raw SQL fallback with atomic oversell guard.
      * Used when ServiceRegistry is not available.
      */
-    async applyViaRawSQL(tx, deductions, warehouseId, referenceType, referenceId, performedBy) {
+    async applyViaRawSQL(tx, deductions, warehouseId, referenceType, referenceId, performedBy, orgId) {
         let applied = 0;
         // PluginDb (PgDatabase) has .execute() — no cast needed
         const exec = tx;
@@ -127,16 +137,17 @@ export class RecipeDeductionService {
             const updateResult = await exec.execute(sql `UPDATE inventory_levels
             SET quantity_on_hand = quantity_on_hand - ${d.quantity}, updated_at = NOW()
             WHERE entity_id = ${d.entityId} AND warehouse_id = ${warehouseId} AND ${variantClause}
+              AND organization_id = ${orgId}
               AND quantity_on_hand >= ${d.quantity}
             RETURNING quantity_on_hand`);
             const rows = Array.isArray(updateResult) ? updateResult : updateResult.rows;
             if (rows.length === 0) {
-                await exec.execute(sql `INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, type, quantity, reference_type, reference_id, reason, performed_by)
-              VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, 'sale', ${0}, ${referenceType}, ${referenceId}, ${"SKIPPED: insufficient stock for " + d.reason}, ${performedBy})`);
+                await exec.execute(sql `INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, organization_id, type, quantity, reference_type, reference_id, reason, performed_by)
+              VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, ${orgId}, 'sale', ${0}, ${referenceType}, ${referenceId}, ${"SKIPPED: insufficient stock for " + d.reason}, ${performedBy})`);
                 continue;
             }
-            await exec.execute(sql `INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, type, quantity, reference_type, reference_id, reason, performed_by)
-            VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, 'sale', ${-d.quantity}, ${referenceType}, ${referenceId}, ${d.reason}, ${performedBy})`);
+            await exec.execute(sql `INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, organization_id, type, quantity, reference_type, reference_id, reason, performed_by)
+            VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, ${orgId}, 'sale', ${-d.quantity}, ${referenceType}, ${referenceId}, ${d.reason}, ${performedBy})`);
             applied++;
         }
         return Ok(applied);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/plugin-pos-restaurant",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -19,8 +19,8 @@
   "dependencies": {
     "@hono/zod-openapi": "^1.2.2",
     "hono": "^4.12.5",
-    "@porulle/core": "0.7.0",
-    "@porulle/plugin-pos": "0.7.0"
+    "@porulle/plugin-pos": "0.9.0",
+    "@porulle/core": "0.9.0"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",

package/src/services/kds-service.ts

@@ -175,7 +175,7 @@ export class KDSService {
         ));
 
       const ticketType = existingTickets.length > 0 ? "modified" : "new_order";
-      const ticketNumber = await this.generateTicketNumber(station.id);
+      const ticketNumber = await this.generateTicketNumber(orgId, station.id);
 
       const ticketRows = await this.db
         .insert(kdsTickets)
@@ -321,7 +321,7 @@ export class KDSService {
 
   // ─── Helpers ───────────────────────────────────────────────────────
 
-  private async generateTicketNumber(stationId: string): Promise<string> {
+  private async generateTicketNumber(orgId: string, stationId: string): Promise<string> {
     const today = new Date();
     const startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
     const startOfDayISO = startOfDay.toISOString();
@@ -330,6 +330,7 @@ export class KDSService {
       .select({ count: sql<number>`COUNT(*)`.as("count") })
       .from(kdsTickets)
       .where(and(
+        eq(kdsTickets.organizationId, orgId),
         eq(kdsTickets.stationId, stationId),
         sql`${kdsTickets.createdAt} >= ${startOfDayISO}::timestamptz`,
       ));

package/src/services/recipe-deduction-service.ts

@@ -16,7 +16,7 @@
  */
 
 import { eq, and, sql } from "@porulle/core/drizzle";
-import { Ok } from "@porulle/core";
+import { Ok, Err } from "@porulle/core";
 import type { PluginResult } from "@porulle/core";
 import { posRecipes, posRecipeIngredients } from "../schema.js";
 import type { Db } from "../types.js";
@@ -117,12 +117,34 @@ export class RecipeDeductionService {
     referenceType: string,
     referenceId: string,
     performedBy: string,
+    orgId?: string,
   ): Promise<PluginResult<number>> {
     if (this.inventorySvc) {
       return this.applyViaService(deductions, warehouseId, performedBy);
     }
 
-    return this.applyViaRawSQL(tx, deductions, warehouseId, referenceType, referenceId, performedBy);
+    const resolvedOrgId = orgId ?? await this.resolveOrgIdFromWarehouse(tx, warehouseId);
+    if (!resolvedOrgId) return Err("Warehouse not found");
+
+    return this.applyViaRawSQL(
+      tx,
+      deductions,
+      warehouseId,
+      referenceType,
+      referenceId,
+      performedBy,
+      resolvedOrgId,
+    );
+  }
+
+  private async resolveOrgIdFromWarehouse(tx: Db, warehouseId: string): Promise<string | null> {
+    const result = await tx.execute(
+      sql`SELECT organization_id FROM warehouses WHERE id = ${warehouseId} LIMIT 1`,
+    );
+    const rows = Array.isArray(result)
+      ? result as Array<{ organization_id: string }>
+      : (result as { rows: Array<{ organization_id: string }> }).rows;
+    return rows[0]?.organization_id ?? null;
   }
 
   /**
@@ -180,6 +202,7 @@ export class RecipeDeductionService {
     referenceType: string,
     referenceId: string,
     performedBy: string,
+    orgId: string,
   ): Promise<PluginResult<number>> {
     let applied = 0;
     // PluginDb (PgDatabase) has .execute() — no cast needed
@@ -195,6 +218,7 @@ export class RecipeDeductionService {
         sql`UPDATE inventory_levels
             SET quantity_on_hand = quantity_on_hand - ${d.quantity}, updated_at = NOW()
             WHERE entity_id = ${d.entityId} AND warehouse_id = ${warehouseId} AND ${variantClause}
+              AND organization_id = ${orgId}
               AND quantity_on_hand >= ${d.quantity}
             RETURNING quantity_on_hand`,
       );
@@ -202,15 +226,15 @@ export class RecipeDeductionService {
       const rows = Array.isArray(updateResult) ? updateResult : (updateResult as { rows: unknown[] }).rows;
       if (rows.length === 0) {
         await exec.execute(
-          sql`INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, type, quantity, reference_type, reference_id, reason, performed_by)
-              VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, 'sale', ${0}, ${referenceType}, ${referenceId}, ${"SKIPPED: insufficient stock for " + d.reason}, ${performedBy})`,
+          sql`INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, organization_id, type, quantity, reference_type, reference_id, reason, performed_by)
+              VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, ${orgId}, 'sale', ${0}, ${referenceType}, ${referenceId}, ${"SKIPPED: insufficient stock for " + d.reason}, ${performedBy})`,
         );
         continue;
       }
 
       await exec.execute(
-        sql`INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, type, quantity, reference_type, reference_id, reason, performed_by)
-            VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, 'sale', ${-d.quantity}, ${referenceType}, ${referenceId}, ${d.reason}, ${performedBy})`,
+        sql`INSERT INTO inventory_movements (entity_id, variant_id, warehouse_id, organization_id, type, quantity, reference_type, reference_id, reason, performed_by)
+            VALUES (${d.entityId}, ${d.variantId}, ${warehouseId}, ${orgId}, 'sale', ${-d.quantity}, ${referenceType}, ${referenceId}, ${d.reason}, ${performedBy})`,
       );
 
       applied++;