@spaceinvoices/react-ui 0.4.3 → 0.4.5

package/src/components/credit-notes/list/list-table.tsx

@@ -1,4 +1,5 @@
 import type { CreditNote } from "@spaceinvoices/js-sdk";
+import { AlertTriangle } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
 import { DataTable } from "@/ui/components/table/data-table";
 import { FormattedDate } from "@/ui/components/table/date-cell";
@@ -13,6 +14,8 @@ import type {
 } from "@/ui/components/table/types";
 import { Badge } from "@/ui/components/ui/badge";
 import { Button } from "@/ui/components/ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/ui/components/ui/tooltip";
+import { getFiscalizationFailureType } from "@/ui/lib/fiscalization";
 import { createTranslation } from "@/ui/lib/translation";
 import { useSDK } from "@/ui/providers/sdk-provider";
 
@@ -53,6 +56,11 @@ type CreditNoteListTableProps = {
   onDownloadSuccess?: (fileName: string) => void;
   onDownloadError?: (error: string) => void;
   onExportSelected?: (documentIds: string[]) => void;
+  onRetryFiscalization?: (documentIds: string[]) => void;
+  fiscalizationFeatures?: ("furs" | "fina")[];
+  onCreateNew?: () => void;
+  onVoid?: (creditNote: CreditNote) => void;
+  isVoiding?: boolean;
 } & ListTableProps<CreditNote>;
 
 export default function CreditNoteListTable({
@@ -67,6 +75,11 @@ export default function CreditNoteListTable({
   onDownloadSuccess,
   onDownloadError,
   onExportSelected,
+  onRetryFiscalization,
+  fiscalizationFeatures,
+  onCreateNew,
+  onVoid,
+  isVoiding,
   ...i18nProps
 }: CreditNoteListTableProps) {
   const t = createTranslation({
@@ -86,9 +99,9 @@ export default function CreditNoteListTable({
       limit: params.limit,
       next_cursor: params.next_cursor,
       prev_cursor: params.prev_cursor,
-      order_by: params.order_by,
       search: params.search,
       query: params.query,
+      include: "document_relations",
     });
     return response as unknown as TableQueryResponse<CreditNote>;
   }, entityId);
@@ -115,15 +128,42 @@ export default function CreditNoteListTable({
   }, []);
 
   const selectionToolbar = useCallback(
-    (count: number) => (
-      <SelectionToolbar
-        selectedCount={count}
-        onExportPdfs={onExportSelected ? handleExportPdfs : undefined}
-        onDeselectAll={handleDeselectAll}
-        t={t}
-      />
-    ),
-    [handleExportPdfs, handleDeselectAll, onExportSelected, t],
+    (count: number, data: CreditNote[]) => {
+      const selectedDocs = data.filter((d) => selectedIds.has(d.id));
+      const failedDocs = selectedDocs.filter((d) => {
+        const failureType = getFiscalizationFailureType(d as any);
+        return failureType && fiscalizationFeatures?.includes(failureType);
+      });
+
+      const hasRetry = onRetryFiscalization && fiscalizationFeatures?.length;
+      const failedCount = failedDocs.length;
+      const allFailed = failedCount > 0 && failedCount === selectedDocs.length;
+      const someFailed = failedCount > 0 && failedCount < selectedDocs.length;
+      const showRetry = hasRetry && failedCount > 0;
+
+      return (
+        <SelectionToolbar
+          selectedCount={count}
+          onExportPdfs={onExportSelected ? handleExportPdfs : undefined}
+          onRetryFiscalization={showRetry ? () => onRetryFiscalization(failedDocs.map((d) => d.id)) : undefined}
+          retryFiscalizationDisabled={someFailed && !allFailed}
+          retryFiscalizationTooltip={
+            someFailed ? t("Some selected documents don't have failed fiscalization") : undefined
+          }
+          onDeselectAll={handleDeselectAll}
+          t={t}
+        />
+      );
+    },
+    [
+      handleExportPdfs,
+      handleDeselectAll,
+      onExportSelected,
+      onRetryFiscalization,
+      fiscalizationFeatures,
+      selectedIds,
+      t,
+    ],
   );
 
   const columns: Column<CreditNote>[] = useMemo(
@@ -131,22 +171,35 @@ export default function CreditNoteListTable({
       {
         id: "number",
         header: t("Number"),
-        sortable: true,
-        cell: (creditNote) => (
-          <div className="flex items-center gap-2">
-            <Button variant="link" className="cursor-pointer py-0 underline" onClick={() => onRowClick?.(creditNote)}>
-              {creditNote.number}
-            </Button>
-            {(creditNote as any).is_draft && (
-              <Badge
-                variant="outline"
-                className="border-amber-500 bg-amber-50 text-amber-700 dark:bg-amber-950 dark:text-amber-400"
-              >
-                {t("Draft")}
-              </Badge>
-            )}
-          </div>
-        ),
+        cell: (creditNote) => {
+          const failureType = getFiscalizationFailureType(creditNote as any);
+          const showWarning = failureType && fiscalizationFeatures?.includes(failureType);
+          return (
+            <div className="flex items-center gap-2">
+              <Button variant="link" className="cursor-pointer py-0 underline" onClick={() => onRowClick?.(creditNote)}>
+                {creditNote.number}
+              </Button>
+              {(creditNote as any).is_draft && (
+                <Badge
+                  variant="outline"
+                  className="border-amber-500 bg-amber-50 text-amber-700 dark:bg-amber-950 dark:text-amber-400"
+                >
+                  {t("Draft")}
+                </Badge>
+              )}
+              {showWarning && (
+                <Tooltip>
+                  <TooltipTrigger>
+                    <AlertTriangle className="size-4 text-orange-500" />
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    {t(failureType === "furs" ? "FURS fiscalization failed" : "FINA fiscalization failed")}
+                  </TooltipContent>
+                </Tooltip>
+              )}
+            </div>
+          );
+        },
       },
       {
         id: "customer",
@@ -156,22 +209,19 @@ export default function CreditNoteListTable({
       {
         id: "date",
         header: t("Date"),
-        sortable: true,
         cell: (creditNote) => <FormattedDate date={creditNote.date} />,
       },
       {
         id: "total",
         header: t("Total"),
-        sortable: true,
         align: "right",
-        cell: (creditNote) => creditNote.total,
+        cell: (creditNote) => -creditNote.total,
       },
       {
         id: "total_with_tax",
         header: t("Total with Tax"),
-        sortable: true,
         align: "right",
-        cell: (creditNote) => creditNote.total_with_tax,
+        cell: (creditNote) => -creditNote.total_with_tax,
       },
       {
         id: "status",
@@ -191,6 +241,8 @@ export default function CreditNoteListTable({
             onDownloadStart={onDownloadStart}
             onDownloadSuccess={onDownloadSuccess}
             onDownloadError={onDownloadError}
+            onVoid={onVoid}
+            isVoiding={isVoiding}
             t={t}
             locale={i18nProps.locale}
           />
@@ -206,7 +258,10 @@ export default function CreditNoteListTable({
       onDownloadStart,
       onDownloadSuccess,
       onDownloadError,
+      onVoid,
+      isVoiding,
       i18nProps.locale,
+      fiscalizationFeatures,
     ],
   );
 
@@ -217,13 +272,14 @@ export default function CreditNoteListTable({
       resourceName="credit_note"
       cacheKey="credit-notes"
       createNewLink={entityId ? `/app/${entityId}/documents/add/credit_note` : undefined}
+      onCreateNew={onCreateNew}
       onFetch={handleFetch}
       onChangeParams={onChangeParams}
       entityId={entityId}
       filterConfig={filterConfig}
       t={t}
       locale={i18nProps.locale}
-      selectable={!!onExportSelected}
+      selectable={!!(onExportSelected || onRetryFiscalization)}
       selectedIds={selectedIds}
       onSelectionChange={setSelectedIds}
       selectionToolbar={selectionToolbar}
@@ -243,6 +299,11 @@ function CreditNoteStatusBadge({ creditNote, t }: { creditNote: CreditNote; t: (
   if ((creditNote as any).is_draft) {
     return null;
   }
+  // Hide payment badges for void-created credit notes (has "credit_for" relation)
+  const isVoidCreated = (creditNote as any).document_relations?.some((rel: any) => rel.relation_type === "credit_for");
+  if (isVoidCreated) {
+    return null;
+  }
   if (creditNote.paid_in_full) {
     return (
       <Badge

package/src/components/credit-notes/list/locales/de.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Keine Gutschriften gefunden",
   "Try adjusting your search criteria": "Versuchen Sie, Ihre Suchkriterien anzupassen",
   "Clear search": "Suche zurücksetzen",
+  "Clear all": "Alles zurücksetzen",
   selected: "ausgewählt",
   "Export PDFs": "PDFs exportieren",
   "Deselect all": "Auswahl aufheben",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Stornieren",
+  "Cannot void a fiscalized credit note": "Stornierung einer fiskalisierten Gutschrift nicht möglich",
 } as const;

package/src/components/credit-notes/list/locales/en.ts

@@ -10,4 +10,10 @@ export default {
   "Deselect all": "Deselect all",
   "Partially Paid": "Partially Paid",
   Voided: "Voided",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Void",
+  "Cannot void a fiscalized credit note": "Cannot void a fiscalized credit note",
 } as const;

package/src/components/credit-notes/list/locales/es.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "No se encontraron notas de credito",
   "Try adjusting your search criteria": "Intente ajustar sus criterios de busqueda",
   "Clear search": "Limpiar busqueda",
+  "Clear all": "Borrar todo",
   selected: "seleccionados",
   "Export PDFs": "Exportar PDFs",
   "Deselect all": "Deseleccionar todo",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Anular",
+  "Cannot void a fiscalized credit note": "No se puede anular una nota de crédito fiscalizada",
 } as const;

package/src/components/credit-notes/list/locales/fr.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Aucun avoir trouve",
   "Try adjusting your search criteria": "Essayez de modifier vos criteres de recherche",
   "Clear search": "Effacer la recherche",
+  "Clear all": "Tout effacer",
   selected: "sélectionnés",
   "Export PDFs": "Exporter les PDF",
   "Deselect all": "Tout désélectionner",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Annuler",
+  "Cannot void a fiscalized credit note": "Impossible d'annuler un avoir fiscalisé",
 } as const;

package/src/components/credit-notes/list/locales/hr.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Nije pronadjeno nijedno odobrenje",
   "Try adjusting your search criteria": "Pokusajte prilagoditi kriterije pretrazivanja",
   "Clear search": "Ocisti pretragu",
+  "Clear all": "Očisti sve",
   selected: "odabranih",
   "Export PDFs": "Izvezi PDF-ove",
   "Deselect all": "Poništi odabir",
+  "FURS fiscalization failed": "FURS fiskalizacija nije uspjela",
+  "FINA fiscalization failed": "FINA fiskalizacija nije uspjela",
+  "Retry Fiscalization": "Ponovi fiskalizaciju",
+  "Some selected documents don't have failed fiscalization": "Neki odabrani dokumenti nemaju neuspjelu fiskalizaciju",
+  Void: "Storniraj",
+  "Cannot void a fiscalized credit note": "Nije moguće poništiti fiskalizirani dobropis",
 } as const;

package/src/components/credit-notes/list/locales/it.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Nessuna nota di credito trovata",
   "Try adjusting your search criteria": "Prova a modificare i criteri di ricerca",
   "Clear search": "Cancella ricerca",
+  "Clear all": "Cancella tutto",
   selected: "selezionati",
   "Export PDFs": "Esporta PDF",
   "Deselect all": "Deseleziona tutto",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Annulla",
+  "Cannot void a fiscalized credit note": "Impossibile annullare una nota di credito fiscalizzata",
 } as const;

package/src/components/credit-notes/list/locales/nl.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Geen creditnota's gevonden",
   "Try adjusting your search criteria": "Probeer uw zoekcriteria aan te passen",
   "Clear search": "Zoekopdracht wissen",
+  "Clear all": "Alles wissen",
   selected: "geselecteerd",
   "Export PDFs": "PDFs exporteren",
   "Deselect all": "Alles deselecteren",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Nietig verklaren",
+  "Cannot void a fiscalized credit note": "Kan een gefiscaliseerde creditnota niet ongeldig maken",
 } as const;

package/src/components/credit-notes/list/locales/pl.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Nie znaleziono not kredytowych",
   "Try adjusting your search criteria": "Sprobuj dostosowac kryteria wyszukiwania",
   "Clear search": "Wyczysc wyszukiwanie",
+  "Clear all": "Wyczyść wszystko",
   selected: "wybranych",
   "Export PDFs": "Eksportuj PDF-y",
   "Deselect all": "Odznacz wszystko",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Anuluj",
+  "Cannot void a fiscalized credit note": "Nie można anulować zafiskalizowanej noty kredytowej",
 } as const;

package/src/components/credit-notes/list/locales/pt.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Nenhuma nota de credito encontrada",
   "Try adjusting your search criteria": "Tente ajustar os seus criterios de pesquisa",
   "Clear search": "Limpar pesquisa",
+  "Clear all": "Limpar tudo",
   selected: "selecionados",
   "Export PDFs": "Exportar PDFs",
   "Deselect all": "Desselecionar tudo",
+  "FURS fiscalization failed": "FURS fiscalization failed",
+  "FINA fiscalization failed": "FINA fiscalization failed",
+  "Retry Fiscalization": "Retry Fiscalization",
+  "Some selected documents don't have failed fiscalization": "Some selected documents don't have failed fiscalization",
+  Void: "Anular",
+  "Cannot void a fiscalized credit note": "Não é possível anular uma nota de crédito fiscalizada",
 } as const;

package/src/components/credit-notes/list/locales/sl.ts

@@ -38,7 +38,14 @@ export default {
   "No results found": "Ni najdenih dobropisov",
   "Try adjusting your search criteria": "Poskusite prilagoditi iskalne kriterije",
   "Clear search": "Počisti iskanje",
+  "Clear all": "Počisti vse",
   selected: "izbranih",
   "Export PDFs": "Izvozi PDF-je",
   "Deselect all": "Počisti izbiro",
+  "FURS fiscalization failed": "FURS davčno potrjevanje ni uspelo",
+  "FINA fiscalization failed": "FINA fiskalizacija ni uspela",
+  "Retry Fiscalization": "Ponovi fiskalizacijo",
+  "Some selected documents don't have failed fiscalization": "Nekateri izbrani dokumenti nimajo neuspele fiskalizacije",
+  Void: "Storniraj",
+  "Cannot void a fiscalized credit note": "Ni mogoče razveljaviti fiskalizirane dobropisa",
 } as const;

package/src/components/customers/customer-list-table/customer-list-table.tsx

@@ -69,7 +69,6 @@ export default function CustomerListTable({
       limit: params.limit,
       next_cursor: params.next_cursor,
       prev_cursor: params.prev_cursor,
-      order_by: params.order_by,
       search: params.search,
       query: params.query,
     });
@@ -81,7 +80,6 @@ export default function CustomerListTable({
       {
         id: "name",
         header: t("Name"),
-        sortable: true,
         cell: (customer) => (
           <Button variant="link" className="cursor-pointer py-0 underline" onClick={() => onRowClick?.(customer)}>
             <User className="h-4 w-4 flex-shrink-0" />
@@ -92,7 +90,6 @@ export default function CustomerListTable({
       {
         id: "address",
         header: t("Address"),
-        sortable: true,
         cell: (customer) => customer.address,
       },
       {

package/src/components/customers/customer-list-table/locales/de.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Keine Kunden gefunden",
   "Try adjusting your search criteria": "Versuchen Sie, Ihre Suchkriterien anzupassen",
   "Clear search": "Suche zurücksetzen",
+  "Clear all": "Alles zurücksetzen",
 } as const;

package/src/components/customers/customer-list-table/locales/es.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "No se encontraron clientes",
   "Try adjusting your search criteria": "Intente ajustar sus criterios de busqueda",
   "Clear search": "Limpiar busqueda",
+  "Clear all": "Borrar todo",
 } as const;

package/src/components/customers/customer-list-table/locales/fr.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Aucun client trouve",
   "Try adjusting your search criteria": "Essayez de modifier vos criteres de recherche",
   "Clear search": "Effacer la recherche",
+  "Clear all": "Tout effacer",
 } as const;

package/src/components/customers/customer-list-table/locales/hr.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Nije pronadjen nijedan kupac",
   "Try adjusting your search criteria": "Pokusajte prilagoditi kriterije pretrazivanja",
   "Clear search": "Ocisti pretragu",
+  "Clear all": "Očisti sve",
 } as const;

package/src/components/customers/customer-list-table/locales/it.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Nessun cliente trovato",
   "Try adjusting your search criteria": "Prova a modificare i criteri di ricerca",
   "Clear search": "Cancella ricerca",
+  "Clear all": "Cancella tutto",
 } as const;

package/src/components/customers/customer-list-table/locales/nl.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Geen klanten gevonden",
   "Try adjusting your search criteria": "Probeer uw zoekcriteria aan te passen",
   "Clear search": "Zoekopdracht wissen",
+  "Clear all": "Alles wissen",
 } as const;

package/src/components/customers/customer-list-table/locales/pl.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Nie znaleziono klientow",
   "Try adjusting your search criteria": "Sprobuj dostosowac kryteria wyszukiwania",
   "Clear search": "Wyczysc wyszukiwanie",
+  "Clear all": "Wyczyść wszystko",
 } as const;

package/src/components/customers/customer-list-table/locales/pt.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Nenhum cliente encontrado",
   "Try adjusting your search criteria": "Tente ajustar os seus criterios de pesquisa",
   "Clear search": "Limpar pesquisa",
+  "Clear all": "Limpar tudo",
 } as const;

package/src/components/customers/customer-list-table/locales/sl.ts

@@ -22,4 +22,5 @@ export default {
   "No results found": "Ni najdenih strank",
   "Try adjusting your search criteria": "Poskusite prilagoditi iskalne kriterije",
   "Clear search": "Počisti iskanje",
+  "Clear all": "Počisti vse",
 } as const;

package/src/components/dashboard/collection-rate-card/use-collection-rate.ts

@@ -20,7 +20,7 @@ export function useCollectionRateData(entityId: string | undefined) {
 
   const queries = useQueries({
     queries: [
-      // Total invoiced (non-voided)
+      // Total invoiced (including voided — counter credit notes cancel them out)
       {
         queryKey: [STATS_QUERY_CACHE_KEY, entityId, "total-invoiced"],
         queryFn: async () => {
@@ -29,7 +29,7 @@ export function useCollectionRateData(entityId: string | undefined) {
             {
               metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
               table: "invoices",
-              filters: { is_draft: false, voided_at: null },
+              filters: { is_draft: false },
             },
             { entity_id: entityId },
           );
@@ -37,15 +37,50 @@ export function useCollectionRateData(entityId: string | undefined) {
         enabled: !!entityId && !!sdk,
         staleTime: 120_000,
       },
-      // Total collected (payments)
+      // Invoice payments (credit_note_id IS NULL)
       {
-        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "total-collected"],
+        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "invoice-payments"],
         queryFn: async () => {
           if (!entityId || !sdk) throw new Error("Missing entity or SDK");
           return sdk.entityStats.queryEntityStats(
             {
               metrics: [{ type: "sum", field: "amount", alias: "total" }],
               table: "payments",
+              filters: { credit_note_id: null },
+            },
+            { entity_id: entityId },
+          );
+        },
+        enabled: !!entityId && !!sdk,
+        staleTime: 120_000,
+      },
+      // Credit note payments / refunds (credit_note_id IS NOT NULL)
+      {
+        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "cn-payments"],
+        queryFn: async () => {
+          if (!entityId || !sdk) throw new Error("Missing entity or SDK");
+          return sdk.entityStats.queryEntityStats(
+            {
+              metrics: [{ type: "sum", field: "amount", alias: "total" }],
+              table: "payments",
+              filters: { credit_note_id: { not: null } },
+            },
+            { entity_id: entityId },
+          );
+        },
+        enabled: !!entityId && !!sdk,
+        staleTime: 120_000,
+      },
+      // Credit notes total (subtracted from invoiced to get net revenue)
+      {
+        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "cn-total"],
+        queryFn: async () => {
+          if (!entityId || !sdk) throw new Error("Missing entity or SDK");
+          return sdk.entityStats.queryEntityStats(
+            {
+              metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
+              table: "credit_notes",
+              filters: { is_draft: false },
             },
             { entity_id: entityId },
           );
@@ -56,17 +91,21 @@ export function useCollectionRateData(entityId: string | undefined) {
     ],
   });
 
-  const [invoicedQuery, collectedQuery] = queries;
+  const [invoicedQuery, invoicePaymentsQuery, cnPaymentsQuery, cnQuery] = queries;
 
   const totalInvoiced = Number(invoicedQuery.data?.data?.[0]?.total) || 0;
-  const totalCollected = Number(collectedQuery.data?.data?.[0]?.total) || 0;
-  const collectionRate = totalInvoiced > 0 ? (totalCollected / totalInvoiced) * 100 : 0;
+  const invoicePayments = Number(invoicePaymentsQuery.data?.data?.[0]?.total) || 0;
+  const cnPayments = Number(cnPaymentsQuery.data?.data?.[0]?.total) || 0;
+  const cnTotal = Number(cnQuery.data?.data?.[0]?.total) || 0;
+  const netInvoiced = totalInvoiced - cnTotal;
+  const netCollected = invoicePayments - cnPayments;
+  const collectionRate = netInvoiced > 0 ? (netCollected / netInvoiced) * 100 : 0;
 
   return {
     data: {
       collectionRate,
-      totalCollected,
-      totalInvoiced,
+      totalCollected: netCollected,
+      totalInvoiced: netInvoiced,
       currency: "EUR", // TODO: Get from entity settings
     } as CollectionRateData,
     isLoading: queries.some((q) => q.isLoading),