@devx-retailos/cms 0.1.0 → 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/handovers/route.js +13 -5
- package/.medusa/server/src/api/admin/retailos/cms/petty-cash/route.js +60 -4
- package/package.json +3 -3
- 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
|
@@ -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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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@devx-retailos/cms",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Cash Management System for retailOS: shift ops, handovers, petty cash, accumulation.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "./.medusa/server/src/modules/cms/index.js",
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"src"
|
|
26
26
|
],
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@devx-retailos/
|
|
28
|
+
"@devx-retailos/core": "0.0.2",
|
|
29
29
|
"@devx-retailos/employee": "0.0.3",
|
|
30
|
-
"@devx-retailos/
|
|
30
|
+
"@devx-retailos/rbac": "0.0.2"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
33
|
"@medusajs/framework": "^2.15.0",
|
|
@@ -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
|