shad0w/pelagia-portal
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge branch 'master' into claude/issue-9

Browse source
This commit is contained in:
shad0w 2026-06-18 22:34:18 +00:00
commit 64634ccb5e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
App/app/api/po/[id]/export/route.ts
View file

@ -91,7 +91,9 @@ export async function GET(request: NextRequest, { params }: Props) {
const gstAmt = taxable * gstRate; const gstAmt = taxable * gstRate;
const li_ = li as typeof li & { name?: string }; const li_ = li as typeof li & { name?: string };
const desc = li_.name ?? li.description ?? ""; const desc = li_.name ?? li.description ?? "";
return { sn: i + 1, desc, unit: li.unit, qty, unitPrice, gstRate, taxable, gstAmt, total: taxable + gstAmt }; // When both name and description exist, include the optional description separately
const optionalDesc = li_.name && li.description ? li.description : "";
return { sn: i + 1, desc, optionalDesc, unit: li.unit, qty, unitPrice, gstRate, taxable, gstAmt, total: taxable + gstAmt };
}); });
const totalTaxable = items.reduce((s, i) => s + i.taxable, 0); const totalTaxable = items.reduce((s, i) => s + i.taxable, 0);
@ -349,15 +351,18 @@ export async function GET(request: NextRequest, { params }: Props) {
for (let idx = 0; idx < BODY_ROWS; idx++) { for (let idx = 0; idx < BODY_ROWS; idx++) {
const r = HDR_ROW + 1 + idx; const r = HDR_ROW + 1 + idx;
// Taller rows: long item names + potential description sub-line need room // Taller rows: long item names + potential description sub-line need room
const descLen = (items[idx]?.desc ?? "").length; const descLen = (items[idx]?.desc ?? "").length + (items[idx]?.optionalDesc ?? "").length;
ws.getRow(r).height = descLen > 40 ? 28 : 20; ws.getRow(r).height = descLen > 40 || items[idx]?.optionalDesc ? 32 : 20;
const item = items[idx]; const item = items[idx];
const fillAlt = idx % 2 === 1 const fillAlt = idx % 2 === 1
? { type: "pattern" as const, pattern: "solid" as const, fgColor: { argb: "FFFAFAFA" } } ? { type: "pattern" as const, pattern: "solid" as const, fgColor: { argb: "FFFAFAFA" } }
: undefined; : undefined;
sc(r, 1, item?.sn ?? null, { font: fBase, fill: fillAlt, border: bordAll, align: alignC }); sc(r, 1, item?.sn ?? null, { font: fBase, fill: fillAlt, border: bordAll, align: alignC });
sc(r, 2, item?.desc ?? "", { font: fBase, fill: fillAlt, border: bordAll, align: alignL }); const xlsxDesc = item
? (item.optionalDesc ? `${item.desc}\n${item.optionalDesc}` : item.desc)
: "";
sc(r, 2, xlsxDesc, { font: fBase, fill: fillAlt, border: bordAll, align: alignL });
ws.mergeCells(`B${r}:C${r}`); ws.mergeCells(`B${r}:C${r}`);
sc(r, 4, item?.unit ?? "", { font: fBase, fill: fillAlt, border: bordAll, align: alignC }); sc(r, 4, item?.unit ?? "", { font: fBase, fill: fillAlt, border: bordAll, align: alignC });
sc(r, 5, item ? item.qty : null, { font: fBase, fill: fillAlt, border: bordAll, align: alignR, numFmt: NUM_FMT }); sc(r, 5, item ? item.qty : null, { font: fBase, fill: fillAlt, border: bordAll, align: alignR, numFmt: NUM_FMT });
@ -467,7 +472,7 @@ export async function GET(request: NextRequest, { params }: Props) {
const itemRows = items.map((item, i) => ` const itemRows = items.map((item, i) => `
<tr style="background:${i % 2 === 0 ? "#fff" : "#fafafa"}"> <tr style="background:${i % 2 === 0 ? "#fff" : "#fafafa"}">
<td style="text-align:center">${item.sn}</td> <td style="text-align:center">${item.sn}</td>
<td>${item.desc}</td> <td>${item.desc}${item.optionalDesc ? `<br/><span style="font-size:7.5pt;color:#666;font-style:italic">${item.optionalDesc}</span>` : ""}</td>
<td style="text-align:center">${item.unit}</td> <td style="text-align:center">${item.unit}</td>
<td style="text-align:right">${fmtNum(item.qty, item.qty % 1 === 0 ? 0 : 3)}</td> <td style="text-align:right">${fmtNum(item.qty, item.qty % 1 === 0 ? 0 : 3)}</td>
<td style="text-align:right">${fmtNum(item.unitPrice)}</td> <td style="text-align:right">${fmtNum(item.unitPrice)}</td>