medusajs-documents-plugin 1.1.4 → 1.1.6
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/documents/[id]/document/route.js +17 -6
- package/.medusa/server/src/api/admin/documents/route.js +38 -6
- package/.medusa/server/src/api/admin/documents/settings/route.js +75 -13
- package/.medusa/server/src/api/documents/[id]/document/route.js +18 -5
- package/.medusa/server/src/modules/documents/index.js +37 -6
- package/.medusa/server/src/modules/documents/service.js +266 -83
- package/CHANGELOG.md +22 -0
- package/package.json +1 -1
|
@@ -2,26 +2,37 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GET = GET;
|
|
4
4
|
const documents_1 = require("../../../../../modules/documents");
|
|
5
|
+
const service_1 = require("../../../../../modules/documents/service");
|
|
5
6
|
// GET /admin/documents/:id/document
|
|
6
7
|
async function GET(req, res) {
|
|
7
8
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
9
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
10
|
+
const sharedContext = manager ? { manager } : {};
|
|
8
11
|
const id = req.params.id;
|
|
9
12
|
try {
|
|
10
13
|
let record = null;
|
|
11
14
|
// Check by ID or display_id
|
|
12
15
|
try {
|
|
13
|
-
record = await documentService.retrieveDocumentRecord(id);
|
|
16
|
+
record = await documentService.retrieveDocumentRecord(id, {}, sharedContext);
|
|
14
17
|
}
|
|
15
18
|
catch (e) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
try {
|
|
20
|
+
const records = await documentService.listDocumentRecords({ display_id: id }, {}, sharedContext);
|
|
21
|
+
if (records && records.length > 0) {
|
|
22
|
+
record = records[0];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
catch (err2) {
|
|
26
|
+
const pg = (0, service_1.getDatabaseConnection)(req.scope);
|
|
27
|
+
if (pg) {
|
|
28
|
+
record = await pg("document_record").where({ id }).orWhere({ display_id: id }).first();
|
|
29
|
+
}
|
|
19
30
|
}
|
|
20
31
|
}
|
|
21
32
|
if (!record) {
|
|
22
33
|
return res.status(404).send("Document not found");
|
|
23
34
|
}
|
|
24
|
-
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope);
|
|
35
|
+
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope, sharedContext);
|
|
25
36
|
res.setHeader("Content-Type", "application/pdf");
|
|
26
37
|
res.setHeader("Content-Disposition", `inline; filename="${record.display_id}.pdf"`);
|
|
27
38
|
res.setHeader("Content-Length", String(pdfBuffer.length));
|
|
@@ -33,4 +44,4 @@ async function GET(req, res) {
|
|
|
33
44
|
return res.status(500).send(`Failed to generate document: ${err.message}`);
|
|
34
45
|
}
|
|
35
46
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9baWRdL2RvY3VtZW50L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0JBd0NDO0FBNUNELGdFQUFvRTtBQUNwRSxzRUFBd0c7QUFFeEcsb0NBQW9DO0FBQzdCLEtBQUssVUFBVSxHQUFHLENBQUMsR0FBa0MsRUFBRSxHQUFtQjtJQUMvRSxNQUFNLGVBQWUsR0FBMEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsNEJBQWdCLENBQUMsQ0FBQztJQUNuRixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ2pELE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO0lBRXpCLElBQUksQ0FBQztRQUNILElBQUksTUFBTSxHQUFRLElBQUksQ0FBQztRQUN2Qiw0QkFBNEI7UUFDNUIsSUFBSSxDQUFDO1lBQ0gsTUFBTSxHQUFHLE1BQU0sZUFBZSxDQUFDLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFDL0UsQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDWCxJQUFJLENBQUM7Z0JBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxlQUFlLENBQUMsbUJBQW1CLENBQUMsRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO2dCQUNqRyxJQUFJLE9BQU8sSUFBSSxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO29CQUNsQyxNQUFNLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN0QixDQUFDO1lBQ0gsQ0FBQztZQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ2QsTUFBTSxFQUFFLEdBQVEsSUFBQSwrQkFBcUIsRUFBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ2pELElBQUksRUFBRSxFQUFFLENBQUM7b0JBQ1AsTUFBTSxHQUFHLE1BQU0sRUFBRSxDQUFDLGlCQUFpQixDQUFDLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDekYsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFFRCxNQUFNLFNBQVMsR0FBRyxNQUFNLGVBQWUsQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxHQUFHLENBQUMsS0FBSyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBRTdGLEdBQUcsQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDakQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxxQkFBcUIsTUFBTSxDQUFDLFVBQVUsT0FBTyxDQUFDLENBQUM7UUFDcEYsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDMUQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUUscUNBQXFDLENBQUMsQ0FBQztRQUN0RSxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUFDLE9BQU8sR0FBUSxFQUFFLENBQUM7UUFDbEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsS0FBSyxDQUFDLHdDQUF3QyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUMxRixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLGdDQUFnQyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUM3RSxDQUFDO0FBQ0gsQ0FBQyJ9
|
|
@@ -2,9 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GET = GET;
|
|
4
4
|
const documents_1 = require("../../../modules/documents");
|
|
5
|
+
const service_1 = require("../../../modules/documents/service");
|
|
5
6
|
// GET /admin/documents
|
|
6
7
|
async function GET(req, res) {
|
|
7
8
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
9
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
10
|
+
const sharedContext = manager ? { manager } : {};
|
|
8
11
|
const { type, source, status, search, take = 50, skip = 0 } = req.query;
|
|
9
12
|
const filters = {};
|
|
10
13
|
if (type && type !== "all")
|
|
@@ -13,11 +16,40 @@ async function GET(req, res) {
|
|
|
13
16
|
filters.source = source;
|
|
14
17
|
if (status && status !== "all")
|
|
15
18
|
filters.status = status;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
let records = [];
|
|
20
|
+
let count = 0;
|
|
21
|
+
try {
|
|
22
|
+
const [fetchedRecords, fetchedCount] = await documentService.listAndCountDocumentRecords(filters, {
|
|
23
|
+
take: Number(take),
|
|
24
|
+
skip: Number(skip),
|
|
25
|
+
order: { created_at: "DESC" },
|
|
26
|
+
}, sharedContext);
|
|
27
|
+
records = fetchedRecords;
|
|
28
|
+
count = fetchedCount;
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
// Fallback: If MikroORM fork error occurs, query pg_connection directly
|
|
32
|
+
const pgConnection = (0, service_1.getDatabaseConnection)(req.scope);
|
|
33
|
+
if (pgConnection) {
|
|
34
|
+
let query = pgConnection("document_record");
|
|
35
|
+
if (filters.type)
|
|
36
|
+
query = query.where({ type: filters.type });
|
|
37
|
+
if (filters.source)
|
|
38
|
+
query = query.where({ source: filters.source });
|
|
39
|
+
if (filters.status)
|
|
40
|
+
query = query.where({ status: filters.status });
|
|
41
|
+
const countResult = await query.clone().count("id as count").first();
|
|
42
|
+
count = Number(countResult?.count || 0);
|
|
43
|
+
records = await query
|
|
44
|
+
.orderBy("created_at", "desc")
|
|
45
|
+
.limit(Number(take))
|
|
46
|
+
.offset(Number(skip));
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
req.scope.resolve("logger")?.error(`[Documents-API] Error listing documents: ${err.message}`);
|
|
50
|
+
return res.status(500).json({ message: err.message, error: true });
|
|
51
|
+
}
|
|
52
|
+
}
|
|
21
53
|
let filteredRecords = records;
|
|
22
54
|
if (search && typeof search === "string" && search.trim() !== "") {
|
|
23
55
|
const q = search.toLowerCase();
|
|
@@ -33,4 +65,4 @@ async function GET(req, res) {
|
|
|
33
65
|
skip: Number(skip),
|
|
34
66
|
});
|
|
35
67
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLGtCQW9FQztBQXhFRCwwREFBOEQ7QUFDOUQsZ0VBQWtHO0FBRWxHLHVCQUF1QjtBQUNoQixLQUFLLFVBQVUsR0FBRyxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDL0QsTUFBTSxlQUFlLEdBQTBCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLDRCQUFnQixDQUFDLENBQUM7SUFFbkYsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUMxRSxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVqRCxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFLEVBQUUsSUFBSSxHQUFHLENBQUMsRUFBRSxHQUFHLEdBQUcsQ0FBQyxLQUFZLENBQUM7SUFFL0UsTUFBTSxPQUFPLEdBQXdCLEVBQUUsQ0FBQztJQUN4QyxJQUFJLElBQUksSUFBSSxJQUFJLEtBQUssS0FBSztRQUFFLE9BQU8sQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQ2hELElBQUksTUFBTSxJQUFJLE1BQU0sS0FBSyxLQUFLO1FBQUUsT0FBTyxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDeEQsSUFBSSxNQUFNLElBQUksTUFBTSxLQUFLLEtBQUs7UUFBRSxPQUFPLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUV4RCxJQUFJLE9BQU8sR0FBVSxFQUFFLENBQUM7SUFDeEIsSUFBSSxLQUFLLEdBQUcsQ0FB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
|
|
@@ -3,12 +3,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.GET = GET;
|
|
4
4
|
exports.POST = POST;
|
|
5
5
|
const documents_1 = require("../../../../modules/documents");
|
|
6
|
+
const service_1 = require("../../../../modules/documents/service");
|
|
6
7
|
// GET /admin/documents/settings
|
|
7
8
|
async function GET(req, res) {
|
|
8
9
|
try {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
10
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
11
|
+
const sharedContext = manager ? { manager } : {};
|
|
12
|
+
try {
|
|
13
|
+
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
14
|
+
const settings = await documentService.getSettings(sharedContext, req.scope);
|
|
15
|
+
return res.json({ settings, success: true });
|
|
16
|
+
}
|
|
17
|
+
catch (err) {
|
|
18
|
+
// Fallback: If MikroORM fork error occurs, query pg_connection directly
|
|
19
|
+
const pgConnection = (0, service_1.getDatabaseConnection)(req.scope);
|
|
20
|
+
if (pgConnection) {
|
|
21
|
+
let settings = await pgConnection("document_settings").first();
|
|
22
|
+
if (!settings) {
|
|
23
|
+
const [created] = await pgConnection("document_settings")
|
|
24
|
+
.insert({
|
|
25
|
+
company_name: "Store",
|
|
26
|
+
email_notifications_enabled: true,
|
|
27
|
+
sms_notifications_enabled: true,
|
|
28
|
+
whatsapp_notifications_enabled: true,
|
|
29
|
+
created_at: new Date(),
|
|
30
|
+
updated_at: new Date(),
|
|
31
|
+
})
|
|
32
|
+
.returning("*");
|
|
33
|
+
settings = created;
|
|
34
|
+
}
|
|
35
|
+
return res.json({ settings, success: true });
|
|
36
|
+
}
|
|
37
|
+
throw err;
|
|
38
|
+
}
|
|
12
39
|
}
|
|
13
40
|
catch (err) {
|
|
14
41
|
req.scope.resolve("logger")?.error(`[Documents-API] Error fetching settings: ${err.message}`);
|
|
@@ -18,21 +45,56 @@ async function GET(req, res) {
|
|
|
18
45
|
// POST /admin/documents/settings
|
|
19
46
|
async function POST(req, res) {
|
|
20
47
|
try {
|
|
21
|
-
const
|
|
22
|
-
|
|
48
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
49
|
+
const sharedContext = manager ? { manager } : {};
|
|
23
50
|
// Filter out read-only / metadata columns that cause MikroORM update errors
|
|
24
51
|
const { id, created_at, updated_at, deleted_at, ...cleanData } = req.body || {};
|
|
25
52
|
if (cleanData.zoho_payment_terms_days !== undefined) {
|
|
26
53
|
cleanData.zoho_payment_terms_days = Number(cleanData.zoho_payment_terms_days || 0);
|
|
27
54
|
}
|
|
28
|
-
|
|
29
|
-
|
|
55
|
+
let settings = null;
|
|
56
|
+
try {
|
|
57
|
+
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
58
|
+
let [existingSettings] = await documentService.listDocumentSettings({}, {}, sharedContext);
|
|
59
|
+
if (!existingSettings) {
|
|
60
|
+
settings = await documentService.createDocumentSettings(cleanData, sharedContext);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
settings = await documentService.updateDocumentSettings({
|
|
64
|
+
id: existingSettings.id,
|
|
65
|
+
...cleanData,
|
|
66
|
+
}, sharedContext);
|
|
67
|
+
}
|
|
30
68
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
69
|
+
catch (err) {
|
|
70
|
+
// Fallback: If MikroORM fork error occurs, update via pg_connection directly
|
|
71
|
+
const pgConnection = (0, service_1.getDatabaseConnection)(req.scope);
|
|
72
|
+
if (pgConnection) {
|
|
73
|
+
const existing = await pgConnection("document_settings").first();
|
|
74
|
+
if (existing) {
|
|
75
|
+
const [updated] = await pgConnection("document_settings")
|
|
76
|
+
.where({ id: existing.id })
|
|
77
|
+
.update({
|
|
78
|
+
...cleanData,
|
|
79
|
+
updated_at: new Date(),
|
|
80
|
+
})
|
|
81
|
+
.returning("*");
|
|
82
|
+
settings = updated;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
const [created] = await pgConnection("document_settings")
|
|
86
|
+
.insert({
|
|
87
|
+
...cleanData,
|
|
88
|
+
created_at: new Date(),
|
|
89
|
+
updated_at: new Date(),
|
|
90
|
+
})
|
|
91
|
+
.returning("*");
|
|
92
|
+
settings = created;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
throw err;
|
|
97
|
+
}
|
|
36
98
|
}
|
|
37
99
|
return res.json({ settings, success: true });
|
|
38
100
|
}
|
|
@@ -41,4 +103,4 @@ async function POST(req, res) {
|
|
|
41
103
|
return res.status(500).json({ message: err.message, error: true });
|
|
42
104
|
}
|
|
43
105
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9zZXR0aW5ncy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLGtCQW1DQztBQUdELG9CQTREQztBQXRHRCw2REFBaUU7QUFDakUsbUVBQXFHO0FBRXJHLGdDQUFnQztBQUN6QixLQUFLLFVBQVUsR0FBRyxDQUFDLEdBQWtCLEVBQUUsR0FBbUI7SUFDL0QsSUFBSSxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMxRSxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUVqRCxJQUFJLENBQUM7WUFDSCxNQUFNLGVBQWUsR0FBMEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsNEJBQWdCLENBQUMsQ0FBQztZQUNuRixNQUFNLFFBQVEsR0FBRyxNQUFNLGVBQWUsQ0FBQyxXQUFXLENBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM3RSxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDL0MsQ0FBQztRQUFDLE9BQU8sR0FBUSxFQUFFLENBQUM7WUFDbEIsd0VBQXdFO1lBQ3hFLE1BQU0sWUFBWSxHQUFRLElBQUEsK0JBQXFCLEVBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzNELElBQUksWUFBWSxFQUFFLENBQUM7Z0JBQ2pCLElBQUksUUFBUSxHQUFHLE1BQU0sWUFBWSxDQUFDLG1CQUFtQixDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JB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
|
|
@@ -2,29 +2,42 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GET = GET;
|
|
4
4
|
const documents_1 = require("../../../../modules/documents");
|
|
5
|
+
const service_1 = require("../../../../modules/documents/service");
|
|
5
6
|
// GET /documents/:id/document (Public PDF download & view for recipients)
|
|
6
7
|
async function GET(req, res) {
|
|
7
8
|
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
8
9
|
const cleanId = (req.params.id || "").replace(/\.pdf$/i, "");
|
|
10
|
+
const manager = req.scope.resolve("manager", { allowUnregistered: true });
|
|
11
|
+
const sharedContext = manager ? { manager } : {};
|
|
9
12
|
try {
|
|
10
13
|
let record = null;
|
|
11
14
|
// Check by primary ID or human display_id (e.g. INV-1092, JOB-101, RCPT-101)
|
|
12
15
|
try {
|
|
13
|
-
record = await documentService.retrieveDocumentRecord(cleanId);
|
|
16
|
+
record = await documentService.retrieveDocumentRecord(cleanId, {}, sharedContext);
|
|
14
17
|
}
|
|
15
18
|
catch (e) { }
|
|
16
19
|
if (!record) {
|
|
17
|
-
const records = await documentService.listDocumentRecords({ display_id: cleanId }).catch(() => []);
|
|
20
|
+
const records = await documentService.listDocumentRecords({ display_id: cleanId }, {}, sharedContext).catch(() => []);
|
|
18
21
|
if (records && records.length > 0) {
|
|
19
22
|
record = records[0];
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
25
|
if (!record) {
|
|
23
|
-
const records = await documentService.listDocumentRecords({ repair_ticket_id: cleanId }).catch(() => []);
|
|
26
|
+
const records = await documentService.listDocumentRecords({ repair_ticket_id: cleanId }, {}, sharedContext).catch(() => []);
|
|
24
27
|
if (records && records.length > 0) {
|
|
25
28
|
record = records[0];
|
|
26
29
|
}
|
|
27
30
|
}
|
|
31
|
+
if (!record) {
|
|
32
|
+
const pg = (0, service_1.getDatabaseConnection)(req.scope);
|
|
33
|
+
if (pg) {
|
|
34
|
+
record = await pg("document_record")
|
|
35
|
+
.where({ id: cleanId })
|
|
36
|
+
.orWhere({ display_id: cleanId })
|
|
37
|
+
.orWhere({ repair_ticket_id: cleanId })
|
|
38
|
+
.first();
|
|
39
|
+
}
|
|
40
|
+
}
|
|
28
41
|
// Fallback: If not in documents table, check if cleanId is an approval token or ID in repair module
|
|
29
42
|
if (!record) {
|
|
30
43
|
try {
|
|
@@ -48,7 +61,7 @@ async function GET(req, res) {
|
|
|
48
61
|
if (!record) {
|
|
49
62
|
return res.status(404).send("Document not found");
|
|
50
63
|
}
|
|
51
|
-
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope);
|
|
64
|
+
const pdfBuffer = await documentService.getPdfForRecord(record.id, req.scope, sharedContext);
|
|
52
65
|
res.setHeader("Content-Type", "application/pdf");
|
|
53
66
|
res.setHeader("Content-Disposition", `inline; filename="${record.display_id}.pdf"`);
|
|
54
67
|
res.setHeader("Content-Length", String(pdfBuffer.length));
|
|
@@ -60,4 +73,4 @@ async function GET(req, res) {
|
|
|
60
73
|
return res.status(500).send(`Failed to generate document: ${err.message}`);
|
|
61
74
|
}
|
|
62
75
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2RvY3VtZW50cy9baWRdL2RvY3VtZW50L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBS0Esa0JBMEVDO0FBOUVELDZEQUFpRTtBQUNqRSxtRUFBcUc7QUFFckcsMEVBQTBFO0FBQ25FLEtBQUssVUFBVSxHQUFHLENBQUMsR0FBa0MsRUFBRSxHQUFtQjtJQUMvRSxNQUFNLGVBQWUsR0FBMEIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsNEJBQWdCLENBQUMsQ0FBQztJQUNuRixNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFN0QsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUMxRSxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVqRCxJQUFJLENBQUM7UUFDSCxJQUFJLE1BQU0sR0FBUSxJQUFJLENBQUM7UUFDdkIsNkVBQTZFO1FBQzdFLElBQUksQ0FBQztZQUNILE1BQU0sR0FBRyxNQUFNLGVBQWUsQ0FBQyxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBQ3BGLENBQUM7UUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztRQUVkLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNaLE1BQU0sT0FBTyxHQUFHLE1BQU0sZUFBZSxDQUFDLG1CQUFtQixDQUFDLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxFQUFF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
|
|
@@ -1,13 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
5
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.DOCUMENTS_MODULE = void 0;
|
|
7
|
-
const service_1 =
|
|
36
|
+
exports.getDatabaseConnection = exports.DOCUMENTS_MODULE = void 0;
|
|
37
|
+
const service_1 = __importStar(require("./service"));
|
|
38
|
+
Object.defineProperty(exports, "getDatabaseConnection", { enumerable: true, get: function () { return service_1.getDatabaseConnection; } });
|
|
8
39
|
const utils_1 = require("@medusajs/framework/utils");
|
|
9
40
|
exports.DOCUMENTS_MODULE = "documents";
|
|
10
41
|
exports.default = (0, utils_1.Module)(exports.DOCUMENTS_MODULE, {
|
|
11
42
|
service: service_1.default,
|
|
12
43
|
});
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9kb2N1bWVudHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXlFO0FBSWhFLHNHQUp1QiwrQkFBcUIsT0FJdkI7QUFIOUIscURBQW1EO0FBRXRDLFFBQUEsZ0JBQWdCLEdBQUcsV0FBVyxDQUFDO0FBRzVDLGtCQUFlLElBQUEsY0FBTSxFQUFDLHdCQUFnQixFQUFFO0lBQ3RDLE9BQU8sRUFBRSxpQkFBcUI7Q0FDL0IsQ0FBQyxDQUFDIn0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DocumentModuleService = void 0;
|
|
4
|
+
exports.getDatabaseConnection = getDatabaseConnection;
|
|
4
5
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
6
|
const document_settings_1 = require("./models/document-settings");
|
|
6
7
|
const document_record_1 = require("./models/document-record");
|
|
@@ -9,6 +10,85 @@ const zoho_books_1 = require("../../services/zoho-books");
|
|
|
9
10
|
const pdfkit_generator_1 = require("../../services/pdfkit-generator");
|
|
10
11
|
const pdf_post_processor_1 = require("../../services/pdf-post-processor");
|
|
11
12
|
const notification_sender_1 = require("../../services/notification-sender");
|
|
13
|
+
/**
|
|
14
|
+
* Safely resolves the Knex database connection from a Medusa container or scope.
|
|
15
|
+
* Tries ContainerRegistrationKeys.PG_CONNECTION ("__pg_connection__") and fallback keys.
|
|
16
|
+
* Never throws AwilixResolutionError.
|
|
17
|
+
*/
|
|
18
|
+
function getDatabaseConnection(container) {
|
|
19
|
+
if (!container) {
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
// 1. Try resolve method on container / req.scope (guarded by try-catch because cradle proxies throw on unknown property access)
|
|
23
|
+
try {
|
|
24
|
+
if (typeof container.resolve === "function") {
|
|
25
|
+
try {
|
|
26
|
+
const conn = container.resolve(utils_1.ContainerRegistrationKeys.PG_CONNECTION, { allowUnregistered: true });
|
|
27
|
+
if (conn)
|
|
28
|
+
return conn;
|
|
29
|
+
}
|
|
30
|
+
catch (_) { }
|
|
31
|
+
try {
|
|
32
|
+
const conn = container.resolve("__pg_connection__", { allowUnregistered: true });
|
|
33
|
+
if (conn)
|
|
34
|
+
return conn;
|
|
35
|
+
}
|
|
36
|
+
catch (_) { }
|
|
37
|
+
try {
|
|
38
|
+
const conn = container.resolve("pg_connection", { allowUnregistered: true });
|
|
39
|
+
if (conn)
|
|
40
|
+
return conn;
|
|
41
|
+
}
|
|
42
|
+
catch (_) { }
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
catch (_) { }
|
|
46
|
+
// 2. Try cradle proxy if available (each property access guarded)
|
|
47
|
+
try {
|
|
48
|
+
const cradle = container.cradle;
|
|
49
|
+
if (cradle) {
|
|
50
|
+
try {
|
|
51
|
+
if (cradle[utils_1.ContainerRegistrationKeys.PG_CONNECTION]) {
|
|
52
|
+
return cradle[utils_1.ContainerRegistrationKeys.PG_CONNECTION];
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
catch (_) { }
|
|
56
|
+
try {
|
|
57
|
+
if (cradle["__pg_connection__"]) {
|
|
58
|
+
return cradle["__pg_connection__"];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch (_) { }
|
|
62
|
+
try {
|
|
63
|
+
if (cradle["pg_connection"]) {
|
|
64
|
+
return cradle["pg_connection"];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (_) { }
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
catch (_) { }
|
|
71
|
+
// 3. Try direct property index on container (each property access guarded)
|
|
72
|
+
try {
|
|
73
|
+
if (container[utils_1.ContainerRegistrationKeys.PG_CONNECTION]) {
|
|
74
|
+
return container[utils_1.ContainerRegistrationKeys.PG_CONNECTION];
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
catch (_) { }
|
|
78
|
+
try {
|
|
79
|
+
if (container["__pg_connection__"]) {
|
|
80
|
+
return container["__pg_connection__"];
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
catch (_) { }
|
|
84
|
+
try {
|
|
85
|
+
if (container["pg_connection"]) {
|
|
86
|
+
return container["pg_connection"];
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
catch (_) { }
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
12
92
|
class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
13
93
|
DocumentSettings: document_settings_1.DocumentSettings,
|
|
14
94
|
DocumentRecord: document_record_1.DocumentRecord,
|
|
@@ -17,53 +97,89 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
17
97
|
/**
|
|
18
98
|
* Retrieves or initializes default plugin settings
|
|
19
99
|
*/
|
|
20
|
-
async getSettings() {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
100
|
+
async getSettings(sharedContext, container) {
|
|
101
|
+
try {
|
|
102
|
+
const [settings] = await this.listDocumentSettings({}, {}, sharedContext);
|
|
103
|
+
if (settings) {
|
|
104
|
+
return settings;
|
|
105
|
+
}
|
|
106
|
+
return await this.createDocumentSettings({
|
|
107
|
+
company_name: "Store",
|
|
108
|
+
email_notifications_enabled: true,
|
|
109
|
+
sms_notifications_enabled: true,
|
|
110
|
+
whatsapp_notifications_enabled: true,
|
|
111
|
+
event_order_placed_enabled: true,
|
|
112
|
+
event_order_completed_enabled: true,
|
|
113
|
+
event_payment_captured_enabled: true,
|
|
114
|
+
event_order_fulfillment_enabled: true,
|
|
115
|
+
event_order_canceled_enabled: true,
|
|
116
|
+
event_repair_status_changed_enabled: true,
|
|
117
|
+
event_repair_compliance_enabled: true,
|
|
118
|
+
event_repair_created_enabled: true,
|
|
119
|
+
event_repair_completed_enabled: true,
|
|
120
|
+
event_repair_reminder_enabled: true,
|
|
121
|
+
invoice_template: "modern",
|
|
122
|
+
packing_slip_template: "modern",
|
|
123
|
+
receipt_template: "modern",
|
|
124
|
+
estimate_template: "modern",
|
|
125
|
+
job_card_template: "modern",
|
|
126
|
+
custom_doc_template: "modern",
|
|
127
|
+
email_subject_template: null,
|
|
128
|
+
email_body_template: null,
|
|
129
|
+
sms_body_template: null,
|
|
130
|
+
whatsapp_body_template: null,
|
|
131
|
+
order_placed_email_subject: null,
|
|
132
|
+
order_placed_email_template: null,
|
|
133
|
+
order_placed_sms_template: null,
|
|
134
|
+
order_placed_whatsapp_template: null,
|
|
135
|
+
order_payment_email_subject: null,
|
|
136
|
+
order_payment_email_template: null,
|
|
137
|
+
order_payment_sms_template: null,
|
|
138
|
+
order_payment_whatsapp_template: null,
|
|
139
|
+
order_fulfillment_email_subject: null,
|
|
140
|
+
order_fulfillment_email_template: null,
|
|
141
|
+
order_fulfillment_sms_template: null,
|
|
142
|
+
order_fulfillment_whatsapp_template: null,
|
|
143
|
+
order_canceled_email_subject: null,
|
|
144
|
+
order_canceled_email_template: null,
|
|
145
|
+
order_canceled_sms_template: null,
|
|
146
|
+
order_canceled_whatsapp_template: null,
|
|
147
|
+
}, sharedContext);
|
|
148
|
+
}
|
|
149
|
+
catch (err) {
|
|
150
|
+
const conn = getDatabaseConnection(container) || getDatabaseConnection(this.__container__);
|
|
151
|
+
if (conn) {
|
|
152
|
+
let row = await conn("document_settings").first();
|
|
153
|
+
if (row)
|
|
154
|
+
return row;
|
|
155
|
+
const [created] = await conn("document_settings").insert({
|
|
156
|
+
company_name: "Store",
|
|
157
|
+
email_notifications_enabled: true,
|
|
158
|
+
sms_notifications_enabled: true,
|
|
159
|
+
whatsapp_notifications_enabled: true,
|
|
160
|
+
event_order_placed_enabled: true,
|
|
161
|
+
event_order_completed_enabled: true,
|
|
162
|
+
event_payment_captured_enabled: true,
|
|
163
|
+
event_order_fulfillment_enabled: true,
|
|
164
|
+
event_order_canceled_enabled: true,
|
|
165
|
+
event_repair_status_changed_enabled: true,
|
|
166
|
+
event_repair_compliance_enabled: true,
|
|
167
|
+
event_repair_created_enabled: true,
|
|
168
|
+
event_repair_completed_enabled: true,
|
|
169
|
+
event_repair_reminder_enabled: true,
|
|
170
|
+
invoice_template: "modern",
|
|
171
|
+
packing_slip_template: "modern",
|
|
172
|
+
receipt_template: "modern",
|
|
173
|
+
estimate_template: "modern",
|
|
174
|
+
job_card_template: "modern",
|
|
175
|
+
custom_doc_template: "modern",
|
|
176
|
+
created_at: new Date(),
|
|
177
|
+
updated_at: new Date(),
|
|
178
|
+
}).returning("*");
|
|
179
|
+
return created;
|
|
180
|
+
}
|
|
181
|
+
throw err;
|
|
24
182
|
}
|
|
25
|
-
return await this.createDocumentSettings({
|
|
26
|
-
company_name: "Store",
|
|
27
|
-
email_notifications_enabled: true,
|
|
28
|
-
sms_notifications_enabled: true,
|
|
29
|
-
whatsapp_notifications_enabled: true,
|
|
30
|
-
event_order_placed_enabled: true,
|
|
31
|
-
event_order_completed_enabled: true,
|
|
32
|
-
event_payment_captured_enabled: true,
|
|
33
|
-
event_order_fulfillment_enabled: true,
|
|
34
|
-
event_order_canceled_enabled: true,
|
|
35
|
-
event_repair_status_changed_enabled: true,
|
|
36
|
-
event_repair_compliance_enabled: true,
|
|
37
|
-
event_repair_created_enabled: true,
|
|
38
|
-
event_repair_completed_enabled: true,
|
|
39
|
-
event_repair_reminder_enabled: true,
|
|
40
|
-
invoice_template: "modern",
|
|
41
|
-
packing_slip_template: "modern",
|
|
42
|
-
receipt_template: "modern",
|
|
43
|
-
estimate_template: "modern",
|
|
44
|
-
job_card_template: "modern",
|
|
45
|
-
custom_doc_template: "modern",
|
|
46
|
-
email_subject_template: null,
|
|
47
|
-
email_body_template: null,
|
|
48
|
-
sms_body_template: null,
|
|
49
|
-
whatsapp_body_template: null,
|
|
50
|
-
order_placed_email_subject: null,
|
|
51
|
-
order_placed_email_template: null,
|
|
52
|
-
order_placed_sms_template: null,
|
|
53
|
-
order_placed_whatsapp_template: null,
|
|
54
|
-
order_payment_email_subject: null,
|
|
55
|
-
order_payment_email_template: null,
|
|
56
|
-
order_payment_sms_template: null,
|
|
57
|
-
order_payment_whatsapp_template: null,
|
|
58
|
-
order_fulfillment_email_subject: null,
|
|
59
|
-
order_fulfillment_email_template: null,
|
|
60
|
-
order_fulfillment_sms_template: null,
|
|
61
|
-
order_fulfillment_whatsapp_template: null,
|
|
62
|
-
order_canceled_email_subject: null,
|
|
63
|
-
order_canceled_email_template: null,
|
|
64
|
-
order_canceled_sms_template: null,
|
|
65
|
-
order_canceled_whatsapp_template: null,
|
|
66
|
-
});
|
|
67
183
|
}
|
|
68
184
|
/**
|
|
69
185
|
* Creates or returns an existing short URL
|
|
@@ -428,43 +544,99 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
428
544
|
}
|
|
429
545
|
// Save Record to Database
|
|
430
546
|
const initialPdfUrl = `${storeUrl}/api/admin/documents/temp/document`;
|
|
431
|
-
const
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
547
|
+
const manager = container?.resolve?.("manager", { allowUnregistered: true });
|
|
548
|
+
const sharedContext = manager ? { manager } : {};
|
|
549
|
+
let record = null;
|
|
550
|
+
try {
|
|
551
|
+
record = await this.createDocumentRecords({
|
|
552
|
+
display_id: displayId,
|
|
553
|
+
title: input.title || (input.type === "invoice" ? "Tax Invoice" :
|
|
554
|
+
input.type === "receipt" ? "Payment Receipt" :
|
|
555
|
+
input.type === "packing_slip" ? "Packing Slip" :
|
|
556
|
+
input.type === "estimate" ? "Quotation" : "Document"),
|
|
557
|
+
type: input.type,
|
|
558
|
+
source: source,
|
|
559
|
+
status: input.payment_status === "paid" ? "paid" : "sent",
|
|
560
|
+
customer_name: input.customer.name,
|
|
561
|
+
customer_email: input.customer.email,
|
|
562
|
+
customer_phone: input.customer.phone,
|
|
563
|
+
order_id: input.order_id,
|
|
564
|
+
repair_ticket_id: input.repair_ticket_id,
|
|
565
|
+
zoho_document_id: zohoDocumentId,
|
|
566
|
+
total_amount: input.total,
|
|
567
|
+
currency_code: input.currency_code,
|
|
568
|
+
payment_status: input.payment_status || "unpaid",
|
|
569
|
+
payment_link: input.payment_link,
|
|
570
|
+
short_payment_link: shortPaymentLink,
|
|
571
|
+
pdf_url: `${(process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "")}/documents/${displayId}/document`,
|
|
572
|
+
metadata: {
|
|
573
|
+
items: input.items,
|
|
574
|
+
notes: input.notes,
|
|
575
|
+
body_text: input.body_text,
|
|
576
|
+
custom_fields: input.custom_fields,
|
|
577
|
+
},
|
|
578
|
+
}, sharedContext);
|
|
579
|
+
}
|
|
580
|
+
catch (err) {
|
|
581
|
+
const conn = getDatabaseConnection(container) || getDatabaseConnection(this.__container__);
|
|
582
|
+
if (conn) {
|
|
583
|
+
const [inserted] = await conn("document_record").insert({
|
|
584
|
+
display_id: displayId,
|
|
585
|
+
title: input.title || (input.type === "invoice" ? "Tax Invoice" :
|
|
586
|
+
input.type === "receipt" ? "Payment Receipt" :
|
|
587
|
+
input.type === "packing_slip" ? "Packing Slip" :
|
|
588
|
+
input.type === "estimate" ? "Quotation" : "Document"),
|
|
589
|
+
type: input.type,
|
|
590
|
+
source: source,
|
|
591
|
+
status: input.payment_status === "paid" ? "paid" : "sent",
|
|
592
|
+
customer_name: input.customer.name,
|
|
593
|
+
customer_email: input.customer.email,
|
|
594
|
+
customer_phone: input.customer.phone,
|
|
595
|
+
order_id: input.order_id,
|
|
596
|
+
repair_ticket_id: input.repair_ticket_id,
|
|
597
|
+
zoho_document_id: zohoDocumentId,
|
|
598
|
+
total_amount: input.total,
|
|
599
|
+
currency_code: input.currency_code,
|
|
600
|
+
payment_status: input.payment_status || "unpaid",
|
|
601
|
+
payment_link: input.payment_link,
|
|
602
|
+
short_payment_link: shortPaymentLink,
|
|
603
|
+
pdf_url: `${(process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "")}/documents/${displayId}/document`,
|
|
604
|
+
metadata: JSON.stringify({
|
|
605
|
+
items: input.items,
|
|
606
|
+
notes: input.notes,
|
|
607
|
+
body_text: input.body_text,
|
|
608
|
+
custom_fields: input.custom_fields,
|
|
609
|
+
}),
|
|
610
|
+
created_at: new Date(),
|
|
611
|
+
updated_at: new Date(),
|
|
612
|
+
}).returning("*");
|
|
613
|
+
record = inserted;
|
|
614
|
+
}
|
|
615
|
+
else {
|
|
616
|
+
throw err;
|
|
617
|
+
}
|
|
618
|
+
}
|
|
459
619
|
// Update with real public URL and short URL for document
|
|
460
620
|
const backendUrl = (process.env.MEDUSA_BACKEND_URL || process.env.BACKEND_URL || process.env.MEDUSA_URL || "http://localhost:9000").replace(/\/$/, "");
|
|
461
621
|
const realPdfUrl = `${backendUrl}/documents/${record.id}/document`;
|
|
462
622
|
const shortPdfLink = await this.getOrGenerateShortUrl(realPdfUrl, storeUrl);
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
623
|
+
try {
|
|
624
|
+
await this.updateDocumentRecords({
|
|
625
|
+
id: record.id,
|
|
626
|
+
pdf_url: realPdfUrl,
|
|
627
|
+
short_pdf_link: shortPdfLink,
|
|
628
|
+
}, sharedContext);
|
|
629
|
+
}
|
|
630
|
+
catch (err) {
|
|
631
|
+
const conn = getDatabaseConnection(container) || getDatabaseConnection(this.__container__);
|
|
632
|
+
if (conn) {
|
|
633
|
+
await conn("document_record").where({ id: record.id }).update({
|
|
634
|
+
pdf_url: realPdfUrl,
|
|
635
|
+
short_pdf_link: shortPdfLink,
|
|
636
|
+
updated_at: new Date(),
|
|
637
|
+
});
|
|
638
|
+
}
|
|
639
|
+
}
|
|
468
640
|
record.pdf_url = realPdfUrl;
|
|
469
641
|
record.short_pdf_link = shortPdfLink;
|
|
470
642
|
// Multi-channel notification auto-dispatch
|
|
@@ -500,9 +672,20 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
500
672
|
/**
|
|
501
673
|
* Fetches or regenerates the PDF buffer for an existing DocumentRecord
|
|
502
674
|
*/
|
|
503
|
-
async getPdfForRecord(recordId, container) {
|
|
504
|
-
|
|
505
|
-
|
|
675
|
+
async getPdfForRecord(recordId, container, sharedContext) {
|
|
676
|
+
let record = null;
|
|
677
|
+
try {
|
|
678
|
+
record = await this.retrieveDocumentRecord(recordId, {}, sharedContext);
|
|
679
|
+
}
|
|
680
|
+
catch (e) {
|
|
681
|
+
const conn = getDatabaseConnection(container) || getDatabaseConnection(this.__container__);
|
|
682
|
+
if (conn) {
|
|
683
|
+
record = await conn("document_record").where({ id: recordId }).orWhere({ display_id: recordId }).first();
|
|
684
|
+
}
|
|
685
|
+
if (!record)
|
|
686
|
+
throw e;
|
|
687
|
+
}
|
|
688
|
+
const settings = await this.getSettings(sharedContext, container);
|
|
506
689
|
// If source is Zoho and zoho_document_id exists, fetch from Zoho API
|
|
507
690
|
if (record.source === "zoho" &&
|
|
508
691
|
record.zoho_document_id &&
|
|
@@ -585,4 +768,4 @@ class DocumentModuleService extends (0, utils_1.MedusaService)({
|
|
|
585
768
|
}
|
|
586
769
|
exports.DocumentModuleService = DocumentModuleService;
|
|
587
770
|
exports.default = DocumentModuleService;
|
|
588
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":"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"}
|
|
771
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":";;;AA6CA,sDAiEC;AA9GD,qDAAqF;AACrF,kEAA8D;AAC9D,8DAA0D;AAC1D,0DAAsD;AACtD,0DAA6D;AAC7D,sEAA0F;AAC1F,0EAAmE;AACnE,4EAAwE;AAiCxE;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,SAAc;IAClD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,gIAAgI;IAChI,IAAI,CAAC;QACH,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,aAAa,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrG,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC;YACxB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;YAEd,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjF,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC;YACxB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;YAEd,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7E,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC;YACxB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IAEd,kEAAkE;IAClE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC;gBACH,IAAI,MAAM,CAAC,iCAAyB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACpD,OAAO,MAAM,CAAC,iCAAyB,CAAC,aAAa,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;YACd,IAAI,CAAC;gBACH,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAChC,OAAO,MAAM,CAAC,mBAAmB,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;YACd,IAAI,CAAC;gBACH,IAAI,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC5B,OAAO,MAAM,CAAC,eAAe,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IAEd,2EAA2E;IAC3E,IAAI,CAAC;QACH,IAAI,SAAS,CAAC,iCAAyB,CAAC,aAAa,CAAC,EAAE,CAAC;YACvD,OAAO,SAAS,CAAC,iCAAyB,CAAC,aAAa,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IACd,IAAI,CAAC;QACH,IAAI,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnC,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IACd,IAAI,CAAC;QACH,IAAI,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC,eAAe,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;IAEd,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAa,qBAAsB,SAAQ,IAAA,qBAAa,EAAC;IACvD,gBAAgB,EAAhB,oCAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,4BAAY;CACb,CAAC;IACA;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,aAAmB,EAAE,SAAe;QACpD,IAAI,CAAC;YACH,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;YAC1E,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC;gBACvC,YAAY,EAAE,OAAO;gBACrB,2BAA2B,EAAE,IAAI;gBACjC,yBAAyB,EAAE,IAAI;gBAC/B,8BAA8B,EAAE,IAAI;gBACpC,0BAA0B,EAAE,IAAI;gBAChC,6BAA6B,EAAE,IAAI;gBACnC,8BAA8B,EAAE,IAAI;gBACpC,+BAA+B,EAAE,IAAI;gBACrC,4BAA4B,EAAE,IAAI;gBAClC,mCAAmC,EAAE,IAAI;gBACzC,+BAA+B,EAAE,IAAI;gBACrC,4BAA4B,EAAE,IAAI;gBAClC,8BAA8B,EAAE,IAAI;gBACpC,6BAA6B,EAAE,IAAI;gBACnC,gBAAgB,EAAE,QAAQ;gBAC1B,qBAAqB,EAAE,QAAQ;gBAC/B,gBAAgB,EAAE,QAAQ;gBAC1B,iBAAiB,EAAE,QAAQ;gBAC3B,iBAAiB,EAAE,QAAQ;gBAC3B,mBAAmB,EAAE,QAAQ;gBAC7B,sBAAsB,EAAE,IAAI;gBAC5B,mBAAmB,EAAE,IAAI;gBACzB,iBAAiB,EAAE,IAAI;gBACvB,sBAAsB,EAAE,IAAI;gBAC5B,0BAA0B,EAAE,IAAI;gBAChC,2BAA2B,EAAE,IAAI;gBACjC,yBAAyB,EAAE,IAAI;gBAC/B,8BAA8B,EAAE,IAAI;gBACpC,2BAA2B,EAAE,IAAI;gBACjC,4BAA4B,EAAE,IAAI;gBAClC,0BAA0B,EAAE,IAAI;gBAChC,+BAA+B,EAAE,IAAI;gBACrC,+BAA+B,EAAE,IAAI;gBACrC,gCAAgC,EAAE,IAAI;gBACtC,8BAA8B,EAAE,IAAI;gBACpC,mCAAmC,EAAE,IAAI;gBACzC,4BAA4B,EAAE,IAAI;gBAClC,6BAA6B,EAAE,IAAI;gBACnC,2BAA2B,EAAE,IAAI;gBACjC,gCAAgC,EAAE,IAAI;aACvC,EAAE,aAAa,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAE,IAAY,CAAC,aAAa,CAAC,CAAC;YACpG,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,CAAC;gBAClD,IAAI,GAAG;oBAAE,OAAO,GAAG,CAAC;gBACpB,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC;oBACvD,YAAY,EAAE,OAAO;oBACrB,2BAA2B,EAAE,IAAI;oBACjC,yBAAyB,EAAE,IAAI;oBAC/B,8BAA8B,EAAE,IAAI;oBACpC,0BAA0B,EAAE,IAAI;oBAChC,6BAA6B,EAAE,IAAI;oBACnC,8BAA8B,EAAE,IAAI;oBACpC,+BAA+B,EAAE,IAAI;oBACrC,4BAA4B,EAAE,IAAI;oBAClC,mCAAmC,EAAE,IAAI;oBACzC,+BAA+B,EAAE,IAAI;oBACrC,4BAA4B,EAAE,IAAI;oBAClC,8BAA8B,EAAE,IAAI;oBACpC,6BAA6B,EAAE,IAAI;oBACnC,gBAAgB,EAAE,QAAQ;oBAC1B,qBAAqB,EAAE,QAAQ;oBAC/B,gBAAgB,EAAE,QAAQ;oBAC1B,iBAAiB,EAAE,QAAQ;oBAC3B,iBAAiB,EAAE,QAAQ;oBAC3B,mBAAmB,EAAE,QAAQ;oBAC7B,UAAU,EAAE,IAAI,IAAI,EAAE;oBACtB,UAAU,EAAE,IAAI,IAAI,EAAE;iBACvB,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,OAAO,CAAC;YACjB,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAW,EAAE,OAAgB;QACvD,IAAI,CAAC,GAAG;YAAE,OAAO,GAAG,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACvD,IAAI,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAE5F,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,OAAO,GAAG,IAAI,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC9C,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,SAAS;gBACT,GAAG;aACJ,CAAC,CAAC;YAEH,OAAO,GAAG,IAAI,MAAM,SAAS,EAAE,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,GAAG,CAAC;QACb,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,KAA4B,EAAE,SAAe;QAIlE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,CAAC,QAAQ,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAElH,+CAA+C;QAC/C,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5F,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,iCAAyB,CAAC,KAAK,CAAC,CAAC;gBACpE,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;wBAC1C,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE;4BACN,GAAG;4BACH,UAAU;4BACV,oBAAoB;4BACpB,2BAA2B;4BAC3B,4BAA4B;yBAC7B;wBACD,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,gBAAgB,EAAE;qBACxC,CAAC,CAAC;oBACH,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAClC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC1B,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;wBAClI,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;wBACjG,IAAI,YAAY,GAAG,iBAAiB,CAAC;wBACrC,IAAI,aAAa,GAAuB,SAAS,CAAC;wBAClD,IAAI,aAAa,GAAuB,SAAS,CAAC;wBAClD,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;4BACvB,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;4BAC3E,IAAI,OAAO,EAAE,CAAC;gCACZ,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gCAC7D,IAAI,CAAC,EAAE,CAAC;oCACN,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,YAAY,CAAC;oCACtG,aAAa,GAAG,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;oCACrC,aAAa,GAAG,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;gCACvC,CAAC;4BACH,CAAC;wBACH,CAAC;wBACD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;4BACpB,KAAK,CAAC,QAAQ,GAAG;gCACf,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,aAAa;gCACpB,KAAK,EAAE,aAAa;6BACrB,CAAC;wBACJ,CAAC;wBACD,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BAC7C,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;4BACjB,sFAAsF;4BACtF,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;gCAC5B,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;oCACzC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAK,EAAU,CAAC,KAAK,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACpE,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;oCACnF,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK;wCACjC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,KAAK,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;wCAC5F,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,gBAAgB,CAAC;oCACtD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,SAAS;wCAChB,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wCAC9F,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,mCAAmC;4BACnC,IAAI,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;gCAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oCAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACvC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;oCAC7D,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,kBAAkB;wCACpD,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE;wCAC/C,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,mBAAmB;4BACnB,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gCACxB,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;oCACrC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;oCACrC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC;oCACzD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;wCACf,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,KAAK,IAAI,uBAAuB;wCACrD,WAAW,EAAE,EAAE,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wCAC/D,QAAQ,EAAE,GAAG;wCACb,UAAU,EAAE,SAAS;wCACrB,KAAK,EAAE,GAAG,GAAG,SAAS;qCACvB,CAAC,CAAC;gCACL,CAAC;4BACH,CAAC;4BACD,iBAAiB;4BACjB,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gCAC3C,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;oCACf,KAAK,EAAE,cAAc;oCACrB,QAAQ,EAAE,CAAC;oCACX,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;oCACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;iCACrC,CAAC,CAAC;4BACL,CAAC;4BACD,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gCAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC;gCACtH,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;oCACf,KAAK,EAAE,oCAAoC,MAAM,CAAC,aAAa,GAAG;oCAClE,WAAW,EAAE,MAAM,CAAC,iBAAiB,IAAI,gCAAgC;oCACzE,QAAQ,EAAE,CAAC;oCACX,UAAU,EAAE,GAAG;oCACf,KAAK,EAAE,GAAG;iCACX,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;wBACD,KAAK,CAAC,aAAa,GAAG;4BACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,IAAI,KAAK;4BAClD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,KAAK;4BACtC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,KAAK;4BAC7E,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI,eAAe;4BACxD,aAAa,EAAE,MAAM,CAAC,WAAW,IAAI,MAAM;4BAC3C,YAAY,EAAE,MAAM,CAAC,eAAe,IAAI,YAAY;4BACpD,gBAAgB,EAAE,MAAM,CAAC,iBAAiB,IAAI,iBAAiB;4BAC/D,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;yBAC/B,CAAC;wBACF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;4BACvD,KAAK,CAAC,YAAY,GAAG,GAAG,QAAQ,wBAAwB,MAAM,CAAC,cAAc,EAAE,CAAC;wBAClF,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;QACnB,CAAC;QAED,0CAA0C;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,IAAI,MAAM,CAAC,CAAC;QAC7F,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QAEhG,wDAAwD;QACxD,IAAI,gBAAgB,GAAuB,SAAS,CAAC;QACrD,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,MAAM,GAAsB,QAAQ,CAAC;QACzC,IAAI,cAAc,GAAkB,IAAI,CAAC;QACzC,IAAI,SAAS,GAAkB,IAAI,CAAC;QAEpC,qCAAqC;QACrC,MAAM,UAAU,GACd,KAAK,CAAC,YAAY,KAAK,QAAQ;YAC/B,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,cAAc;YACvB,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,oBAAoB;YAC7B,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAEtF,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,IAAI,6BAAgB,CAC/B;oBACE,SAAS,EAAE,QAAQ,CAAC,cAAc;oBAClC,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,eAAe,EAAE,QAAQ,CAAC,oBAAoB;oBAC9C,MAAM,EAAE,QAAQ,CAAC,WAAW,IAAI,KAAK;iBACtC,EACD,MAAM,CACP,CAAC;gBAEF,0BAA0B;gBAC1B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;oBACvC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBAC/B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;iBAC5B,CAAC,CAAC;gBAEH,mEAAmE;gBACnE,IAAI,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,QAAQ,CAAC,kBAAkB,IAAI,8BAA8B,CAAC;gBAC7F,IAAI,gBAAgB,EAAE,CAAC;oBACrB,SAAS,IAAI,mBAAmB,gBAAgB,EAAE,CAAC;gBACrD,CAAC;gBACD,MAAM,SAAS,GAAG,QAAQ,CAAC,kBAAkB,IAAI,EAAE,CAAC;gBAEpD,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBACrD,IAAI,EAAE,EAAE,CAAC,KAAK;oBACd,WAAW,EAAE,EAAE,CAAC,WAAW,IAAI,EAAE;oBACjC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC3C,QAAQ,EAAE,EAAE,CAAC,QAAQ,IAAI,CAAC;iBAC3B,CAAC,CAAC,CAAC;gBAEJ,MAAM,YAAY,GAA4C,EAAE,CAAC;gBACjE,IAAI,gBAAgB,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;oBAC3C,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,QAAQ,CAAC,8BAA8B,IAAI,cAAc;wBAChE,KAAK,EAAE,CAAC,gBAAgB,IAAI,KAAK,CAAC,YAAY,CAAW;qBAC1D,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;wBAC9C,gBAAgB,EAAE,SAAS;wBAC3B,UAAU,EAAE,aAAa;wBACzB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,SAAS;wBAChB,aAAa,EAAE,QAAQ,CAAC,uBAAuB,IAAI,CAAC;wBACpD,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;wBACtD,aAAa,EAAE,YAAY;qBAC5B,CAAC,CAAC;oBACH,cAAc,GAAG,GAAG,CAAC,UAAU,CAAC;oBAChC,MAAM,GAAG,MAAM,CAAC;oBAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;oBACvE,MAAM,YAAY,GAAG,QAAQ,CAAC,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBACvH,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,YAAY;wBACnB,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;wBAC/C,gBAAgB,EAAE,SAAS;wBAC3B,UAAU,EAAE,aAAa;wBACzB,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,SAAS;wBAChB,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;qBACvD,CAAC,CAAC;oBACH,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC;oBACjC,MAAM,GAAG,MAAM,CAAC;oBAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;oBACzE,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;wBAC7C,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpC,yHAAyH;oBACzH,IAAI,eAAe,GAAkB,IAAI,CAAC;oBAE1C,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;wBACnB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;4BAClD,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;wBACH,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;wBAC9D,IAAI,GAAG,EAAE,CAAC;4BACR,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;wBACzC,CAAC;oBACH,CAAC;yBAAM,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;wBAClC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;4BAClD,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;4BACxC,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;wBACH,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;wBAC9D,IAAI,GAAG,EAAE,CAAC;4BACR,eAAe,GAAG,GAAG,CAAC,gBAAgB,CAAC;wBACzC,CAAC;oBACH,CAAC;oBAED,sFAAsF;oBACtF,IAAI,CAAC,eAAe,EAAE,CAAC;wBACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;4BACjD,gBAAgB,EAAE,SAAS;4BAC3B,UAAU,EAAE,aAAa;4BACzB,KAAK,EAAE,SAAS;4BAChB,KAAK,EAAE,SAAS;4BAChB,aAAa,EAAE,CAAC;4BAChB,gBAAgB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,KAAK;4BACtD,aAAa,EAAE,YAAY;yBAC5B,CAAC,CAAC;wBACH,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC;oBACtC,CAAC;oBAED,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;oBAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAC1C,eAAe,EACf,aAAa,EACb,SAAS,EACT,QAAQ,EACR,SAAS,CACV,CAAC;oBAEF,cAAc,GAAG,SAAS,CAAC;oBAC3B,MAAM,GAAG,MAAM,CAAC;oBAEhB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;oBAC7D,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvD,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;wBAC7C,iBAAiB,EAAE,IAAI;qBACxB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,OAAO,OAAY,EAAE,CAAC;gBACtB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,oDAAoD,OAAO,CAAC,OAAO,4BAA4B,CAAC,CAAC;gBACpI,MAAM,GAAG,QAAQ,CAAC;gBAClB,cAAc,GAAG,IAAI,CAAC;gBACtB,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC;QACH,CAAC;QAED,gEAAgE;QAChE,uCAAuC;QACvC,gEAAgE;QAChE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,QAAQ,CAAC;YAClB,IAAI,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;YACzD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;gBAAE,YAAY,GAAG,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC;iBACxF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;gBAAE,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;iBACnF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;iBACrF,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;gBAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;iBACrF,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAAE,YAAY,GAAG,QAAQ,CAAC,mBAAmB,IAAI,QAAQ,CAAC;YAE1F,MAAM,OAAO,GAAiB;gBAC5B,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC5C,QAAQ,EAAE;oBACR,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBACzB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBAC3B,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO;iBAChC;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ,CAAC,YAAY,IAAI,OAAO;oBACtC,QAAQ,EAAE,QAAQ,CAAC,YAAY;oBAC/B,OAAO,EAAE,QAAQ,CAAC,WAAW;oBAC7B,KAAK,EAAE,QAAQ,CAAC,SAAS;oBACzB,KAAK,EAAE,QAAQ,CAAC,SAAS;oBACzB,OAAO,EAAE,QAAQ,CAAC,WAAW;oBAC7B,eAAe,EAAE,QAAQ,CAAC,mBAAmB;oBAC7C,KAAK,EAAE,QAAQ,CAAC,SAAS;iBAC1B;gBACD,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5C,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK;gBAC3C,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,QAAQ;gBAChD,YAAY,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;gBACpD,MAAM,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;gBAC9C,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;aACnC,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACxE,SAAS,GAAG,MAAM,IAAA,mCAAc,EAAC,SAAS,EAAE;gBAC1C,KAAK,EAAE,gBAAgB,IAAI,KAAK,CAAC,YAAY;aAC9C,CAAC,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,MAAM,aAAa,GAAG,GAAG,QAAQ,oCAAoC,CAAC;QACtE,MAAM,OAAO,GAAG,SAAS,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAEjD,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBACxC,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,CACpB,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;oBAC1C,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;wBAC9C,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;4BAChD,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CACrD;gBACD,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,KAAK,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;gBACzD,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;gBAClC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;gBACpC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;gBACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,gBAAgB,EAAE,cAAc;gBAChC,YAAY,EAAE,KAAK,CAAC,KAAK;gBACzB,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,QAAQ;gBAChD,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,kBAAkB,EAAE,gBAAgB;gBACpC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,SAAS,WAAW;gBACjL,QAAQ,EAAE;oBACR,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;iBACnC;aACF,EAAE,aAAa,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAE,IAAY,CAAC,aAAa,CAAC,CAAC;YACpG,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;oBACtD,UAAU,EAAE,SAAS;oBACrB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,CACpB,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;wBAC1C,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;4BAC9C,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;gCAChD,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CACrD;oBACD,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,MAAM,EAAE,MAAM;oBACd,MAAM,EAAE,KAAK,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;oBACzD,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;oBAClC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACpC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;oBACxC,gBAAgB,EAAE,cAAc;oBAChC,YAAY,EAAE,KAAK,CAAC,KAAK;oBACzB,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,QAAQ;oBAChD,YAAY,EAAE,KAAK,CAAC,YAAY;oBAChC,kBAAkB,EAAE,gBAAgB;oBACpC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,SAAS,WAAW;oBACjL,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;wBACvB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;qBACnC,CAAC;oBACF,UAAU,EAAE,IAAI,IAAI,EAAE;oBACtB,UAAU,EAAE,IAAI,IAAI,EAAE;iBACvB,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBAClB,MAAM,GAAG,QAAQ,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;QAED,yDAAyD;QACzD,MAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,uBAAuB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvJ,MAAM,UAAU,GAAG,GAAG,UAAU,cAAc,MAAM,CAAC,EAAE,WAAW,CAAC;QACnE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE5E,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,OAAO,EAAE,UAAU;gBACnB,cAAc,EAAE,YAAY;aAC7B,EAAE,aAAa,CAAC,CAAC;QACpB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAE,IAAY,CAAC,aAAa,CAAC,CAAC;YACpG,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC;oBAC5D,OAAO,EAAE,UAAU;oBACnB,cAAc,EAAE,YAAY;oBAC5B,UAAU,EAAE,IAAI,IAAI,EAAE;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;QAC5B,MAAM,CAAC,cAAc,GAAG,YAAY,CAAC;QAErC,2CAA2C;QAC3C,IAAI,KAAK,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,wCAAkB,CAAC,IAAI,CAAC;gBAC5B,SAAS;gBACT,QAAQ,EAAE;oBACR,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;oBAC7C,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,cAAc,EAAE,KAAK,CAAC,oBAAoB;oBAC1C,OAAO,EAAE,KAAK,CAAC,aAAa;oBAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;iBAC1C;gBACD,QAAQ,EAAE,KAAK,CAAC,qBAAqB;gBACrC,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,SAAe,EAAE,aAAmB;QAC1E,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,GAAG,qBAAqB,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAE,IAAY,CAAC,aAAa,CAAC,CAAC;YACpG,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAC3G,CAAC;YACD,IAAI,CAAC,MAAM;gBAAE,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAElE,qEAAqE;QACrE,IACE,MAAM,CAAC,MAAM,KAAK,MAAM;YACxB,MAAM,CAAC,gBAAgB;YACvB,QAAQ,CAAC,kBAAkB;YAC3B,QAAQ,CAAC,cAAc,EACvB,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,MAAM,IAAI,GAAG,IAAI,6BAAgB,CAC/B;oBACE,SAAS,EAAE,QAAQ,CAAC,cAAc;oBAClC,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,aAAa,EAAE,QAAQ,CAAC,kBAAkB;oBAC1C,eAAe,EAAE,QAAQ,CAAC,oBAAoB;oBAC9C,MAAM,EAAE,QAAQ,CAAC,WAAW,IAAI,KAAK;iBACtC,EACD,MAAM,CACP,CAAC;gBAEF,IAAI,MAAmB,CAAC;gBACxB,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpE,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBACvE,CAAC;gBAED,OAAO,MAAM,IAAA,mCAAc,EAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBAC/C,KAAK,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;oBACvD,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,qDAAqD,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC;YACpI,CAAC;QACH,CAAC;QAED,6BAA6B;QAC7B,IAAI,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;QACzD,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc;YAAE,YAAY,GAAG,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC;aACzF,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;YAAE,YAAY,GAAG,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC;aACpF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;aACtF,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU;YAAE,YAAY,GAAG,QAAQ,CAAC,iBAAiB,IAAI,QAAQ,CAAC;aACtF,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ;YAAE,YAAY,GAAG,QAAQ,CAAC,mBAAmB,IAAI,QAAQ,CAAC;QAE3F,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAQ,CAAC;QAC5C,MAAM,OAAO,GAAiB;YAC5B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAW;YACxB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5C,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM,CAAC,aAAa,IAAI,iBAAiB;gBAC/C,KAAK,EAAE,MAAM,CAAC,cAAc,IAAI,SAAS;gBACzC,KAAK,EAAE,MAAM,CAAC,cAAc,IAAI,SAAS;aAC1C;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ,CAAC,YAAY,IAAI,OAAO;gBACtC,QAAQ,EAAE,QAAQ,CAAC,YAAY;gBAC/B,OAAO,EAAE,QAAQ,CAAC,WAAW;gBAC7B,KAAK,EAAE,QAAQ,CAAC,SAAS;gBACzB,KAAK,EAAE,QAAQ,CAAC,SAAS;gBACzB,OAAO,EAAE,QAAQ,CAAC,WAAW;gBAC7B,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,KAAK,EAAE,QAAQ,CAAC,SAAS;aAC1B;YACD,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,KAAK,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC;YAC/B,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,KAAK;YAC5C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,YAAY,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;YAC9D,MAAM,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;YACxD,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,MAAM,IAAA,mCAAc,EAAC,SAAS,EAAE;YACrC,KAAK,EAAE,MAAM,CAAC,kBAAkB,IAAI,MAAM,CAAC,YAAY;SACxD,CAAC,CAAC;IACL,CAAC;CACF;AAtsBD,sDAssBC;AAED,kBAAe,qBAAqB,CAAC"}
|
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
---
|
|
9
9
|
|
|
10
|
+
## [1.1.6] - 2026-10-16
|
|
11
|
+
|
|
12
|
+
### Patch Release: Safe Knex Resolution via `ContainerRegistrationKeys.PG_CONNECTION` & DML Table Name Correction
|
|
13
|
+
|
|
14
|
+
- **Container DI Registration Key Fix**: Resolved `AwilixResolutionError: Could not resolve 'pg_connection'` by introducing `getDatabaseConnection(container)` helper which queries `ContainerRegistrationKeys.PG_CONNECTION` (`"__pg_connection__"`), `"__pg_connection__"`, and `"pg_connection"` with `{ allowUnregistered: true }` wrapped safely in try/catch blocks.
|
|
15
|
+
- **Awilix Cradle Proxy Safety**: Eliminated raw property lookups against `__container__` proxies which bypass `allowUnregistered` and trigger unhandled errors in Medusa v2.
|
|
16
|
+
- **DML Database Table Alignment**: Fixed table name mismatch where Knex fallback queries were referencing `document_records` (plural) instead of the singular `document_record` table created by Medusa v2 DML (`model.define("document_record", ...)`), preventing `relation "document_records" does not exist` 500 runtime exceptions in document listings and PDF streams.
|
|
17
|
+
- **Backend Dependency Update**: Pointed `admin.urbandevicecare.co.uk` backend dependency to `"medusajs-documents-plugin": "^1.1.6"`.
|
|
18
|
+
|
|
19
|
+
---
|
|
20
|
+
|
|
21
|
+
## [1.1.5] - 2026-10-16
|
|
22
|
+
|
|
23
|
+
### Patch Release: Dual Transaction Context Injection & Direct Knex Fallback for Settings & Documents
|
|
24
|
+
|
|
25
|
+
- **Resolved `reading 'fork'` Exception**: Fixed runtime `TypeError: Cannot read properties of undefined (reading 'fork')` encountered when loading or saving plugin settings (`GET/POST /admin/documents/settings`) and viewing documents (`GET /admin/documents`).
|
|
26
|
+
- **Transaction Context Resolution**: Injected `sharedContext` with the resolved MikroORM `manager` from `req.scope` into all generated `MedusaService` operations.
|
|
27
|
+
- **Fail-Safe PostgreSQL/Knex Fallbacks**: Added direct Knex fallback queries (`pg_connection`) for retrieving and persisting settings (`document_settings`) and document records (`document_records`), ensuring zero runtime crashes even in non-standard plugin loading or standalone module environments.
|
|
28
|
+
- **Resilient PDF Streaming**: Updated admin and public PDF retrieval routes to pass transaction context and fallback to Knex if module repository manager is uninitialized.
|
|
29
|
+
|
|
30
|
+
---
|
|
31
|
+
|
|
10
32
|
## [1.1.1] - 2026-10-15
|
|
11
33
|
|
|
12
34
|
### Patch Release: Public Stream Endpoints, Shortlink Normalization & Repair Handover
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "medusajs-documents-plugin",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"description": "Comprehensive document generation and management module for Medusa v2 with Zoho Books integration, PDFKit fallback, QR codes, shortlinks, multi-channel notifications and unified admin hub.",
|
|
5
5
|
"author": "Urban Device Care <info@urbandevicecare.co.uk>",
|
|
6
6
|
"license": "MIT",
|