@devx-retailos/cms 0.0.2 → 0.1.0

package/.medusa/server/src/api/admin/retailos/cms/accumulation/[storeId]/route.js

@@ -17,10 +17,8 @@ const GET = async (req, res) => {
     const { storeId } = req.params;
     try {
         const service = getService(req);
-        const accumulation = await service.getAccumulation(storeId);
-        return res.status(200).json({
-            accumulation: accumulation ?? { store_id: storeId, cash_in_store: 0 },
-        });
+        const accumulation = await service.getEnrichedAccumulation(storeId);
+        return res.status(200).json({ accumulation });
     }
     catch (err) {
         getLogger(req).error("[retailos/cms] get accumulation failed", {
@@ -31,4 +29,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldGFpbG9zL2Ntcy9hY2N1bXVsYXRpb24vW3N0b3JlSWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHVFQUFvRTtBQUdwRSxTQUFTLFVBQVUsQ0FBQyxHQUErQjtJQUNqRCxPQUFRLEdBQVcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLHNCQUFVLENBQUMsQ0FBQTtBQUMvQyxDQUFDO0FBRUQsU0FBUyxTQUFTLENBQUMsR0FBK0I7SUFDaEQsSUFBSSxDQUFDO1FBQ0gsT0FBUSxHQUFXLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsQ0FBQTtJQUM3RSxDQUFDO0FBQ0gsQ0FBQztBQUVNLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUErQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNoRixNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUM5QixJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDL0IsTUFBTSxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzNELE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDMUIsWUFBWSxFQUFFLFlBQVksSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLENBQUMsRUFBRTtTQUN0RSxDQUFDLENBQUE7SUFDSixDQUFDO0lBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQztRQUNiLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsd0NBQXdDLEVBQUU7WUFDN0QsUUFBUSxFQUFFLE9BQU87WUFDakIsS0FBSyxFQUFFLEdBQUcsWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUM7U0FDeEQsQ0FBQyxDQUFBO1FBQ0YsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxPQUFPLEVBQUcsR0FBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDMUYsQ0FBQztBQUNILENBQUMsQ0FBQTtBQWZZLFFBQUEsR0FBRyxPQWVmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldGFpbG9zL2Ntcy9hY2N1bXVsYXRpb24vW3N0b3JlSWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHVFQUFvRTtBQUdwRSxTQUFTLFVBQVUsQ0FBQyxHQUErQjtJQUNqRCxPQUFRLEdBQVcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLHNCQUFVLENBQUMsQ0FBQTtBQUMvQyxDQUFDO0FBRUQsU0FBUyxTQUFTLENBQUMsR0FBK0I7SUFDaEQsSUFBSSxDQUFDO1FBQ0gsT0FBUSxHQUFXLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsQ0FBQTtJQUM3RSxDQUFDO0FBQ0gsQ0FBQztBQUVNLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUErQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNoRixNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUM5QixJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDL0IsTUFBTSxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDbkUsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDYixTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLHdDQUF3QyxFQUFFO1lBQzdELFFBQVEsRUFBRSxPQUFPO1lBQ2pCLEtBQUssRUFBRSxHQUFHLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDO1NBQ3hELENBQUMsQ0FBQTtRQUNGLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFHLEdBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQzFGLENBQUM7QUFDSCxDQUFDLENBQUE7QUFiWSxRQUFBLEdBQUcsT0FhZiJ9

package/.medusa/server/src/modules/cms/services/cms-module-service.js

@@ -33,6 +33,8 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
         else {
             await this.updateRetailosCmsAccumulations([{ id: existing[0].id, cash_in_store: opening_amount }]);
         }
+        const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
+        const petty_cash_balance = pettyCashes[0] ? pettyCashes[0].balance : 0;
         await this.createRetailosPettyCashTransactions([{
                 store_id,
                 employee_id,
@@ -49,9 +51,9 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
                 reason: null,
                 image_url: null,
                 date: new Date(),
-                metadata: null,
+                metadata: { petty_cash_balance },
             }]);
-        this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount });
+        this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount, petty_cash_balance });
     }
     async dayEnd(input) {
         const { store_id, employee_id, closing_amount } = input;
@@ -61,6 +63,8 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
         const accumulations = await this.listRetailosCmsAccumulations({ store_id: [store_id] });
         const current_cash = accumulations[0] ? accumulations[0].cash_in_store : 0;
         const difference = closing_amount - current_cash;
+        const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
+        const petty_cash_balance = pettyCashes[0] ? pettyCashes[0].balance : 0;
         await this.createRetailosPettyCashTransactions([{
                 store_id,
                 employee_id,
@@ -77,9 +81,9 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
                 reason: null,
                 image_url: null,
                 date: new Date(),
-                metadata: null,
+                metadata: { petty_cash_balance },
             }]);
-        this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference });
+        this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference, petty_cash_balance });
     }
     async handover(input) {
         const { store_id, handover_amount, type } = input;
@@ -214,6 +218,27 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
         const rows = await this.listRetailosCmsAccumulations({ store_id: [store_id] });
         return rows[0] ?? null;
     }
+    async getEnrichedAccumulation(store_id) {
+        const accumulation = await this.getAccumulation(store_id);
+        const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
+        const petty_cash = pettyCashes[0] ? pettyCashes[0].balance : 0;
+        const now = new Date();
+        const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
+        const start = new Date(`${dateStr}T00:00:00.000Z`);
+        const end = new Date(`${dateStr}T23:59:59.999Z`);
+        const todayTxns = await this.listRetailosPettyCashTransactions({ store_id: [store_id], created_at: { $gte: start, $lte: end } }, { take: 10, order: { created_at: "ASC" } });
+        const txnList = todayTxns;
+        const openTx = txnList.find((t) => t.transaction_type === "open");
+        const closeTx = txnList.find((t) => t.transaction_type === "close");
+        return {
+            ...(accumulation ? accumulation : { store_id, cash_in_store: 0 }),
+            petty_cash,
+            opening_store_cash: openTx ? openTx.amount : null,
+            opening_petty_cash: openTx?.metadata?.petty_cash_balance ?? null,
+            closing_store_cash: closeTx ? closeTx.amount : null,
+            closing_petty_cash: closeTx?.metadata?.petty_cash_balance ?? null,
+        };
+    }
     async getReconciliationReport(input) {
         const { store_id, date, net_cash_sales = 0 } = input;
         const start = new Date(`${date}T00:00:00.000Z`);
@@ -277,4 +302,4 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
     }
 }
 exports.default = CmsModuleService;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cms-module-service.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/services/cms-module-service.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cms-module-service.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/services/cms-module-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devx-retailos/cms",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "Cash Management System for retailOS: shift ops, handovers, petty cash, accumulation.",
   "license": "MIT",
   "main": "./.medusa/server/src/modules/cms/index.js",
@@ -25,9 +25,9 @@
     "src"
   ],
   "dependencies": {
-    "@devx-retailos/core": "0.0.2",
+    "@devx-retailos/rbac": "0.0.2",
     "@devx-retailos/employee": "0.0.3",
-    "@devx-retailos/rbac": "0.0.2"
+    "@devx-retailos/core": "0.0.2"
   },
   "peerDependencies": {
     "@medusajs/framework": "^2.15.0",

package/src/api/admin/retailos/cms/accumulation/[storeId]/__tests__/route.test.ts

@@ -3,7 +3,7 @@ import { GET } from "../route"
 
 function makeService() {
   return {
-    getAccumulation: vi.fn(),
+    getEnrichedAccumulation: vi.fn(),
   }
 }
 
@@ -28,35 +28,53 @@ function makeRes() {
 }
 
 describe("GET /accumulation/[storeId]", () => {
-  it("returns accumulation when it exists", async () => {
+  it("returns enriched accumulation when it exists", async () => {
     const service = makeService()
-    const accumulation = { id: "cmsa_1", store_id: "s1", cash_in_store: 750 }
-    service.getAccumulation.mockResolvedValue(accumulation)
+    const accumulation = {
+      id: "cmsa_1",
+      store_id: "s1",
+      cash_in_store: 750,
+      petty_cash: 200,
+      opening_store_cash: 500,
+      opening_petty_cash: 150,
+      closing_store_cash: null,
+      closing_petty_cash: null,
+    }
+    service.getEnrichedAccumulation.mockResolvedValue(accumulation)
     const req = makeReq({ storeId: "s1" }, service)
     const res = makeRes()
 
     await GET(req as any, res as any)
 
-    expect(service.getAccumulation).toHaveBeenCalledWith("s1")
+    expect(service.getEnrichedAccumulation).toHaveBeenCalledWith("s1")
     expect(res.status).toHaveBeenCalledWith(200)
     expect(res.json).toHaveBeenCalledWith({ accumulation })
   })
 
-  it("returns default zero accumulation when none exists", async () => {
+  it("returns default zero accumulation when no day has started", async () => {
     const service = makeService()
-    service.getAccumulation.mockResolvedValue(null)
+    const accumulation = {
+      store_id: "s1",
+      cash_in_store: 0,
+      petty_cash: 0,
+      opening_store_cash: null,
+      opening_petty_cash: null,
+      closing_store_cash: null,
+      closing_petty_cash: null,
+    }
+    service.getEnrichedAccumulation.mockResolvedValue(accumulation)
     const req = makeReq({ storeId: "s1" }, service)
     const res = makeRes()
 
     await GET(req as any, res as any)
 
     expect(res.status).toHaveBeenCalledWith(200)
-    expect(res.json).toHaveBeenCalledWith({ accumulation: { store_id: "s1", cash_in_store: 0 } })
+    expect(res.json).toHaveBeenCalledWith({ accumulation })
   })
 
   it("returns 500 when service throws", async () => {
     const service = makeService()
-    service.getAccumulation.mockRejectedValue(new Error("db error"))
+    service.getEnrichedAccumulation.mockRejectedValue(new Error("db error"))
     const req = makeReq({ storeId: "s1" }, service)
     const res = makeRes()
 

package/src/api/admin/retailos/cms/accumulation/[storeId]/route.ts

@@ -21,10 +21,8 @@ export const GET = async (req: AuthenticatedMedusaRequest, res: MedusaResponse)
   const { storeId } = req.params
   try {
     const service = getService(req)
-    const accumulation = await service.getAccumulation(storeId)
-    return res.status(200).json({
-      accumulation: accumulation ?? { store_id: storeId, cash_in_store: 0 },
-    })
+    const accumulation = await service.getEnrichedAccumulation(storeId)
+    return res.status(200).json({ accumulation })
   } catch (err) {
     getLogger(req).error("[retailos/cms] get accumulation failed", {
       store_id: storeId,

package/src/modules/cms/__tests__/cms-module-service.test.ts

@@ -12,7 +12,7 @@ class TestCmsService extends (CmsModuleService as any) {
   listRetailosCmsAccumulations = vi.fn()
   updateRetailosCmsAccumulations = vi.fn()
   createRetailosPettyCashes = vi.fn()
-  listRetailosPettyCashes = vi.fn()
+  listRetailosPettyCashes = vi.fn().mockResolvedValue([])
   updateRetailosPettyCashes = vi.fn()
   createRetailosPettyCashTransactions = vi.fn()
   listRetailosPettyCashTransactions = vi.fn()

package/src/modules/cms/services/cms-module-service.ts

@@ -67,6 +67,20 @@ export interface ReconciliationInput {
   net_cash_sales?: number
 }
 
+export interface EnrichedAccumulation {
+  id?: string
+  store_id: string
+  cash_in_store: number
+  petty_cash: number
+  opening_store_cash: number | null
+  opening_petty_cash: number | null
+  closing_store_cash: number | null
+  closing_petty_cash: number | null
+  created_at?: string
+  updated_at?: string
+  metadata?: Record<string, unknown> | null
+}
+
 export interface ReconciliationReport {
   date: string
   store_id: string
@@ -113,6 +127,9 @@ class CmsModuleService extends MedusaService({
       await this.updateRetailosCmsAccumulations([{ id: (existing[0] as any).id, cash_in_store: opening_amount }])
     }
 
+    const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
+    const petty_cash_balance = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
+
     await this.createRetailosPettyCashTransactions([{
       store_id,
       employee_id,
@@ -129,10 +146,10 @@ class CmsModuleService extends MedusaService({
       reason: null,
       image_url: null,
       date: new Date(),
-      metadata: null,
+      metadata: { petty_cash_balance },
     }])
 
-    this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount })
+    this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount, petty_cash_balance })
   }
 
   async dayEnd(input: DayEndInput): Promise<void> {
@@ -145,6 +162,9 @@ class CmsModuleService extends MedusaService({
     const current_cash = accumulations[0] ? (accumulations[0] as any).cash_in_store : 0
     const difference = closing_amount - current_cash
 
+    const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
+    const petty_cash_balance = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
+
     await this.createRetailosPettyCashTransactions([{
       store_id,
       employee_id,
@@ -161,10 +181,10 @@ class CmsModuleService extends MedusaService({
       reason: null,
       image_url: null,
       date: new Date(),
-      metadata: null,
+      metadata: { petty_cash_balance },
     }])
 
-    this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference })
+    this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference, petty_cash_balance })
   }
 
   async handover(input: HandoverInput) {
@@ -320,6 +340,36 @@ class CmsModuleService extends MedusaService({
     return rows[0] ?? null
   }
 
+  async getEnrichedAccumulation(store_id: string): Promise<EnrichedAccumulation> {
+    const accumulation = await this.getAccumulation(store_id)
+
+    const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
+    const petty_cash = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
+
+    const now = new Date()
+    const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`
+    const start = new Date(`${dateStr}T00:00:00.000Z`)
+    const end = new Date(`${dateStr}T23:59:59.999Z`)
+
+    const todayTxns = await this.listRetailosPettyCashTransactions(
+      { store_id: [store_id], created_at: { $gte: start, $lte: end } as any },
+      { take: 10, order: { created_at: "ASC" } as any }
+    )
+
+    const txnList = todayTxns as any[]
+    const openTx = txnList.find((t) => t.transaction_type === "open")
+    const closeTx = txnList.find((t) => t.transaction_type === "close")
+
+    return {
+      ...(accumulation ? (accumulation as any) : { store_id, cash_in_store: 0 }),
+      petty_cash,
+      opening_store_cash: openTx ? openTx.amount : null,
+      opening_petty_cash: openTx?.metadata?.petty_cash_balance ?? null,
+      closing_store_cash: closeTx ? closeTx.amount : null,
+      closing_petty_cash: closeTx?.metadata?.petty_cash_balance ?? null,
+    }
+  }
+
   async getReconciliationReport(input: ReconciliationInput): Promise<ReconciliationReport> {
     const { store_id, date, net_cash_sales = 0 } = input