Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b197017644 | ||
|
|
e9f07a4a39 | ||
|
|
44d389201c | ||
|
|
3106aaf314 |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.4.9",
|
"version": "1.5.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.4.9",
|
"version": "1.5.1",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@dnd-kit/core": "^6.3.1",
|
"@dnd-kit/core": "^6.3.1",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.4.9",
|
"version": "1.5.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -194,7 +194,6 @@ export default function Invoices() {
|
|||||||
}>({ show: false, invoice: null });
|
}>({ show: false, invoice: null });
|
||||||
const [deleting, setDeleting] = useState(false);
|
const [deleting, setDeleting] = useState(false);
|
||||||
const [pdfLoading, setPdfLoading] = useState<number | null>(null);
|
const [pdfLoading, setPdfLoading] = useState<number | null>(null);
|
||||||
const [langModal, setLangModal] = useState<Invoice | null>(null);
|
|
||||||
const [draft, setDraft] = useState<DraftData | null>(() => {
|
const [draft, setDraft] = useState<DraftData | null>(() => {
|
||||||
try {
|
try {
|
||||||
const raw = localStorage.getItem(DRAFT_KEY);
|
const raw = localStorage.getItem(DRAFT_KEY);
|
||||||
@@ -284,29 +283,25 @@ export default function Invoices() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handlePdf = async (inv: Invoice, lang = "cs") => {
|
const handlePdf = async (inv: Invoice) => {
|
||||||
if (pdfLoading) return;
|
if (pdfLoading) return;
|
||||||
setLangModal(null);
|
const newWindow = window.open("", "_blank");
|
||||||
setPdfLoading(inv.id);
|
setPdfLoading(inv.id);
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch(
|
const response = await apiFetch(`${API_BASE}/invoices/${inv.id}/file`);
|
||||||
`${API_BASE}/invoices-pdf/${inv.id}?lang=${encodeURIComponent(lang)}`,
|
if (response.status === 401) {
|
||||||
);
|
newWindow?.close();
|
||||||
if (response.status === 401) return;
|
|
||||||
if (!response.ok) {
|
|
||||||
alert.error("Nepodařilo se vygenerovat PDF");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const html = await response.text();
|
if (!response.ok) {
|
||||||
const w = window.open("", "_blank");
|
newWindow?.close();
|
||||||
if (w) {
|
alert.error("PDF soubor nenalezen — otevřete fakturu a uložte ji");
|
||||||
w.document.open();
|
return;
|
||||||
w.document.write(html);
|
|
||||||
w.document.close();
|
|
||||||
w.onload = () => w.print();
|
|
||||||
} else {
|
|
||||||
alert.error("Prohlížeč zablokoval vyskakovací okno");
|
|
||||||
}
|
}
|
||||||
|
const blob = await response.blob();
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
if (newWindow) newWindow.location.href = url;
|
||||||
|
setTimeout(() => URL.revokeObjectURL(url), 60000);
|
||||||
} catch {
|
} catch {
|
||||||
alert.error("Chyba při generování PDF");
|
alert.error("Chyba při generování PDF");
|
||||||
} finally {
|
} finally {
|
||||||
@@ -996,26 +991,44 @@ export default function Invoices() {
|
|||||||
<Link
|
<Link
|
||||||
to={`/invoices/${inv.id}`}
|
to={`/invoices/${inv.id}`}
|
||||||
className="admin-btn-icon"
|
className="admin-btn-icon"
|
||||||
title="Detail"
|
title={
|
||||||
aria-label="Detail"
|
inv.status === "paid" ? "Detail" : "Upravit"
|
||||||
|
}
|
||||||
|
aria-label={
|
||||||
|
inv.status === "paid" ? "Detail" : "Upravit"
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<svg
|
{inv.status === "paid" ? (
|
||||||
width="18"
|
<svg
|
||||||
height="18"
|
width="18"
|
||||||
viewBox="0 0 24 24"
|
height="18"
|
||||||
fill="none"
|
viewBox="0 0 24 24"
|
||||||
stroke="currentColor"
|
fill="none"
|
||||||
strokeWidth="2"
|
stroke="currentColor"
|
||||||
>
|
strokeWidth="2"
|
||||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
>
|
||||||
<circle cx="12" cy="12" r="3" />
|
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||||
</svg>
|
<circle cx="12" cy="12" r="3" />
|
||||||
|
</svg>
|
||||||
|
) : (
|
||||||
|
<svg
|
||||||
|
width="18"
|
||||||
|
height="18"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth="2"
|
||||||
|
>
|
||||||
|
<path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
|
||||||
|
<path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
|
||||||
|
</svg>
|
||||||
|
)}
|
||||||
</Link>
|
</Link>
|
||||||
{hasPermission("invoices.export") && (
|
{hasPermission("invoices.export") && (
|
||||||
<button
|
<button
|
||||||
onClick={() => setLangModal(inv)}
|
onClick={() => handlePdf(inv)}
|
||||||
className="admin-btn-icon"
|
className="admin-btn-icon"
|
||||||
title="PDF"
|
title="Zobrazit fakturu"
|
||||||
disabled={pdfLoading === inv.id}
|
disabled={pdfLoading === inv.id}
|
||||||
>
|
>
|
||||||
{pdfLoading === inv.id ? (
|
{pdfLoading === inv.id ? (
|
||||||
@@ -1092,69 +1105,6 @@ export default function Invoices() {
|
|||||||
type="danger"
|
type="danger"
|
||||||
loading={deleting}
|
loading={deleting}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<AnimatePresence>
|
|
||||||
{langModal && (
|
|
||||||
<motion.div
|
|
||||||
className="admin-modal-overlay"
|
|
||||||
initial={{ opacity: 0 }}
|
|
||||||
animate={{ opacity: 1 }}
|
|
||||||
exit={{ opacity: 0 }}
|
|
||||||
transition={{ duration: 0.2 }}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="admin-modal-backdrop"
|
|
||||||
onClick={() => setLangModal(null)}
|
|
||||||
/>
|
|
||||||
<motion.div
|
|
||||||
className="admin-modal admin-confirm-modal"
|
|
||||||
role="dialog"
|
|
||||||
aria-modal="true"
|
|
||||||
initial={{ opacity: 0, scale: 0.95, y: 20 }}
|
|
||||||
animate={{ opacity: 1, scale: 1, y: 0 }}
|
|
||||||
exit={{ opacity: 0, scale: 0.95, y: 20 }}
|
|
||||||
transition={{ duration: 0.2 }}
|
|
||||||
>
|
|
||||||
<div className="admin-modal-body admin-confirm-content">
|
|
||||||
<div className="admin-confirm-icon admin-confirm-icon-info">
|
|
||||||
<svg
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2"
|
|
||||||
>
|
|
||||||
<path d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10z" />
|
|
||||||
<path d="M2 12h20" />
|
|
||||||
<path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z" />
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
<h2 className="admin-confirm-title">Jazyk faktury</h2>
|
|
||||||
<p className="admin-confirm-message">
|
|
||||||
V jakém jazyce chcete vygenerovat fakturu?
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div className="admin-modal-footer">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => handlePdf(langModal, "cs")}
|
|
||||||
className="admin-btn admin-btn-primary"
|
|
||||||
>
|
|
||||||
Čeština
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => handlePdf(langModal, "en")}
|
|
||||||
className="admin-btn admin-btn-primary"
|
|
||||||
>
|
|
||||||
English
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</motion.div>
|
|
||||||
</motion.div>
|
|
||||||
)}
|
|
||||||
</AnimatePresence>
|
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1008,6 +1008,7 @@ ${indentCSS}
|
|||||||
? new Date(invoice.issue_date)
|
? new Date(invoice.issue_date)
|
||||||
: new Date();
|
: new Date();
|
||||||
const saveMode = query.save === "1";
|
const saveMode = query.save === "1";
|
||||||
|
nasFinancialsManager.cleanIssuedInvoice(invoice.invoice_number!);
|
||||||
const pdfPromise = htmlToPdf(html)
|
const pdfPromise = htmlToPdf(html)
|
||||||
.then((pdfBuffer) => {
|
.then((pdfBuffer) => {
|
||||||
nasFinancialsManager.saveIssuedInvoicePdf(
|
nasFinancialsManager.saveIssuedInvoicePdf(
|
||||||
|
|||||||
@@ -70,6 +70,11 @@ export async function markOverdueInvoices() {
|
|||||||
where: { status: "issued", due_date: { lt: new Date() } },
|
where: { status: "issued", due_date: { lt: new Date() } },
|
||||||
data: { status: "overdue" },
|
data: { status: "overdue" },
|
||||||
});
|
});
|
||||||
|
// Reverse: if due_date was changed to future, set back to issued
|
||||||
|
await prisma.invoices.updateMany({
|
||||||
|
where: { status: "overdue", due_date: { gte: new Date() } },
|
||||||
|
data: { status: "issued" },
|
||||||
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("markOverdueInvoices failed:", err);
|
console.error("markOverdueInvoices failed:", err);
|
||||||
}
|
}
|
||||||
@@ -350,8 +355,8 @@ export async function updateInvoice(id: number, body: Record<string, any>) {
|
|||||||
|
|
||||||
const data: Record<string, unknown> = { modified_at: new Date() };
|
const data: Record<string, unknown> = { modified_at: new Date() };
|
||||||
|
|
||||||
// Only allow full editing in 'issued' state
|
// Allow full editing in 'issued' and 'overdue' states
|
||||||
const isDraft = currentStatus === "issued";
|
const isDraft = currentStatus === "issued" || currentStatus === "overdue";
|
||||||
if (isDraft) {
|
if (isDraft) {
|
||||||
const strFields = [
|
const strFields = [
|
||||||
"currency",
|
"currency",
|
||||||
|
|||||||
@@ -30,6 +30,34 @@ class NasFinancialsManager {
|
|||||||
|
|
||||||
// ── Created (issued) invoices ────────────────────────────────────
|
// ── Created (issued) invoices ────────────────────────────────────
|
||||||
|
|
||||||
|
/** Remove any existing PDF for this invoice number across all year/month folders */
|
||||||
|
cleanIssuedInvoice(invoiceNumber: string): void {
|
||||||
|
if (!this.basePath) return;
|
||||||
|
const safeName = this.sanitizeFilename(invoiceNumber) + ".pdf";
|
||||||
|
const issuedDir = path.join(this.basePath, DIR_ISSUED);
|
||||||
|
try {
|
||||||
|
if (!fs.existsSync(issuedDir)) return;
|
||||||
|
for (const yearDir of fs.readdirSync(issuedDir)) {
|
||||||
|
const yearPath = path.join(issuedDir, yearDir);
|
||||||
|
if (!fs.statSync(yearPath).isDirectory()) continue;
|
||||||
|
for (const monthDir of fs.readdirSync(yearPath)) {
|
||||||
|
const monthPath = path.join(yearPath, monthDir);
|
||||||
|
try {
|
||||||
|
if (!fs.statSync(monthPath).isDirectory()) continue;
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const filePath = path.join(monthPath, safeName);
|
||||||
|
if (fs.existsSync(filePath)) {
|
||||||
|
fs.unlinkSync(filePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// best effort
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
saveIssuedInvoicePdf(
|
saveIssuedInvoicePdf(
|
||||||
invoiceNumber: string,
|
invoiceNumber: string,
|
||||||
year: number,
|
year: number,
|
||||||
|
|||||||
Reference in New Issue
Block a user