@devx-retailos/cms 0.0.2 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.medusa/server/src/api/admin/retailos/cms/accumulation/[storeId]/route.js +3 -5
- package/.medusa/server/src/api/admin/retailos/cms/handovers/route.js +13 -5
- package/.medusa/server/src/api/admin/retailos/cms/petty-cash/route.js +60 -4
- package/.medusa/server/src/modules/cms/services/cms-module-service.js +30 -5
- package/package.json +1 -1
- package/src/api/admin/retailos/cms/accumulation/[storeId]/__tests__/route.test.ts +27 -9
- package/src/api/admin/retailos/cms/accumulation/[storeId]/route.ts +2 -4
- package/src/api/admin/retailos/cms/handovers/route.ts +11 -4
- package/src/api/admin/retailos/cms/petty-cash/__tests__/route.test.ts +2 -2
- package/src/api/admin/retailos/cms/petty-cash/route.ts +59 -4
- package/src/modules/cms/__tests__/cms-module-service.test.ts +1 -1
- package/src/modules/cms/services/cms-module-service.ts +54 -4
|
@@ -17,10 +17,8 @@ const GET = async (req, res) => {
|
|
|
17
17
|
const { storeId } = req.params;
|
|
18
18
|
try {
|
|
19
19
|
const service = getService(req);
|
|
20
|
-
const accumulation = await service.
|
|
21
|
-
return res.status(200).json({
|
|
22
|
-
accumulation: accumulation ?? { store_id: storeId, cash_in_store: 0 },
|
|
23
|
-
});
|
|
20
|
+
const accumulation = await service.getEnrichedAccumulation(storeId);
|
|
21
|
+
return res.status(200).json({ accumulation });
|
|
24
22
|
}
|
|
25
23
|
catch (err) {
|
|
26
24
|
getLogger(req).error("[retailos/cms] get accumulation failed", {
|
|
@@ -31,4 +29,4 @@ const GET = async (req, res) => {
|
|
|
31
29
|
}
|
|
32
30
|
};
|
|
33
31
|
exports.GET = GET;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldGFpbG9zL2Ntcy9hY2N1bXVsYXRpb24vW3N0b3JlSWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHVFQUFvRTtBQUdwRSxTQUFTLFVBQVUsQ0FBQyxHQUErQjtJQUNqRCxPQUFRLEdBQVcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLHNCQUFVLENBQUMsQ0FBQTtBQUMvQyxDQUFDO0FBRUQsU0FBUyxTQUFTLENBQUMsR0FBK0I7SUFDaEQsSUFBSSxDQUFDO1FBQ0gsT0FBUSxHQUFXLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsQ0FBQTtJQUM3RSxDQUFDO0FBQ0gsQ0FBQztBQUVNLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUErQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNoRixNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUM5QixJQUFJLENBQUM7UUFDSCxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDL0IsTUFBTSxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsdUJBQXVCLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDbkUsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUE7SUFDL0MsQ0FBQztJQUFDLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFDYixTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLHdDQUF3QyxFQUFFO1lBQzdELFFBQVEsRUFBRSxPQUFPO1lBQ2pCLEtBQUssRUFBRSxHQUFHLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDO1NBQ3hELENBQUMsQ0FBQTtRQUNGLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFHLEdBQWEsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQzFGLENBQUM7QUFDSCxDQUFDLENBQUE7QUFiWSxRQUFBLEdBQUcsT0FhZiJ9
|
|
@@ -37,12 +37,20 @@ const GET = async (req, res) => {
|
|
|
37
37
|
if (q[key] !== undefined && q[key] !== "")
|
|
38
38
|
filters[key] = q[key];
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
// handover_id / invoice_number filtering (invoice_number ilike takes highest precedence)
|
|
41
|
+
if (q.invoice_number) {
|
|
42
|
+
filters.handover_id = { $ilike: `%${q.invoice_number}%` };
|
|
43
|
+
}
|
|
44
|
+
else if (q.q) {
|
|
44
45
|
filters.handover_id = { $ilike: `%${q.q}%` };
|
|
45
46
|
}
|
|
47
|
+
else if (q.handover_id) {
|
|
48
|
+
filters.handover_id = q.handover_id;
|
|
49
|
+
}
|
|
50
|
+
// customer_id: stored in metadata JSONB field
|
|
51
|
+
if (q.customer_id) {
|
|
52
|
+
filters.metadata = { customer_id: q.customer_id };
|
|
53
|
+
}
|
|
46
54
|
// Date range filters
|
|
47
55
|
if (q.created_at) {
|
|
48
56
|
filters.created_at = typeof q.created_at === "object" ? q.created_at : { $gte: new Date(q.created_at) };
|
|
@@ -140,4 +148,4 @@ const POST = async (req, res) => {
|
|
|
140
148
|
}
|
|
141
149
|
};
|
|
142
150
|
exports.POST = POST;
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../../src/api/admin/retailos/cms/handovers/route.ts"],"names":[],"mappings":";;;AAIA,qDAAqE;AACrE,6BAAuB;AACvB,oEAAiE;AAGjE,MAAM,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC7C,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE;IACzC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC5C,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAChD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC3C,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACxC,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CAClE,CAAC,CAAA;AAEF,SAAS,UAAU,CAAC,GAA+B;IACjD,OAAQ,GAAW,CAAC,KAAK,CAAC,OAAO,CAAC,sBAAU,CAAC,CAAA;AAC/C,CAAC;AAED,SAAS,SAAS,CAAC,GAA+B;IAChD,IAAI,CAAC;QACH,OAAQ,GAAW,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAA;IAC7E,CAAC;AACH,CAAC;AAEM,MAAM,GAAG,GAAG,KAAK,EAAE,GAA+B,EAAE,GAAmB,EAAE,EAAE;IAChF,IAAI,CAAC;QACH,MAAM,KAAK,GAAI,GAAW,CAAC,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,CAAC,GAAG,GAAG,CAAC,KAA4B,CAAA;QAE1C,MAAM,OAAO,GAA4B,EAAE,CAAA;QAE3C,4CAA4C;QAC5C,MAAM,MAAM,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAU,CAAA;QAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QAClE,CAAC;QACD,yFAAyF;QACzF,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO,CAAC,WAAW,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,cAAc,GAAG,EAAE,CAAA;QAC3D,CAAC;aAAM,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACf,OAAO,CAAC,WAAW,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QAC9C,CAAC;aAAM,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAA;QACrC,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,CAAC,QAAQ,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QACnD,CAAC;QAED,qBAAqB;QACrB,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,UAAoB,CAAC,EAAE,CAAA;QACnH,CAAC;QACD,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,UAAoB,CAAC,EAAE,CAAA;QACnH,CAAC;QAED,aAAa;QACb,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAe,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3E,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9D,2CAA2C;QAC3C,IAAI,KAAK,GAAmC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAA;QAClE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,GAAG,GAAG,CAAC,CAAC,KAAe,CAAA;YAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YAClC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YACzC,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,CAAC,CAAA;YAC9E,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;YAC9C,CAAC;QACH,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;YAC3C,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE;gBACN,GAAG;gBACH,sBAAsB;gBACtB,8BAA8B;gBAC9B,6BAA6B;gBAC7B,yBAAyB;gBACzB,mBAAmB;gBACnB,qBAAqB;gBACrB,2BAA2B;aAC5B;YACD,OAAO,EAAE,OAAc;YACvB,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE;YACzC,aAAa;YACb,KAAK;SACN,CAAC,CAAA;QAEF,MAAM,SAAS,GAAI,IAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;YACjD,GAAG,CAAC;YACJ,QAAQ,EAAE,CAAC,CAAC,iBAAiB;gBAC3B,CAAC,CAAC;oBACE,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE;oBAC1B,UAAU,EAAE,CAAC,CAAC,iBAAiB,CAAC,UAAU;oBAC1C,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,SAAS;iBACzC;gBACH,CAAC,CAAC,IAAI;YACR,KAAK,EAAE,CAAC,CAAC,cAAc;gBACrB,CAAC,CAAC;oBACE,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,EAAE;oBACvB,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI;oBAC3B,UAAU,EAAE,CAAC,CAAC,cAAc,CAAC,UAAU;iBACxC;gBACH,CAAC,CAAC,IAAI;SACT,CAAC,CAAC,CAAA;QAEH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAG,QAAgB,EAAE,KAAK,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC,CAAA;IACjG,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,sCAAsC,EAAE;YAC3D,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACxD,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;AACH,CAAC,CAAA;AA7FY,QAAA,GAAG,OA6Ff;AAEM,MAAM,IAAI,GAAG,KAAK,EAAE,GAA+B,EAAE,GAAmB,EAAE,EAAE;IACjF,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,wBAAwB;YACjC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;SAChC,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;QAC/B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC;YACrC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ;YAC9B,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW;YACpC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI;YAC5C,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe;YAC5C,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI;YAC1C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI;YAC9B,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI;YACxC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI;YAClC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI;SACvC,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,uCAAuC,EAAE;YAC5D,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACxD,CAAC,CAAA;QACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1F,CAAC;AACH,CAAC,CAAA;AA7BY,QAAA,IAAI,QA6BhB"}
|
|
@@ -20,10 +20,66 @@ const GET = async (req, res) => {
|
|
|
20
20
|
const q = req.query;
|
|
21
21
|
const filters = {};
|
|
22
22
|
if (q.store_id)
|
|
23
|
-
filters.store_id =
|
|
24
|
-
|
|
23
|
+
filters.store_id = q.store_id;
|
|
24
|
+
if (q.entry_type)
|
|
25
|
+
filters.entry_type = q.entry_type;
|
|
26
|
+
// employee_name: resolve IDs by splitting on spaces and querying first/last name separately
|
|
27
|
+
// (MedusaService does not support $or at the filter top-level)
|
|
28
|
+
if (q.employee_name) {
|
|
29
|
+
try {
|
|
30
|
+
const employeeService = req.scope.resolve(EMPLOYEE_MODULE);
|
|
31
|
+
const words = q.employee_name.trim().toLowerCase().split(/\s+/).filter(Boolean);
|
|
32
|
+
let matchedIds = null;
|
|
33
|
+
for (const word of words) {
|
|
34
|
+
const nameQ = `%${word}%`;
|
|
35
|
+
const [byFirst, byLast] = await Promise.all([
|
|
36
|
+
employeeService.listEmployees({ first_name: { $ilike: nameQ } }, { select: ["id"] }).catch(() => []),
|
|
37
|
+
employeeService.listEmployees({ last_name: { $ilike: nameQ } }, { select: ["id"] }).catch(() => []),
|
|
38
|
+
]);
|
|
39
|
+
const wordIds = [...new Set([...byFirst, ...byLast].map((e) => e.id))];
|
|
40
|
+
matchedIds = matchedIds === null ? wordIds : matchedIds.filter((id) => new Set(wordIds).has(id));
|
|
41
|
+
}
|
|
42
|
+
const finalIds = matchedIds ?? [];
|
|
43
|
+
filters.employee_id = { $in: finalIds.length > 0 ? finalIds : [""] };
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
// employee module unavailable — skip filter
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
else if (q.employee_id) {
|
|
50
|
+
filters.employee_id = q.employee_id;
|
|
51
|
+
}
|
|
52
|
+
// transaction_type: defaults to all; pass "petty_cash" to filter to only expense entries
|
|
53
|
+
filters.transaction_type = q.transaction_type
|
|
54
|
+
? q.transaction_type
|
|
55
|
+
: ["open", "close", "petty_cash"];
|
|
56
|
+
// q: full-text search on reason
|
|
57
|
+
if (q.q)
|
|
58
|
+
filters.reason = { $ilike: `%${q.q}%` };
|
|
59
|
+
if (q.category)
|
|
60
|
+
filters.category = { $ilike: `%${q.category}%` };
|
|
61
|
+
// Amount range
|
|
62
|
+
if (q.amount_gte || q.amount_lte) {
|
|
63
|
+
const range = {};
|
|
64
|
+
if (q.amount_gte)
|
|
65
|
+
range.$gte = Number(q.amount_gte);
|
|
66
|
+
if (q.amount_lte)
|
|
67
|
+
range.$lte = Number(q.amount_lte);
|
|
68
|
+
filters.amount = range;
|
|
69
|
+
}
|
|
70
|
+
const limit = q.limit ? Math.min(parseInt(q.limit, 10), 500) : 20;
|
|
25
71
|
const offset = q.offset ? parseInt(q.offset, 10) : 0;
|
|
26
|
-
|
|
72
|
+
// Ordering: "field" = ASC, "-field" = DESC
|
|
73
|
+
const SORTABLE = new Set(["created_at", "updated_at", "amount"]);
|
|
74
|
+
let order = { created_at: "DESC" };
|
|
75
|
+
if (q.order) {
|
|
76
|
+
const raw = q.order;
|
|
77
|
+
const isDesc = raw.startsWith("-");
|
|
78
|
+
const field = isDesc ? raw.slice(1) : raw;
|
|
79
|
+
if (SORTABLE.has(field))
|
|
80
|
+
order = { [field]: isDesc ? "DESC" : "ASC" };
|
|
81
|
+
}
|
|
82
|
+
const [transactions, count] = await service.listAndCountRetailosPettyCashTransactions(filters, { take: limit, skip: offset, order });
|
|
27
83
|
// Enrich with employee data via bulk lookup
|
|
28
84
|
const employeeIds = [...new Set(transactions.map((t) => t.employee_id).filter(Boolean))];
|
|
29
85
|
let employeeMap = new Map();
|
|
@@ -59,4 +115,4 @@ const GET = async (req, res) => {
|
|
|
59
115
|
}
|
|
60
116
|
};
|
|
61
117
|
exports.GET = GET;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldGFpbG9zL2Ntcy9wZXR0eS1jYXNoL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLG9FQUFpRTtBQUdqRSxNQUFNLGVBQWUsR0FBRyxVQUFVLENBQUE7QUFFbEMsU0FBUyxVQUFVLENBQUMsR0FBK0I7SUFDakQsT0FBUSxHQUFXLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxzQkFBVSxDQUFDLENBQUE7QUFDL0MsQ0FBQztBQUVELFNBQVMsU0FBUyxDQUFDLEdBQStCO0lBQ2hELElBQUksQ0FBQztRQUNILE9BQVEsR0FBVyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0MsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxHQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUUsQ0FBQyxFQUFFLENBQUE7SUFDN0UsQ0FBQztBQUNILENBQUM7QUFFTSxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsR0FBK0IsRUFBRSxHQUFtQixFQUFFLEVBQUU7SUFDaEYsSUFBSSxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQy9CLE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxLQUE0QixDQUFBO1FBRTFDLE1BQU0sT0FBTyxHQUE0QixFQUFFLENBQUE7UUFFM0MsSUFBSSxDQUFDLENBQUMsUUFBUTtZQUFJLE9BQU8sQ0FBQyxRQUFRLEdBQUssQ0FBQyxDQUFDLFFBQVEsQ0FBQTtRQUNqRCxJQUFJLENBQUMsQ0FBQyxVQUFVO1lBQUUsT0FBTyxD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
|
|
@@ -33,6 +33,8 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
33
33
|
else {
|
|
34
34
|
await this.updateRetailosCmsAccumulations([{ id: existing[0].id, cash_in_store: opening_amount }]);
|
|
35
35
|
}
|
|
36
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
|
|
37
|
+
const petty_cash_balance = pettyCashes[0] ? pettyCashes[0].balance : 0;
|
|
36
38
|
await this.createRetailosPettyCashTransactions([{
|
|
37
39
|
store_id,
|
|
38
40
|
employee_id,
|
|
@@ -49,9 +51,9 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
49
51
|
reason: null,
|
|
50
52
|
image_url: null,
|
|
51
53
|
date: new Date(),
|
|
52
|
-
metadata:
|
|
54
|
+
metadata: { petty_cash_balance },
|
|
53
55
|
}]);
|
|
54
|
-
this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount });
|
|
56
|
+
this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount, petty_cash_balance });
|
|
55
57
|
}
|
|
56
58
|
async dayEnd(input) {
|
|
57
59
|
const { store_id, employee_id, closing_amount } = input;
|
|
@@ -61,6 +63,8 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
61
63
|
const accumulations = await this.listRetailosCmsAccumulations({ store_id: [store_id] });
|
|
62
64
|
const current_cash = accumulations[0] ? accumulations[0].cash_in_store : 0;
|
|
63
65
|
const difference = closing_amount - current_cash;
|
|
66
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
|
|
67
|
+
const petty_cash_balance = pettyCashes[0] ? pettyCashes[0].balance : 0;
|
|
64
68
|
await this.createRetailosPettyCashTransactions([{
|
|
65
69
|
store_id,
|
|
66
70
|
employee_id,
|
|
@@ -77,9 +81,9 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
77
81
|
reason: null,
|
|
78
82
|
image_url: null,
|
|
79
83
|
date: new Date(),
|
|
80
|
-
metadata:
|
|
84
|
+
metadata: { petty_cash_balance },
|
|
81
85
|
}]);
|
|
82
|
-
this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference });
|
|
86
|
+
this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference, petty_cash_balance });
|
|
83
87
|
}
|
|
84
88
|
async handover(input) {
|
|
85
89
|
const { store_id, handover_amount, type } = input;
|
|
@@ -214,6 +218,27 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
214
218
|
const rows = await this.listRetailosCmsAccumulations({ store_id: [store_id] });
|
|
215
219
|
return rows[0] ?? null;
|
|
216
220
|
}
|
|
221
|
+
async getEnrichedAccumulation(store_id) {
|
|
222
|
+
const accumulation = await this.getAccumulation(store_id);
|
|
223
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] });
|
|
224
|
+
const petty_cash = pettyCashes[0] ? pettyCashes[0].balance : 0;
|
|
225
|
+
const now = new Date();
|
|
226
|
+
const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
|
|
227
|
+
const start = new Date(`${dateStr}T00:00:00.000Z`);
|
|
228
|
+
const end = new Date(`${dateStr}T23:59:59.999Z`);
|
|
229
|
+
const todayTxns = await this.listRetailosPettyCashTransactions({ store_id: [store_id], created_at: { $gte: start, $lte: end } }, { take: 10, order: { created_at: "ASC" } });
|
|
230
|
+
const txnList = todayTxns;
|
|
231
|
+
const openTx = txnList.find((t) => t.transaction_type === "open");
|
|
232
|
+
const closeTx = txnList.find((t) => t.transaction_type === "close");
|
|
233
|
+
return {
|
|
234
|
+
...(accumulation ? accumulation : { store_id, cash_in_store: 0 }),
|
|
235
|
+
petty_cash,
|
|
236
|
+
opening_store_cash: openTx ? openTx.amount : null,
|
|
237
|
+
opening_petty_cash: openTx?.metadata?.petty_cash_balance ?? null,
|
|
238
|
+
closing_store_cash: closeTx ? closeTx.amount : null,
|
|
239
|
+
closing_petty_cash: closeTx?.metadata?.petty_cash_balance ?? null,
|
|
240
|
+
};
|
|
241
|
+
}
|
|
217
242
|
async getReconciliationReport(input) {
|
|
218
243
|
const { store_id, date, net_cash_sales = 0 } = input;
|
|
219
244
|
const start = new Date(`${date}T00:00:00.000Z`);
|
|
@@ -277,4 +302,4 @@ class CmsModuleService extends (0, utils_1.MedusaService)({
|
|
|
277
302
|
}
|
|
278
303
|
}
|
|
279
304
|
exports.default = CmsModuleService;
|
|
280
|
-
//# 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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"}
|
|
305
|
+
//# 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
CHANGED
|
@@ -3,7 +3,7 @@ import { GET } from "../route"
|
|
|
3
3
|
|
|
4
4
|
function makeService() {
|
|
5
5
|
return {
|
|
6
|
-
|
|
6
|
+
getEnrichedAccumulation: vi.fn(),
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
|
|
@@ -28,35 +28,53 @@ function makeRes() {
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
describe("GET /accumulation/[storeId]", () => {
|
|
31
|
-
it("returns accumulation when it exists", async () => {
|
|
31
|
+
it("returns enriched accumulation when it exists", async () => {
|
|
32
32
|
const service = makeService()
|
|
33
|
-
const accumulation = {
|
|
34
|
-
|
|
33
|
+
const accumulation = {
|
|
34
|
+
id: "cmsa_1",
|
|
35
|
+
store_id: "s1",
|
|
36
|
+
cash_in_store: 750,
|
|
37
|
+
petty_cash: 200,
|
|
38
|
+
opening_store_cash: 500,
|
|
39
|
+
opening_petty_cash: 150,
|
|
40
|
+
closing_store_cash: null,
|
|
41
|
+
closing_petty_cash: null,
|
|
42
|
+
}
|
|
43
|
+
service.getEnrichedAccumulation.mockResolvedValue(accumulation)
|
|
35
44
|
const req = makeReq({ storeId: "s1" }, service)
|
|
36
45
|
const res = makeRes()
|
|
37
46
|
|
|
38
47
|
await GET(req as any, res as any)
|
|
39
48
|
|
|
40
|
-
expect(service.
|
|
49
|
+
expect(service.getEnrichedAccumulation).toHaveBeenCalledWith("s1")
|
|
41
50
|
expect(res.status).toHaveBeenCalledWith(200)
|
|
42
51
|
expect(res.json).toHaveBeenCalledWith({ accumulation })
|
|
43
52
|
})
|
|
44
53
|
|
|
45
|
-
it("returns default zero accumulation when
|
|
54
|
+
it("returns default zero accumulation when no day has started", async () => {
|
|
46
55
|
const service = makeService()
|
|
47
|
-
|
|
56
|
+
const accumulation = {
|
|
57
|
+
store_id: "s1",
|
|
58
|
+
cash_in_store: 0,
|
|
59
|
+
petty_cash: 0,
|
|
60
|
+
opening_store_cash: null,
|
|
61
|
+
opening_petty_cash: null,
|
|
62
|
+
closing_store_cash: null,
|
|
63
|
+
closing_petty_cash: null,
|
|
64
|
+
}
|
|
65
|
+
service.getEnrichedAccumulation.mockResolvedValue(accumulation)
|
|
48
66
|
const req = makeReq({ storeId: "s1" }, service)
|
|
49
67
|
const res = makeRes()
|
|
50
68
|
|
|
51
69
|
await GET(req as any, res as any)
|
|
52
70
|
|
|
53
71
|
expect(res.status).toHaveBeenCalledWith(200)
|
|
54
|
-
expect(res.json).toHaveBeenCalledWith({ accumulation
|
|
72
|
+
expect(res.json).toHaveBeenCalledWith({ accumulation })
|
|
55
73
|
})
|
|
56
74
|
|
|
57
75
|
it("returns 500 when service throws", async () => {
|
|
58
76
|
const service = makeService()
|
|
59
|
-
service.
|
|
77
|
+
service.getEnrichedAccumulation.mockRejectedValue(new Error("db error"))
|
|
60
78
|
const req = makeReq({ storeId: "s1" }, service)
|
|
61
79
|
const res = makeRes()
|
|
62
80
|
|
|
@@ -21,10 +21,8 @@ export const GET = async (req: AuthenticatedMedusaRequest, res: MedusaResponse)
|
|
|
21
21
|
const { storeId } = req.params
|
|
22
22
|
try {
|
|
23
23
|
const service = getService(req)
|
|
24
|
-
const accumulation = await service.
|
|
25
|
-
return res.status(200).json({
|
|
26
|
-
accumulation: accumulation ?? { store_id: storeId, cash_in_store: 0 },
|
|
27
|
-
})
|
|
24
|
+
const accumulation = await service.getEnrichedAccumulation(storeId)
|
|
25
|
+
return res.status(200).json({ accumulation })
|
|
28
26
|
} catch (err) {
|
|
29
27
|
getLogger(req).error("[retailos/cms] get accumulation failed", {
|
|
30
28
|
store_id: storeId,
|
|
@@ -43,11 +43,18 @@ export const GET = async (req: AuthenticatedMedusaRequest, res: MedusaResponse)
|
|
|
43
43
|
for (const key of DIRECT) {
|
|
44
44
|
if (q[key] !== undefined && q[key] !== "") filters[key] = q[key]
|
|
45
45
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (q.q) {
|
|
46
|
+
// handover_id / invoice_number filtering (invoice_number ilike takes highest precedence)
|
|
47
|
+
if (q.invoice_number) {
|
|
48
|
+
filters.handover_id = { $ilike: `%${q.invoice_number}%` }
|
|
49
|
+
} else if (q.q) {
|
|
50
50
|
filters.handover_id = { $ilike: `%${q.q}%` }
|
|
51
|
+
} else if (q.handover_id) {
|
|
52
|
+
filters.handover_id = q.handover_id
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// customer_id: stored in metadata JSONB field
|
|
56
|
+
if (q.customer_id) {
|
|
57
|
+
filters.metadata = { customer_id: q.customer_id }
|
|
51
58
|
}
|
|
52
59
|
|
|
53
60
|
// Date range filters
|
|
@@ -39,7 +39,7 @@ describe("GET /petty-cash", () => {
|
|
|
39
39
|
|
|
40
40
|
expect(service.listAndCountRetailosPettyCashTransactions).toHaveBeenCalledWith(
|
|
41
41
|
expect.objectContaining({ transaction_type: ["open", "close", "petty_cash"] }),
|
|
42
|
-
expect.objectContaining({ take:
|
|
42
|
+
expect.objectContaining({ take: 20 })
|
|
43
43
|
)
|
|
44
44
|
expect(res.status).toHaveBeenCalledWith(200)
|
|
45
45
|
expect(res.json).toHaveBeenCalledWith({
|
|
@@ -60,7 +60,7 @@ describe("GET /petty-cash", () => {
|
|
|
60
60
|
await GET(req as any, res as any)
|
|
61
61
|
|
|
62
62
|
expect(service.listAndCountRetailosPettyCashTransactions).toHaveBeenCalledWith(
|
|
63
|
-
expect.objectContaining({ store_id:
|
|
63
|
+
expect.objectContaining({ store_id: "s1", transaction_type: ["open", "close", "petty_cash"] }),
|
|
64
64
|
expect.any(Object)
|
|
65
65
|
)
|
|
66
66
|
})
|
|
@@ -25,14 +25,69 @@ export const GET = async (req: AuthenticatedMedusaRequest, res: MedusaResponse)
|
|
|
25
25
|
const q = req.query as Record<string, any>
|
|
26
26
|
|
|
27
27
|
const filters: Record<string, unknown> = {}
|
|
28
|
-
if (q.store_id) filters.store_id = [q.store_id]
|
|
29
28
|
|
|
30
|
-
|
|
29
|
+
if (q.store_id) filters.store_id = q.store_id
|
|
30
|
+
if (q.entry_type) filters.entry_type = q.entry_type
|
|
31
|
+
|
|
32
|
+
// employee_name: resolve IDs by splitting on spaces and querying first/last name separately
|
|
33
|
+
// (MedusaService does not support $or at the filter top-level)
|
|
34
|
+
if (q.employee_name) {
|
|
35
|
+
try {
|
|
36
|
+
const employeeService = (req as any).scope.resolve(EMPLOYEE_MODULE)
|
|
37
|
+
const words = (q.employee_name as string).trim().toLowerCase().split(/\s+/).filter(Boolean)
|
|
38
|
+
let matchedIds: string[] | null = null
|
|
39
|
+
for (const word of words) {
|
|
40
|
+
const nameQ = `%${word}%`
|
|
41
|
+
const [byFirst, byLast] = await Promise.all([
|
|
42
|
+
(employeeService.listEmployees({ first_name: { $ilike: nameQ } }, { select: ["id"] }) as Promise<any[]>).catch(() => [] as any[]),
|
|
43
|
+
(employeeService.listEmployees({ last_name: { $ilike: nameQ } }, { select: ["id"] }) as Promise<any[]>).catch(() => [] as any[]),
|
|
44
|
+
])
|
|
45
|
+
const wordIds = [...new Set([...byFirst, ...byLast].map((e: any) => e.id))]
|
|
46
|
+
matchedIds = matchedIds === null ? wordIds : matchedIds.filter((id) => new Set(wordIds).has(id))
|
|
47
|
+
}
|
|
48
|
+
const finalIds = matchedIds ?? []
|
|
49
|
+
filters.employee_id = { $in: finalIds.length > 0 ? finalIds : [""] }
|
|
50
|
+
} catch {
|
|
51
|
+
// employee module unavailable — skip filter
|
|
52
|
+
}
|
|
53
|
+
} else if (q.employee_id) {
|
|
54
|
+
filters.employee_id = q.employee_id
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
// transaction_type: defaults to all; pass "petty_cash" to filter to only expense entries
|
|
58
|
+
filters.transaction_type = q.transaction_type
|
|
59
|
+
? q.transaction_type
|
|
60
|
+
: ["open", "close", "petty_cash"]
|
|
61
|
+
|
|
62
|
+
// q: full-text search on reason
|
|
63
|
+
if (q.q) filters.reason = { $ilike: `%${q.q}%` }
|
|
64
|
+
|
|
65
|
+
if (q.category) filters.category = { $ilike: `%${q.category}%` }
|
|
66
|
+
|
|
67
|
+
// Amount range
|
|
68
|
+
if (q.amount_gte || q.amount_lte) {
|
|
69
|
+
const range: Record<string, number> = {}
|
|
70
|
+
if (q.amount_gte) range.$gte = Number(q.amount_gte)
|
|
71
|
+
if (q.amount_lte) range.$lte = Number(q.amount_lte)
|
|
72
|
+
filters.amount = range
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
const limit = q.limit ? Math.min(parseInt(q.limit as string, 10), 500) : 20
|
|
31
76
|
const offset = q.offset ? parseInt(q.offset as string, 10) : 0
|
|
32
77
|
|
|
78
|
+
// Ordering: "field" = ASC, "-field" = DESC
|
|
79
|
+
const SORTABLE = new Set(["created_at", "updated_at", "amount"])
|
|
80
|
+
let order: Record<string, "ASC" | "DESC"> = { created_at: "DESC" }
|
|
81
|
+
if (q.order) {
|
|
82
|
+
const raw = q.order as string
|
|
83
|
+
const isDesc = raw.startsWith("-")
|
|
84
|
+
const field = isDesc ? raw.slice(1) : raw
|
|
85
|
+
if (SORTABLE.has(field)) order = { [field]: isDesc ? "DESC" : "ASC" }
|
|
86
|
+
}
|
|
87
|
+
|
|
33
88
|
const [transactions, count] = await service.listAndCountRetailosPettyCashTransactions(
|
|
34
|
-
|
|
35
|
-
{ take: limit, skip: offset, order
|
|
89
|
+
filters,
|
|
90
|
+
{ take: limit, skip: offset, order } as any
|
|
36
91
|
)
|
|
37
92
|
|
|
38
93
|
// Enrich with employee data via bulk lookup
|
|
@@ -12,7 +12,7 @@ class TestCmsService extends (CmsModuleService as any) {
|
|
|
12
12
|
listRetailosCmsAccumulations = vi.fn()
|
|
13
13
|
updateRetailosCmsAccumulations = vi.fn()
|
|
14
14
|
createRetailosPettyCashes = vi.fn()
|
|
15
|
-
listRetailosPettyCashes = vi.fn()
|
|
15
|
+
listRetailosPettyCashes = vi.fn().mockResolvedValue([])
|
|
16
16
|
updateRetailosPettyCashes = vi.fn()
|
|
17
17
|
createRetailosPettyCashTransactions = vi.fn()
|
|
18
18
|
listRetailosPettyCashTransactions = vi.fn()
|
|
@@ -67,6 +67,20 @@ export interface ReconciliationInput {
|
|
|
67
67
|
net_cash_sales?: number
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
+
export interface EnrichedAccumulation {
|
|
71
|
+
id?: string
|
|
72
|
+
store_id: string
|
|
73
|
+
cash_in_store: number
|
|
74
|
+
petty_cash: number
|
|
75
|
+
opening_store_cash: number | null
|
|
76
|
+
opening_petty_cash: number | null
|
|
77
|
+
closing_store_cash: number | null
|
|
78
|
+
closing_petty_cash: number | null
|
|
79
|
+
created_at?: string
|
|
80
|
+
updated_at?: string
|
|
81
|
+
metadata?: Record<string, unknown> | null
|
|
82
|
+
}
|
|
83
|
+
|
|
70
84
|
export interface ReconciliationReport {
|
|
71
85
|
date: string
|
|
72
86
|
store_id: string
|
|
@@ -113,6 +127,9 @@ class CmsModuleService extends MedusaService({
|
|
|
113
127
|
await this.updateRetailosCmsAccumulations([{ id: (existing[0] as any).id, cash_in_store: opening_amount }])
|
|
114
128
|
}
|
|
115
129
|
|
|
130
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
|
|
131
|
+
const petty_cash_balance = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
|
|
132
|
+
|
|
116
133
|
await this.createRetailosPettyCashTransactions([{
|
|
117
134
|
store_id,
|
|
118
135
|
employee_id,
|
|
@@ -129,10 +146,10 @@ class CmsModuleService extends MedusaService({
|
|
|
129
146
|
reason: null,
|
|
130
147
|
image_url: null,
|
|
131
148
|
date: new Date(),
|
|
132
|
-
metadata:
|
|
149
|
+
metadata: { petty_cash_balance },
|
|
133
150
|
}])
|
|
134
151
|
|
|
135
|
-
this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount })
|
|
152
|
+
this.logger_.info("cms.day_started", { store_id, employee_id, opening_amount, petty_cash_balance })
|
|
136
153
|
}
|
|
137
154
|
|
|
138
155
|
async dayEnd(input: DayEndInput): Promise<void> {
|
|
@@ -145,6 +162,9 @@ class CmsModuleService extends MedusaService({
|
|
|
145
162
|
const current_cash = accumulations[0] ? (accumulations[0] as any).cash_in_store : 0
|
|
146
163
|
const difference = closing_amount - current_cash
|
|
147
164
|
|
|
165
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
|
|
166
|
+
const petty_cash_balance = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
|
|
167
|
+
|
|
148
168
|
await this.createRetailosPettyCashTransactions([{
|
|
149
169
|
store_id,
|
|
150
170
|
employee_id,
|
|
@@ -161,10 +181,10 @@ class CmsModuleService extends MedusaService({
|
|
|
161
181
|
reason: null,
|
|
162
182
|
image_url: null,
|
|
163
183
|
date: new Date(),
|
|
164
|
-
metadata:
|
|
184
|
+
metadata: { petty_cash_balance },
|
|
165
185
|
}])
|
|
166
186
|
|
|
167
|
-
this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference })
|
|
187
|
+
this.logger_.info("cms.day_ended", { store_id, employee_id, closing_amount, difference, petty_cash_balance })
|
|
168
188
|
}
|
|
169
189
|
|
|
170
190
|
async handover(input: HandoverInput) {
|
|
@@ -320,6 +340,36 @@ class CmsModuleService extends MedusaService({
|
|
|
320
340
|
return rows[0] ?? null
|
|
321
341
|
}
|
|
322
342
|
|
|
343
|
+
async getEnrichedAccumulation(store_id: string): Promise<EnrichedAccumulation> {
|
|
344
|
+
const accumulation = await this.getAccumulation(store_id)
|
|
345
|
+
|
|
346
|
+
const pettyCashes = await this.listRetailosPettyCashes({ store_id: [store_id] })
|
|
347
|
+
const petty_cash = pettyCashes[0] ? (pettyCashes[0] as any).balance : 0
|
|
348
|
+
|
|
349
|
+
const now = new Date()
|
|
350
|
+
const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`
|
|
351
|
+
const start = new Date(`${dateStr}T00:00:00.000Z`)
|
|
352
|
+
const end = new Date(`${dateStr}T23:59:59.999Z`)
|
|
353
|
+
|
|
354
|
+
const todayTxns = await this.listRetailosPettyCashTransactions(
|
|
355
|
+
{ store_id: [store_id], created_at: { $gte: start, $lte: end } as any },
|
|
356
|
+
{ take: 10, order: { created_at: "ASC" } as any }
|
|
357
|
+
)
|
|
358
|
+
|
|
359
|
+
const txnList = todayTxns as any[]
|
|
360
|
+
const openTx = txnList.find((t) => t.transaction_type === "open")
|
|
361
|
+
const closeTx = txnList.find((t) => t.transaction_type === "close")
|
|
362
|
+
|
|
363
|
+
return {
|
|
364
|
+
...(accumulation ? (accumulation as any) : { store_id, cash_in_store: 0 }),
|
|
365
|
+
petty_cash,
|
|
366
|
+
opening_store_cash: openTx ? openTx.amount : null,
|
|
367
|
+
opening_petty_cash: openTx?.metadata?.petty_cash_balance ?? null,
|
|
368
|
+
closing_store_cash: closeTx ? closeTx.amount : null,
|
|
369
|
+
closing_petty_cash: closeTx?.metadata?.petty_cash_balance ?? null,
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
|
|
323
373
|
async getReconciliationReport(input: ReconciliationInput): Promise<ReconciliationReport> {
|
|
324
374
|
const { store_id, date, net_cash_sales = 0 } = input
|
|
325
375
|
|