medusajs-documents-plugin 1.1.13 → 1.1.15
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/admin/index.js +53 -29
- package/.medusa/server/src/admin/index.mjs +54 -30
- package/.medusa/server/src/api/admin/documents/[id]/sync-zoho/route.js +21 -4
- package/.medusa/server/src/api/admin/documents/custom/route.js +6 -4
- package/.medusa/server/src/api/admin/documents/manual/route.js +6 -4
- package/.medusa/server/src/api/admin/documents/templates/preview/route.js +1 -1
- package/.medusa/server/src/api/admin/documents/zoho/list/route.js +18 -7
- package/.medusa/server/src/api/api/store/documents/r/[code]/route.js +3 -42
- package/.medusa/server/src/api/documents/r/[code]/route.js +3 -37
- package/.medusa/server/src/api/documents/templates/preview/route.js +1 -1
- package/.medusa/server/src/api/r/[code]/route.js +3 -55
- package/.medusa/server/src/api/store/documents/r/[code]/route.js +4 -31
- package/.medusa/server/src/modules/documents/service.js +23 -7
- package/.medusa/server/src/services/notification-sender.js +5 -5
- package/.medusa/server/src/services/pdfkit-generator.js +58 -20
- package/.medusa/server/src/services/zoho-books.js +6 -4
- package/.medusa/server/src/subscribers/order-documents.js +17 -6
- package/.medusa/server/src/subscribers/repair-documents.js +45 -7
- package/.medusa/server/src/utils/shortlink-resolver.js +168 -0
- package/CHANGELOG.md +39 -0
- package/package.json +1 -1
|
@@ -62,13 +62,18 @@ async function repairDocumentsSubscriber({ event, container, }) {
|
|
|
62
62
|
let customerName = "Valued Customer";
|
|
63
63
|
let customerEmail = undefined;
|
|
64
64
|
let customerPhone = undefined;
|
|
65
|
+
let customerCompanyName = ticket.company_name ||
|
|
66
|
+
ticket.customer?.company_name ||
|
|
67
|
+
ticket.metadata?.company_name;
|
|
65
68
|
if (ticket.customer_id) {
|
|
66
69
|
try {
|
|
67
70
|
const customerModule = container.resolve("customer", { allowUnregistered: true });
|
|
68
71
|
if (customerModule) {
|
|
69
72
|
const c = await customerModule.retrieveCustomer(ticket.customer_id);
|
|
70
73
|
if (c) {
|
|
71
|
-
|
|
74
|
+
customerCompanyName = customerCompanyName || c.company_name || c.metadata?.company_name;
|
|
75
|
+
const personalName = c.first_name ? `${c.first_name} ${c.last_name || ""}`.trim() : "";
|
|
76
|
+
customerName = customerCompanyName || personalName || c.email || customerName;
|
|
72
77
|
customerEmail = c.email || undefined;
|
|
73
78
|
customerPhone = c.phone || undefined;
|
|
74
79
|
}
|
|
@@ -76,6 +81,11 @@ async function repairDocumentsSubscriber({ event, container, }) {
|
|
|
76
81
|
}
|
|
77
82
|
catch (e) { }
|
|
78
83
|
}
|
|
84
|
+
else if (ticket.customer_name || customerCompanyName) {
|
|
85
|
+
customerName = customerCompanyName || ticket.customer_name;
|
|
86
|
+
customerEmail = ticket.customer_email || undefined;
|
|
87
|
+
customerPhone = ticket.customer_phone || undefined;
|
|
88
|
+
}
|
|
79
89
|
const storeUrl = settings.storefront_url || process.env.STORE_URL || "http://localhost:3000";
|
|
80
90
|
const paymentInfo = (0, payment_link_1.generateRepairPaymentLink)(ticket, storeUrl);
|
|
81
91
|
// Fix 4: Build line items mapping inventory parts from product_variants as well as custom_parts
|
|
@@ -160,13 +170,40 @@ async function repairDocumentsSubscriber({ event, container, }) {
|
|
|
160
170
|
docType = "job_card";
|
|
161
171
|
docTitle = "Repair Job Card";
|
|
162
172
|
}
|
|
173
|
+
const cleanTicketNumber = String(ticket.ticket_number || "").replace(/^(JOB-|RT-)+/i, "");
|
|
163
174
|
const displayId = docType === "job_card"
|
|
164
|
-
? `JOB-${
|
|
175
|
+
? `JOB-${cleanTicketNumber}`
|
|
165
176
|
: docType === "receipt"
|
|
166
|
-
? `RCPT-${
|
|
177
|
+
? `RCPT-${cleanTicketNumber}`
|
|
167
178
|
: docType === "estimate"
|
|
168
|
-
? `EST-${
|
|
169
|
-
: `RT-${
|
|
179
|
+
? `EST-${cleanTicketNumber}`
|
|
180
|
+
: `RT-${cleanTicketNumber}`;
|
|
181
|
+
let currencyCode = ticket.currency_code || ticket.metadata?.currency_code;
|
|
182
|
+
if (!currencyCode) {
|
|
183
|
+
try {
|
|
184
|
+
const storeModule = container.resolve("store", { allowUnregistered: true });
|
|
185
|
+
if (storeModule) {
|
|
186
|
+
const [store] = await storeModule.listStores();
|
|
187
|
+
if (store?.default_currency_code) {
|
|
188
|
+
currencyCode = store.default_currency_code;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
catch (e) { }
|
|
193
|
+
}
|
|
194
|
+
if (!currencyCode) {
|
|
195
|
+
try {
|
|
196
|
+
const regionModule = container.resolve("region", { allowUnregistered: true });
|
|
197
|
+
if (regionModule) {
|
|
198
|
+
const [reg] = await regionModule.listRegions();
|
|
199
|
+
if (reg?.currency_code) {
|
|
200
|
+
currencyCode = reg.currency_code;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
catch (e) { }
|
|
205
|
+
}
|
|
206
|
+
currencyCode = currencyCode || "kes";
|
|
170
207
|
const totalEstimate = eventName === "repair.payment_received" && data.amount != null && Number(data.amount) > 0
|
|
171
208
|
? Number(data.amount)
|
|
172
209
|
: Number(ticket.total_actual && ticket.total_actual > 0 ? ticket.total_actual : ticket.total_estimate || 0);
|
|
@@ -197,12 +234,13 @@ async function repairDocumentsSubscriber({ event, container, }) {
|
|
|
197
234
|
order_id: data.order_id || ticket.order_id || ticket.metadata?.order_id,
|
|
198
235
|
customer: {
|
|
199
236
|
name: customerName,
|
|
237
|
+
company_name: customerCompanyName || undefined,
|
|
200
238
|
email: customerEmail,
|
|
201
239
|
phone: customerPhone,
|
|
202
240
|
},
|
|
203
241
|
items: lineItems,
|
|
204
242
|
total: totalEstimate,
|
|
205
|
-
currency_code:
|
|
243
|
+
currency_code: currencyCode,
|
|
206
244
|
payment_status: isPaid ? "paid" : "unpaid",
|
|
207
245
|
payment_link: paymentOrTrackingLink || undefined,
|
|
208
246
|
auto_send: autoSend,
|
|
@@ -260,4 +298,4 @@ exports.config = {
|
|
|
260
298
|
"repair.payment_received",
|
|
261
299
|
],
|
|
262
300
|
};
|
|
263
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"repair-documents.js","sourceRoot":"","sources":["../../../../src/subscribers/repair-documents.ts"],"names":[],"mappings":"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"}
|
|
301
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"repair-documents.js","sourceRoot":"","sources":["../../../../src/subscribers/repair-documents.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleShortlinkRedirect = handleShortlinkRedirect;
|
|
4
|
+
const documents_1 = require("../modules/documents");
|
|
5
|
+
const service_1 = require("../modules/documents/service");
|
|
6
|
+
/**
|
|
7
|
+
* Universal safe shortlink redirection handler.
|
|
8
|
+
* Resolves shortcodes from documents module, repair module, or direct knex fallback,
|
|
9
|
+
* safely extracts host and protocol across Express and Fastify environments,
|
|
10
|
+
* and performs redirection without throwing 500 errors.
|
|
11
|
+
*/
|
|
12
|
+
async function handleShortlinkRedirect(req, res, contextTag = "Shortlink") {
|
|
13
|
+
const code = req.params?.code;
|
|
14
|
+
if (!code || typeof code !== "string" || !code.trim()) {
|
|
15
|
+
return res.status(404).send("Link not found or expired.");
|
|
16
|
+
}
|
|
17
|
+
const cleanCode = code.trim();
|
|
18
|
+
try {
|
|
19
|
+
let targetUrl = null;
|
|
20
|
+
// 1. Resolve via DocumentModuleService
|
|
21
|
+
try {
|
|
22
|
+
const documentService = req.scope.resolve(documents_1.DOCUMENTS_MODULE, { allowUnregistered: true });
|
|
23
|
+
if (documentService) {
|
|
24
|
+
const links = await documentService.listDocumentLinks({ shortcode: cleanCode }).catch(() => []);
|
|
25
|
+
if (links && links.length > 0 && links[0].url) {
|
|
26
|
+
targetUrl = links[0].url;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
catch (_) { }
|
|
31
|
+
// 2. Resolve via Repair Module if present
|
|
32
|
+
if (!targetUrl) {
|
|
33
|
+
try {
|
|
34
|
+
const repairModule = req.scope.resolve("repair", { allowUnregistered: true });
|
|
35
|
+
if (repairModule && typeof repairModule.listRepairLinks === "function") {
|
|
36
|
+
const links = await repairModule.listRepairLinks({ shortcode: cleanCode }).catch(() => []);
|
|
37
|
+
if (links && links.length > 0 && links[0].url) {
|
|
38
|
+
targetUrl = links[0].url;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
catch (_) { }
|
|
43
|
+
}
|
|
44
|
+
// 3. Fallback direct SQL resolution using Knex
|
|
45
|
+
if (!targetUrl) {
|
|
46
|
+
try {
|
|
47
|
+
const pg = (0, service_1.getDatabaseConnection)(req.scope);
|
|
48
|
+
if (pg) {
|
|
49
|
+
// 3a. document_link table
|
|
50
|
+
try {
|
|
51
|
+
const row = await pg("document_link")
|
|
52
|
+
.where({ shortcode: cleanCode })
|
|
53
|
+
.first();
|
|
54
|
+
if (row && row.url) {
|
|
55
|
+
targetUrl = row.url;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
catch (_) { }
|
|
59
|
+
// 3b. repair_link table
|
|
60
|
+
if (!targetUrl) {
|
|
61
|
+
try {
|
|
62
|
+
const row = await pg("repair_link")
|
|
63
|
+
.where({ shortcode: cleanCode })
|
|
64
|
+
.first();
|
|
65
|
+
if (row && row.url) {
|
|
66
|
+
targetUrl = row.url;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
catch (_) { }
|
|
70
|
+
}
|
|
71
|
+
// 3c. document_record table (search short_payment_link or short_pdf_link)
|
|
72
|
+
if (!targetUrl) {
|
|
73
|
+
try {
|
|
74
|
+
const docRow = await pg("document_record")
|
|
75
|
+
.where(function () {
|
|
76
|
+
this.where("short_payment_link", "like", `%/r/${cleanCode}`)
|
|
77
|
+
.orWhere("short_payment_link", "like", `%/${cleanCode}`)
|
|
78
|
+
.orWhere("short_pdf_link", "like", `%/r/${cleanCode}`)
|
|
79
|
+
.orWhere("short_pdf_link", "like", `%/${cleanCode}`);
|
|
80
|
+
})
|
|
81
|
+
.first();
|
|
82
|
+
if (docRow) {
|
|
83
|
+
if (docRow.short_payment_link && docRow.short_payment_link.endsWith(cleanCode)) {
|
|
84
|
+
targetUrl = docRow.payment_link || docRow.short_payment_link;
|
|
85
|
+
}
|
|
86
|
+
else if (docRow.short_pdf_link && docRow.short_pdf_link.endsWith(cleanCode)) {
|
|
87
|
+
targetUrl = docRow.pdf_url || docRow.short_pdf_link;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch (_) { }
|
|
92
|
+
}
|
|
93
|
+
// 3d. repair_ticket table (search short_payment_link)
|
|
94
|
+
if (!targetUrl) {
|
|
95
|
+
try {
|
|
96
|
+
const repRow = await pg("repair_ticket")
|
|
97
|
+
.where(function () {
|
|
98
|
+
this.where("short_payment_link", "like", `%/r/${cleanCode}`)
|
|
99
|
+
.orWhere("short_payment_link", "like", `%/${cleanCode}`);
|
|
100
|
+
})
|
|
101
|
+
.first();
|
|
102
|
+
if (repRow && repRow.payment_link && !repRow.payment_link.endsWith(cleanCode)) {
|
|
103
|
+
targetUrl = repRow.payment_link;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (_) { }
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
catch (_) { }
|
|
111
|
+
}
|
|
112
|
+
if (!targetUrl) {
|
|
113
|
+
return res.status(404).send("Link not found or expired.");
|
|
114
|
+
}
|
|
115
|
+
// Safe extraction of host and protocol
|
|
116
|
+
const getHeader = (name) => {
|
|
117
|
+
try {
|
|
118
|
+
if (typeof req.get === "function") {
|
|
119
|
+
const val = req.get(name);
|
|
120
|
+
if (val)
|
|
121
|
+
return val;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch (_) { }
|
|
125
|
+
try {
|
|
126
|
+
if (req.headers && typeof req.headers === "object") {
|
|
127
|
+
const val = req.headers[name.toLowerCase()];
|
|
128
|
+
if (Array.isArray(val))
|
|
129
|
+
return val[0];
|
|
130
|
+
if (val != null)
|
|
131
|
+
return String(val);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
catch (_) { }
|
|
135
|
+
return undefined;
|
|
136
|
+
};
|
|
137
|
+
const host = getHeader("x-forwarded-host") ||
|
|
138
|
+
getHeader("host") ||
|
|
139
|
+
req.hostname ||
|
|
140
|
+
"localhost:9000";
|
|
141
|
+
const forwardedProto = getHeader("x-forwarded-proto");
|
|
142
|
+
const protocol = (forwardedProto === "http" || forwardedProto === "https")
|
|
143
|
+
? forwardedProto
|
|
144
|
+
: (req.protocol || (host.includes("localhost") || host.includes("127.0.0.1") ? "http" : "https"));
|
|
145
|
+
// Normalize any document path pointing to admin or legacy routes
|
|
146
|
+
if (targetUrl.includes("/documents/")) {
|
|
147
|
+
const docSubpath = targetUrl.slice(targetUrl.indexOf("/documents/")).replace(/\/admin\/documents\//, "/documents/");
|
|
148
|
+
targetUrl = `${protocol}://${host}${docSubpath}`;
|
|
149
|
+
}
|
|
150
|
+
else if (targetUrl.startsWith("/")) {
|
|
151
|
+
targetUrl = `${protocol}://${host}${targetUrl}`;
|
|
152
|
+
}
|
|
153
|
+
// Perform redirect safely
|
|
154
|
+
if (typeof res.redirect === "function") {
|
|
155
|
+
return res.redirect(targetUrl);
|
|
156
|
+
}
|
|
157
|
+
res.setHeader("Location", targetUrl);
|
|
158
|
+
return res.status(302).send("Redirecting...");
|
|
159
|
+
}
|
|
160
|
+
catch (err) {
|
|
161
|
+
try {
|
|
162
|
+
req.scope.resolve("logger", { allowUnregistered: true })?.error?.(`[${contextTag}] Error resolving /r/${cleanCode}: ${err.message}`);
|
|
163
|
+
}
|
|
164
|
+
catch (_) { }
|
|
165
|
+
return res.status(500).send("Error resolving link");
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hvcnRsaW5rLXJlc29sdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL3Nob3J0bGluay1yZXNvbHZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVVBLDBEQWlLQztBQTFLRCxvREFBd0Q7QUFDeEQsMERBQTRGO0FBRTVGOzs7OztHQUtHO0FBQ0ksS0FBSyxVQUFVLHVCQUF1QixDQUMzQyxHQUFvQyxFQUNwQyxHQUFtQixFQUNuQixhQUFxQixXQUFXO0lBRWhDLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDO0lBQzlCLElBQUksQ0FBQyxJQUFJLElBQUksT0FBTyxJQUFJLEtBQUssUUFBUSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLENBQUM7UUFDdEQsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFOUIsSUFBSSxDQUFDO1FBQ0gsSUFBSSxTQUFTLEdBQWtCLElBQUksQ0FBQztRQUVwQyx1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDO1lBQ0gsTUFBTSxlQUFlLEdBQTBCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLDRCQUFnQixFQUFFLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUNoSCxJQUFJLGVBQWUsRUFBRSxDQUFDO2dCQUNwQixNQUFNLEtBQUssR0FBRyxNQUFNLGVBQWUsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDaEcsSUFBSSxLQUFLLElBQUksS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDO29CQUM5QyxTQUFTLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztnQkFDM0IsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUM7UUFFZCwwQ0FBMEM7UUFDMUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ2YsSUFBSSxDQUFDO2dCQUNILE1BQU0sWUFBWSxHQUFRLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQ25GLElBQUksWUFBWSxJQUFJLE9BQU8sWUFBWSxDQUFDLGVBQWUsS0FBSyxVQUFVLEVBQUUsQ0FBQztvQkFDdkUsTUFBTSxLQUFLLEdBQUcsTUFBTSxZQUFZLENBQUMsZUFBZSxDQUFDLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO29CQUMzRixJQUFJLEtBQUssSUFBSSxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUM7d0JBQzlDLFNBQVMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDO29CQUMzQixDQUFDO2dCQUNILENBQUM7WUFDSCxDQUFDO1lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUM7UUFDaEIsQ0FBQztRQUVELCtDQUErQztRQUMvQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDZixJQUFJLENBQUM7Z0JBQ0gsTUFBTSxFQUFFLEdBQVEsSUFBQSwrQkFBcUIsRUFBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ2pELElBQUksRUFBRSxFQUFFLENBQUM7b0JBQ1AsMEJBQTBCO29CQUMxQixJQUFJLENBQUM7d0JBQ0gsTUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFFLENBQUMsZUFBZSxDQUFDOzZCQUNsQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLENBQUM7NkJBQy9CLEtBQUssRUFBRSxDQUFDO3dCQUNYLElBQUksR0FBRyxJQUFJLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQzs0QkFDbkIsU0FBUyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUM7d0JBQ3RCLENBQUM7b0JBQ0gsQ0FBQztvQkFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztvQkFFZCx3QkFBd0I7b0JBQ3hCLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQzt3QkFDZixJQUFJLENBQUM7NEJBQ0gsTUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFFLENBQUMsYUFBYSxDQUFDO2lDQUNoQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLENBQUM7aUNBQy9CLEtBQUssRUFBRSxDQUFDOzRCQUNYLElBQUksR0FBRyxJQUFJLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztnQ0FDbkIsU0FBUyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUM7NEJBQ3RCLENBQUM7d0JBQ0gsQ0FBQzt3QkFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztvQkFDaEIsQ0FBQztvQkFFRCwwRUFBMEU7b0JBQzFFLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQzt3QkFDZixJQUFJLENBQUM7NEJBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxFQUFFLENBQUMsaUJBQWlCLENBQUM7aUNBQ3ZDLEtBQUssQ0FBQztnQ0FDTCxJQUFJLENBQUMsS0FBSyxDQUFDLG9CQUFvQixFQUFFLE1BQU0sRUFBRSxPQUFPLFNBQVMsRUFBRSxDQUFDO3FDQUN6RCxPQUFPLENBQUMsb0JBQW9CLEVBQUUsTUFBTSxFQUFFLEtBQUssU0FBUyxFQUFFLENBQUM7cUNBQ3ZELE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsT0FBTyxTQUFTLEVBQUUsQ0FBQztxQ0FDckQsT0FBTyxDQUFDLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxLQUFLLFNBQVMsRUFBRSxDQUFDLENBQUM7NEJBQ3pELENBQUMsQ0FBQztpQ0FDRCxLQUFLLEVBQUUsQ0FBQzs0QkFFWCxJQUFJLE1BQU0sRUFBRSxDQUFDO2dDQUNYLElBQUksTUFBTSxDQUFDLGtCQUFrQixJQUFJLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztvQ0FDL0UsU0FBUyxHQUFHLE1BQU0sQ0FBQyxZQUFZLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDO2dDQUMvRCxDQUFDO3FDQUFNLElBQUksTUFBTSxDQUFDLGNBQWMsSUFBSSxNQUFNLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO29DQUM5RSxTQUFTLEdBQUcsTUFBTSxDQUFDLE9BQU8sSUFBSSxNQUFNLENBQUMsY0FBYyxDQUFDO2dDQUN0RCxDQUFDOzRCQUNILENBQUM7d0JBQ0gsQ0FBQzt3QkFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztvQkFDaEIsQ0FBQztvQkFFRCxzREFBc0Q7b0JBQ3RELElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQzt3QkFDZixJQUFJLENBQUM7NEJBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxFQUFFLENBQUMsZUFBZSxDQUFDO2lDQUNyQyxLQUFLLENBQUM7Z0NBQ0wsSUFBSSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsRUFBRSxNQUFNLEVBQUUsT0FBTyxTQUFTLEVBQUUsQ0FBQztxQ0FDekQsT0FBTyxDQUFDLG9CQUFvQixFQUFFLE1BQU0sRUFBRSxLQUFLLFNBQVMsRUFBRSxDQUFDLENBQUM7NEJBQzdELENBQUMsQ0FBQztpQ0FDRCxLQUFLLEVBQUUsQ0FBQzs0QkFFWCxJQUFJLE1BQU0sSUFBSSxNQUFNLENBQUMsWUFBWSxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQztnQ0FDOUUsU0FBUyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUM7NEJBQ2xDLENBQUM7d0JBQ0gsQ0FBQzt3QkFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztvQkFDaEIsQ0FBQztnQkFDSCxDQUFDO1lBQ0gsQ0FBQztZQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDO1FBQ2hCLENBQUM7UUFFRCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDZixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUVELHVDQUF1QztRQUN2QyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBc0IsRUFBRTtZQUNyRCxJQUFJLENBQUM7Z0JBQ0gsSUFBSSxPQUFPLEdBQUcsQ0FBQyxHQUFHLEtBQUssVUFBVSxFQUFFLENBQUM7b0JBQ2xDLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQzFCLElBQUksR0FBRzt3QkFBRSxPQUFPLEdBQUcsQ0FBQztnQkFDdEIsQ0FBQztZQUNILENBQUM7WUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQztZQUNkLElBQUksQ0FBQztnQkFDSCxJQUFJLEdBQUcsQ0FBQyxPQUFPLElBQUksT0FBTyxHQUFHLENBQUMsT0FBTyxLQUFLLFFBQVEsRUFBRSxDQUFDO29CQUNuRCxNQUFNLEdBQUcsR0FBSSxHQUFHLENBQUMsT0FBZSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO29CQUNyRCxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDO3dCQUFFLE9BQU8sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUN0QyxJQUFJLEdBQUcsSUFBSSxJQUFJO3dCQUFFLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUN0QyxDQUFDO1lBQ0gsQ0FBQztZQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDO1lBQ2QsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQyxDQUFDO1FBRUYsTUFBTSxJQUFJLEdBQ1IsU0FBUyxDQUFDLGtCQUFrQixDQUFDO1lBQzdCLFNBQVMsQ0FBQyxNQUFNLENBQUM7WUFDaEIsR0FBVyxDQUFDLFFBQVE7WUFDckIsZ0JBQWdCLENBQUM7UUFFbkIsTUFBTSxjQUFjLEdBQUcsU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDdEQsTUFBTSxRQUFRLEdBQ1osQ0FBQyxjQUFjLEtBQUssTUFBTSxJQUFJLGNBQWMsS0FBSyxPQUFPLENBQUM7WUFDdkQsQ0FBQyxDQUFDLGNBQWM7WUFDaEIsQ0FBQyxDQUFDLENBQUUsR0FBVyxDQUFDLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBRS9HLGlFQUFpRTtRQUNqRSxJQUFJLFNBQVMsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQztZQUN0QyxNQUFNLFVBQVUsR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsc0JBQXNCLEVBQUUsYUFBYSxDQUFDLENBQUM7WUFDcEgsU0FBUyxHQUFHLEdBQUcsUUFBUSxNQUFNLElBQUksR0FBRyxVQUFVLEVBQUUsQ0FBQztRQUNuRCxDQUFDO2FBQU0sSUFBSSxTQUFTLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDckMsU0FBUyxHQUFHLEdBQUcsUUFBUSxNQUFNLElBQUksR0FBRyxTQUFTLEVBQUUsQ0FBQztRQUNsRCxDQUFDO1FBRUQsMEJBQTBCO1FBQzFCLElBQUksT0FBUSxHQUFXLENBQUMsUUFBUSxLQUFLLFVBQVUsRUFBRSxDQUFDO1lBQ2hELE9BQVEsR0FBVyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUMxQyxDQUFDO1FBQ0QsR0FBRyxDQUFDLFNBQVMsQ0FBQyxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDckMsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFBQyxPQUFPLEdBQVEsRUFBRSxDQUFDO1FBQ2xCLElBQUksQ0FBQztZQUNILEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsSUFBSSxVQUFVLHdCQUF3QixTQUFTLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFDdkksQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQSxDQUFDO1FBQ2QsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO0lBQ3RELENBQUM7QUFDSCxDQUFDIn0=
|
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
---
|
|
9
9
|
|
|
10
|
+
## [1.1.14] - 2026-10-16
|
|
11
|
+
|
|
12
|
+
### Company Name Support, Shortlink 500 Fix, Duplicate Prefix Cleanup & Currency Improvements
|
|
13
|
+
|
|
14
|
+
- **Short Payment Link HTTP 500 Resolution**:
|
|
15
|
+
- Implemented universal `handleShortlinkRedirect` utility protecting against `TypeError: req.get is not a function` across Medusa v2 / Express / Fastify environments.
|
|
16
|
+
- Added safe extraction of `host` (`x-forwarded-host` -> `host` -> `req.hostname` -> `localhost:9000`) and `protocol` (`x-forwarded-proto` -> `req.protocol` -> `https`).
|
|
17
|
+
- Added multi-tier fallback lookup: checks `documents` module, `repair` module, `document_link` table, `repair_link` table, `document_record` table, and `repair_ticket` table.
|
|
18
|
+
- Safe redirect execution via `res.redirect` with fallback to `Location` header + HTTP 302.
|
|
19
|
+
- Updated all shortlink routes: `/r/:code`, `/documents/r/:code`, `/store/documents/r/:code`, and `/api/store/documents/r/:code`.
|
|
20
|
+
- **Customer Company Name Priority**:
|
|
21
|
+
- Prioritized customer `company_name` over personal name across document records, PDFKit generator, and Zoho Books contact synchronization.
|
|
22
|
+
- Updated Modern, Classic, and Minimal PDFKit templates to render `customerDisplayName = data.customer.company_name || data.customer.name` with `(Attn: ${name})` when personal contact name differs.
|
|
23
|
+
- Added `company_name` input fields to manual document and custom document modals in Admin UI.
|
|
24
|
+
- **Prevent Pushing Non-Zoho Documents to Zoho Books**:
|
|
25
|
+
- Disabled and hid the "Push Zoho" action button in Admin UI for non-Zoho document types (`job_card`, `packing_slip`, `custom`) and documents with zero or negative total amounts.
|
|
26
|
+
- Enforced strict validation in `POST /admin/documents/:id/sync-zoho`, rejecting non-Zoho document types and zero-amount documents with informative HTTP 400 messages.
|
|
27
|
+
- **Eliminate Duplicate `RT-` & `JOB-RT-` Reference Prefixes**:
|
|
28
|
+
- Normalized repair ticket number prefixes across `repair-documents` subscriber and document generator to prevent duplicate prefixes such as `RT-RT-...` and `JOB-RT-...`.
|
|
29
|
+
- Output clean formatted reference IDs like `RT-1792156525673-SNL9QH` and `JOB-1792156525673-SNL9QH`.
|
|
30
|
+
- **Live Zoho Books Invoices UI & Hover Tooltip Refresh Button**:
|
|
31
|
+
- Converted the "Refresh Live Zoho" / "View Live Zoho" button in the filter bar and the Live Zoho table header into dedicated `IconButton` components wrapped with interactive hover tooltips (`<Tooltip content="Refresh Live Zoho Books Invoices">`).
|
|
32
|
+
- Live Zoho Books invoices table is permanently visible and automatically synchronized on initial mount, tab switches, and on-demand refreshes.
|
|
33
|
+
- **Default Document Types to Invoices**:
|
|
34
|
+
- Filter bar, preview modal, and manual document creation form now default to `"invoice"` (Tax Invoice / Invoices).
|
|
35
|
+
- **Currency Formatting Defaulted to KES**:
|
|
36
|
+
- Set default currency to `KES` (Kenya Shillings / `KSh 1,500.00`) across all Admin UI tables, amount summaries, PDFKit templates, and notification dispatches when not explicitly overridden by store region settings.
|
|
37
|
+
|
|
38
|
+
---
|
|
39
|
+
|
|
40
|
+
## [1.1.13] - 2026-10-16
|
|
41
|
+
|
|
42
|
+
### Live Zoho Books Invoices View Enhancements
|
|
43
|
+
|
|
44
|
+
- Added persistent Live Zoho Books Invoices table to the Documents Hub.
|
|
45
|
+
- Automatically queries Zoho API upon mounting with localized empty states.
|
|
46
|
+
|
|
47
|
+
---
|
|
48
|
+
|
|
10
49
|
## [1.1.12] - 2026-10-16
|
|
11
50
|
|
|
12
51
|
### Admin UI Enhancements: Auto-fetch Live Zoho Documents & Invoices Default Filter
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "medusajs-documents-plugin",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.15",
|
|
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",
|