Invoicing changes and corrections

Author: ZoliQua

backend/src/server.ts

@@ -97,7 +97,7 @@ const defaultSettings: JsonRecord = {
     email: 'info@mackodental.hu',
     website: 'www.mackodental.hu',
   },
-  doctors: [{ id: 'doc-1', name: 'Dr. Dul Zoltán', stampNumber: '' }],
+  doctors: [{ id: 'DOC0001', name: 'Dr. Dul Zoltán', stampNumber: '' }],
   pdf: {
     hu: {
       footerText: 'Az árajánlat tájékoztató jellegű és a fent jelölt ideig érvényes.',
@@ -387,6 +387,7 @@ async function nextInvoiceId(patientId: string): Promise<string> {
 
 async function nextDoctorId(): Promise<string> {
   const last = await prisma.doctor.findFirst({
+    where: { doctorId: { startsWith: 'DOC' } },
     orderBy: { doctorId: 'desc' },
     select: { doctorId: true },
   });
@@ -1818,8 +1819,11 @@ server.patch('/quotes/:quoteId/restore', async (request, reply) => {
 
 // Settings
 server.get('/settings', async () => {
-  const settings = await prisma.appSettings.findUnique({ where: { id: 'default' } });
-  const result = parseJsonObject(settings?.data, defaultSettings);
+  const [settingsRow, doctors] = await Promise.all([
+    prisma.appSettings.findUnique({ where: { id: 'default' } }),
+    prisma.doctor.findMany({ orderBy: { doctorId: 'asc' } }),
+  ]);
+  const result = parseJsonObject(settingsRow?.data, defaultSettings);
   // Migrate old flat pdf format { footerText, warrantyText } to per-language { hu: {...}, en: {...}, de: {...} }
   const pdf = result.pdf as Record<string, unknown> | undefined;
   if (pdf && (typeof pdf.footerText === 'string' || typeof pdf.warrantyText === 'string')) {
@@ -1835,6 +1839,10 @@ server.get('/settings', async () => {
   if (quote && !quote.quoteLang) {
     quote.quoteLang = 'hu';
   }
+  // Override doctors from Doctor table
+  if (doctors.length > 0) {
+    result.doctors = doctors.map((d) => ({ id: d.doctorId, name: d.doctorName, stampNumber: d.doctorNum }));
+  }
   return result;
 });
 
@@ -2525,10 +2533,10 @@ const toDateOnly = (value: string) => {
 
 const normalizePaymentMethod = (value: string) => {
   const normalized = String(value || '').toLowerCase();
-  if (normalized === 'atutalas') return 'Atutalas';
-  if (normalized === 'keszpenz') return 'Keszpenz';
-  if (normalized === 'bankkartya') return 'Bankkartya';
-  return value || 'Atutalas';
+  if (normalized === 'atutalas' || normalized === 'átutalás') return 'Átutalás';
+  if (normalized === 'keszpenz' || normalized === 'készpénz') return 'Készpénz';
+  if (normalized === 'bankkartya' || normalized === 'bankkártya') return 'Bankkártya';
+  return value || 'Bankkártya';
 };
 
 const validateAndNormalizePayload = (input: JsonRecord) => {
@@ -2550,24 +2558,26 @@ const validateAndNormalizePayload = (input: JsonRecord) => {
   const normalizedItems = items.map((item, index) => {
     const qty = Number(item.qty);
     const unitPriceNet = Number(item.unitPriceNet ?? item.unitPrice ?? 0);
-    const vatRate = Number(item.vatRate ?? 27);
+    const isTAM = item.vatRate === 'TAM';
+    const vatRateNum = isTAM ? 0 : Number(item.vatRate ?? 27);
+    const vatRateLabel: number | string = isTAM ? 'TAM' : vatRateNum;
 
     if (!Number.isFinite(qty) || qty <= 0) errors.push(`Tétel ${index + 1}: qty > 0 kötelező`);
     if (!Number.isFinite(unitPriceNet) || (!isVegszamla && unitPriceNet < 0))
       errors.push(`Tétel ${index + 1}: unitPriceNet >= 0 kötelező`);
-    if (!Number.isFinite(vatRate) || vatRate < 0)
+    if (!isTAM && (!Number.isFinite(vatRateNum) || vatRateNum < 0))
       errors.push(`Tétel ${index + 1}: vatRate >= 0 kötelező`);
 
     const net = round(qty * unitPriceNet);
-    const vat = round((net * vatRate) / 100);
+    const vat = round((net * vatRateNum) / 100);
     const gross = round(net + vat);
 
     return {
       name: item.name || `Tétel ${index + 1}`,
       unit: item.unit || 'db',
       qty,
       unitPriceNet,
-      vatRate,
+      vatRate: vatRateLabel,
       net,
       vat,
       gross,
@@ -2591,7 +2601,7 @@ const validateAndNormalizePayload = (input: JsonRecord) => {
       seller,
       buyer,
       invoice: {
-        paymentMethod: normalizePaymentMethod(String(invoice.paymentMethod || 'atutalas')),
+        paymentMethod: normalizePaymentMethod(String(invoice.paymentMethod || 'bankkártya')),
         fulfillmentDate: toDateOnly(String(invoice.fulfillmentDate || '')),
         dueDate: toDateOnly(String(invoice.dueDate || '')),
         issueDate: toDateOnly(String(invoice.issueDate || '')),
@@ -2620,7 +2630,7 @@ const buildInvoiceXml = (params: {
     unit: unknown;
     qty: number;
     unitPriceNet: number;
-    vatRate: number;
+    vatRate: number | string;
     net: number;
     vat: number;
     gross: number;

src/context/SettingsContext.tsx

@@ -14,6 +14,7 @@ import {
 interface SettingsContextType {
   settings: Settings;
   updateSettings: (settings: Settings) => void;
+  refreshSettings: () => void;
   appLanguage: OdontogramLanguage;
   setAppLanguage: (language: OdontogramLanguage) => void;
   odontogramNumbering: OdontogramNumberingSystem;
@@ -41,6 +42,10 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
     setSettings(syncedSettings);
   }, [appLanguage]);
 
+  const refreshSettings = useCallback(() => {
+    setSettings(storage.getSettings());
+  }, []);
+
   const setAppLanguage = useCallback((language: OdontogramLanguage) => {
     persistOdontogramLanguage(language);
     localStorage.setItem('dqc_app_language', language);
@@ -83,6 +88,7 @@ export function SettingsProvider({ children }: { children: React.ReactNode }) {
       value={{
         settings,
         updateSettings,
+        refreshSettings,
         appLanguage,
         setAppLanguage,
         odontogramNumbering,

src/data/defaultSettings.ts

@@ -9,7 +9,7 @@ export const defaultSettings: Settings = {
     website: 'www.mackodental.hu',
   },
   doctors: [
-    { id: 'doc-1', name: 'Dr. Dul Zoltán', stampNumber: '' },
+    { id: 'DOC0001', name: 'Dr. Dul Zoltán', stampNumber: '' },
   ],
   pdf: {
     hu: {
@@ -145,7 +145,8 @@ Bitte lesen Sie sorgfältig und kontaktieren Sie uns bei Fragen, dann bestätige
   invoice: {
     invoiceType: 'paper',
     defaultComment: '',
-    defaultVatRate: 0,
+    defaultVatRate: 'TAM',
+    defaultPaymentMethod: 'bankkártya',
   },
   patient: {
     defaultCountry: 'Magyarország',

src/hooks/useQuotes.ts

@@ -243,7 +243,7 @@ export function useQuotes() {
       };
       const updated: Quote = {
         ...existing,
-        events: [...existing.events, fullEvent],
+        events: [...(existing.events || []), fullEvent],
       };
       updateQuote(updated);
       return updated;
@@ -264,7 +264,7 @@ export function useQuotes() {
         ...existing,
         quoteStatus: newStatus,
         lastStatusChangeAt: now,
-        events: [...existing.events, createEvent(eventType, doctorName)],
+        events: [...(existing.events || []), createEvent(eventType, doctorName)],
       };
       updateQuote(updated);
       return updated;

src/i18n/de.ts

@@ -129,7 +129,7 @@ export const de: TranslationKeys = {
     modifiedAt: 'Geändert',
     quoteType: 'Typ',
     validUntil: 'Gültig bis',
-    quoteValidity: 'Angebotsgültigkeit',
+    quoteValidity: 'Gültig bis',
     quoteValidityDescription: 'Das Angebot ist bis zum folgenden Datum gültig:',
     quoteValidityAdjust: 'Anpassen:',
     quoteValidityDays: 'Tage',
@@ -141,7 +141,7 @@ export const de: TranslationKeys = {
     statusStarted: 'Begonnen',
     statusCompleted: 'Abgeschlossen',
     statusDeleted: 'Gelöscht',
-    acceptanceCardTitle: 'Kostenvoranschlag Status',
+    acceptanceCardTitle: 'Status',
     acceptanceDraft: 'Der Kostenvoranschlag wird bearbeitet.',
     acceptanceClosed: 'Der Kostenvoranschlag wurde geschlossen.',
     acceptanceStarted: 'Der Kostenvoranschlag wurde angenommen.',
@@ -170,7 +170,8 @@ export const de: TranslationKeys = {
     unitPrice: 'Einzelpreis',
     lineDiscount: 'Rabatt',
     lineTotal: 'Gesamt',
-    subtotal: 'Zwischensumme',
+    subtotal: 'Gesamtsumme des Kostenvoranschlags',
+    treatmentNTotal: 'Behandlung {n}',
     globalDiscount: 'Globaler Rabatt',
     total: 'Zu zahlen',
     discountPercent: '%',
@@ -381,6 +382,7 @@ export const de: TranslationKeys = {
     invoiceComment: 'Rechnungskommentar',
     invoiceCommentHelp: 'Standardkommentar, der auf der Rechnung erscheint',
     defaultVatRate: 'Standard-MwSt.-Satz',
+    defaultPaymentMethod: 'Standard-Zahlungsmethode',
     quotesPerPageLabel: 'Kostenvoranschläge pro Seite',
     patientsPerPageLabel: 'Patienten pro Seite',
   },
@@ -479,6 +481,7 @@ export const de: TranslationKeys = {
       mockLoadDescription: 'Die Testdaten überschreiben die aktuellen Daten.',
       mockLoadButton: 'Test laden',
       mockLoadSuccess: 'Testdaten erfolgreich geladen!',
+      mockLoadConfirm: 'Möchten Sie wirklich Testdaten laden? Alle aktuellen Daten werden gelöscht und überschrieben!',
       clearAllTitle: 'Alle Daten löschen',
       clearAllDescription: 'Alle Daten aus der Datenbank löschen und auf null zurücksetzen.',
       clearAllButton: 'Alle Daten löschen',
@@ -560,19 +563,27 @@ export const de: TranslationKeys = {
     invoiceTypeNormal: 'Rechnung',
     invoiceTypeAdvance: 'Vorschussrechnung',
     invoiceTypeFinal: 'Schlussrechnung',
+    invoiceTypeStorno: 'Stornorechnung',
     advanceItemName: 'Zahnarztkosten-Vorschuss',
     advanceAmount: 'Vorschussbetrag',
     summarySection: 'Zusammenfassung',
     totalAmount: 'Gesamt',
     quoteRemainingPart: 'Verbleibender Angebotsbetrag',
     noneRemaining: 'keine',
-    eventInvoicePartial: 'Rechnung erstellt ({number}) für {amount}. Restbetrag: {remaining}.',
-    eventInvoiceFull: 'Rechnung erstellt ({number}) für {amount}. Der gesamte Betrag wurde in Rechnung gestellt.',
-    eventAdvanceCreated: 'Vorschussrechnung erstellt ({number}) für {amount}. Restbetrag: {remaining}.',
-    eventFinalCreated: 'Schlussrechnung erstellt ({number}) für {amount}. Der gesamte Betrag wurde in Rechnung gestellt.',
+    eventInvoicePartial: 'Rechnung erstellt: {number}, Betrag: {amount}, Restbetrag: {remaining}.',
+    eventInvoiceFull: 'Rechnung erstellt: {number}, Betrag: {amount}. Der gesamte Betrag wurde abgerechnet.',
+    eventAdvanceCreated: 'Vorschussrechnung erstellt: {number}, Betrag: {amount}, Restbetrag: {remaining}.',
+    eventFinalCreated: 'Schlussrechnung erstellt: {number}, Betrag: {amount}.',
+    eventStornoCreated: 'Stornorechnung erstellt: {stornoNumber}, stornierte Rechnung: {originalNumber}, Betrag: -{amount}.',
     invoicedItem: 'Abgerechnete Position mit Rechnung {invoiceNumber}',
     completedAndFullyInvoiced: 'Das Angebot wurde abgeschlossen und vollständig abgerechnet.',
     maxInvoicesReached: 'Der Patient hat die maximale Anzahl von 999 Rechnungen erreicht. Wenden Sie sich an den Administrator!',
+    billingDetails: 'Rechnungsdaten',
+    billingName: 'Rechnungsname',
+    billingAddress: 'Rechnungsadresse',
+    relatedQuote: 'Zugehöriges Angebot',
+    vatContent: 'MwSt.-Inhalt',
+    noQuote: 'keine',
   },
   pdf: {
     quote: 'ANGEBOT',

src/i18n/en.ts

@@ -136,7 +136,7 @@ export const en: TranslationKeys = {
     modifiedAt: 'Modified',
     quoteType: 'Type',
     validUntil: 'Valid Until',
-    quoteValidity: 'Quote Validity',
+    quoteValidity: 'Valid until',
     quoteValidityDescription: 'The quote is valid until the following date:',
     quoteValidityAdjust: 'Adjust:',
     quoteValidityDays: 'days',
@@ -149,7 +149,7 @@ export const en: TranslationKeys = {
     statusStarted: 'Started',
     statusCompleted: 'Completed',
     statusDeleted: 'Deleted',
-    acceptanceCardTitle: 'Quote Status',
+    acceptanceCardTitle: 'Status',
     acceptanceDraft: 'The quote is being edited.',
     acceptanceClosed: 'The quote has been closed.',
     acceptanceStarted: 'The quote has been accepted.',
@@ -181,7 +181,8 @@ export const en: TranslationKeys = {
     unitPrice: 'Unit Price',
     lineDiscount: 'Discount',
     lineTotal: 'Total',
-    subtotal: 'Subtotal',
+    subtotal: 'Quote Full Total',
+    treatmentNTotal: 'Treatment {n}',
     globalDiscount: 'Global Discount',
     total: 'Total Due',
     discountPercent: '%',
@@ -400,6 +401,7 @@ export const en: TranslationKeys = {
     invoiceComment: 'Invoice Comment',
     invoiceCommentHelp: 'Default comment that appears on the invoice',
     defaultVatRate: 'Default VAT Rate',
+    defaultPaymentMethod: 'Default Payment Method',
     quotesPerPageLabel: 'Quotes per page',
     patientsPerPageLabel: 'Patients per page',
   },
@@ -501,6 +503,7 @@ export const en: TranslationKeys = {
       mockLoadDescription: 'Sample data will overwrite the current data.',
       mockLoadButton: 'Load Sample',
       mockLoadSuccess: 'Sample data loaded successfully!',
+      mockLoadConfirm: 'Are you sure you want to load sample data? This will delete and overwrite all current data!',
       clearAllTitle: 'Delete All Data',
       clearAllDescription: 'Delete all data from the database and reset to zero.',
       clearAllButton: 'Delete All Data',
@@ -584,19 +587,27 @@ export const en: TranslationKeys = {
     invoiceTypeNormal: 'Invoice',
     invoiceTypeAdvance: 'Advance invoice',
     invoiceTypeFinal: 'Final invoice',
+    invoiceTypeStorno: 'Storno invoice',
     advanceItemName: 'Dental cost advance',
     advanceAmount: 'Advance amount',
     summarySection: 'Summary',
     totalAmount: 'Total',
     quoteRemainingPart: 'Quote remaining part',
     noneRemaining: 'none',
-    eventInvoicePartial: 'Invoice issued ({number}) for {amount}. Remaining amount: {remaining}.',
-    eventInvoiceFull: 'Invoice issued ({number}) for {amount}. The full amount has been invoiced.',
-    eventAdvanceCreated: 'Advance invoice issued ({number}) for {amount}. Remaining amount: {remaining}.',
-    eventFinalCreated: 'Final invoice issued ({number}) for {amount}. The full amount has been invoiced.',
+    eventInvoicePartial: 'Invoice issued: {number}, Amount: {amount}, Remaining: {remaining}.',
+    eventInvoiceFull: 'Invoice issued: {number}, Amount: {amount}. The full amount has been invoiced.',
+    eventAdvanceCreated: 'Advance invoice issued: {number}, Amount: {amount}, Remaining: {remaining}.',
+    eventFinalCreated: 'Final invoice issued: {number}, Amount: {amount}.',
+    eventStornoCreated: 'Storno invoice issued: {stornoNumber}, cancelled invoice: {originalNumber}, Amount: -{amount}.',
     invoicedItem: 'Invoiced item with invoice {invoiceNumber}',
     completedAndFullyInvoiced: 'The quote has been completed and fully invoiced.',
     maxInvoicesReached: 'Patient has reached the maximum of 999 invoices. Contact the administrator for help!',
+    billingDetails: 'Billing details',
+    billingName: 'Billing name',
+    billingAddress: 'Billing address',
+    relatedQuote: 'Related quote',
+    vatContent: 'VAT content',
+    noQuote: 'none',
   },
 
   // PDF