@spaceinvoices/react-ui 0.4.11 → 0.4.12

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

@@ -1,12 +1,12 @@
 import type { Customer } from "@spaceinvoices/js-sdk";
+import { customers } from "@spaceinvoices/js-sdk";
 import { User } from "lucide-react";
 import { useMemo } from "react";
-import { withTableTranslations } from "../../table/locales";
 import { Button } from "@/ui/components/ui/button";
 import { createTranslation } from "@/ui/lib/translation";
-import { useSDK } from "@/ui/providers/sdk-provider";
 import { DataTable } from "../../table/data-table";
 import { useTableFetch } from "../../table/hooks/use-table-fetch";
+import { withTableTranslations } from "../../table/locales";
 import type { Column, ListTableProps, TableQueryParams, TableQueryResponse } from "../../table/types";
 import { CUSTOMERS_CACHE_KEY } from "../customers.hooks";
 import CustomerListRowActions from "./customer-list-row-actions";
@@ -59,17 +59,15 @@ export default function CustomerListTable({
     translations,
     ...i18nProps,
   });
-  const { sdk } = useSDK();
-
   const handleFetch = useTableFetch(async (params: TableQueryParams) => {
-    if (!sdk) throw new Error("SDK not initialized");
     if (!params.entity_id) throw new Error("Entity ID required");
 
-    const response = await sdk.customers.list({
+    const response = await customers.list({
       entity_id: params.entity_id,
       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,6 +79,7 @@ export default function CustomerListTable({
       {
         id: "name",
         header: t("Name"),
+        sort: true,
         cell: (customer) => (
           <Button variant="link" className="cursor-pointer py-0 underline" onClick={() => onRowClick?.(customer)}>
             <User className="h-4 w-4 flex-shrink-0" />
@@ -91,6 +90,7 @@ export default function CustomerListTable({
       {
         id: "address",
         header: t("Address"),
+        sort: true,
         cell: (customer) => customer.address,
       },
       {
@@ -101,6 +101,7 @@ export default function CustomerListTable({
       {
         id: "city",
         header: t("City"),
+        sort: true,
         cell: (customer) => customer.city,
       },
       {
@@ -111,6 +112,7 @@ export default function CustomerListTable({
       {
         id: "country",
         header: t("Country"),
+        sort: true,
         cell: (customer) => customer.country,
       },
       {

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Изтрий клиент",
+  "Deleting...": "Изтриване...",
+  "No results found": "No customers found",
+  Name: "Име",
+  Address: "Адрес",
+  "Post Code": "Пощенски код",
+  City: "Град",
+  State: "Област",
+  Country: "Държава",
+  "Tax number": "Данъчен номер",
+  Email: "Имейл",
+  "Created At": "Created At",
+  Actions: "Действия",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Отворете менюто",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Smazat zákazníka",
+  "Deleting...": "Mazání...",
+  "No results found": "No customers found",
+  Name: "Jméno",
+  Address: "Adresa",
+  "Post Code": "PSČ",
+  City: "Město",
+  State: "Kraj",
+  Country: "Země",
+  "Tax number": "DIČ",
+  Email: "E-mail",
+  "Created At": "Created At",
+  Actions: "Akce",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Otevřít nabídku",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -1,10 +1,25 @@
 export default {
-  // Empty state translations
   "Your list is empty": "Your customer list is empty",
   "Get started by creating your first entry": "Get started by creating your first customer",
   "Edit customer": "Edit customer",
   "Delete customer": "Delete customer",
   "Deleting...": "Deleting...",
-  // No results translations
   "No results found": "No customers found",
+  Name: "Name",
+  Address: "Address",
+  "Post Code": "Post Code",
+  City: "City",
+  State: "State",
+  Country: "Country",
+  "Tax number": "Tax number",
+  Email: "Email",
+  "Created At": "Created At",
+  Actions: "Actions",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Open menu",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
 } as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Kustuta klient",
+  "Deleting...": "Kustutamine...",
+  "No results found": "No customers found",
+  Name: "Nimi",
+  Address: "Aadress",
+  "Post Code": "Postiindeks",
+  City: "Linn",
+  State: "Maakond",
+  Country: "Riik",
+  "Tax number": "Maksukohustuslase number",
+  Email: "E-post",
+  "Created At": "Created At",
+  Actions: "Tegevused",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Ava menüü",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Delete customer",
+  "Deleting...": "Poistetaan...",
+  "No results found": "No customers found",
+  Name: "Nimi",
+  Address: "Address",
+  "Post Code": "Post Code",
+  City: "City",
+  State: "State",
+  Country: "Country",
+  "Tax number": "Tax number",
+  Email: "Sähköposti",
+  "Created At": "Created At",
+  Actions: "Toiminnot",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Avaa valikko",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -1,26 +1,26 @@
 export default {
   Name: "Naziv",
   Address: "Adresa",
-  "Post Code": "Postanski broj",
+  "Post Code": "Poštanski broj",
   City: "Grad",
-  State: "Zupanija",
-  Country: "Drzava",
+  State: "Županija",
+  Country: "Država",
   "Tax number": "OIB",
   Email: "Email",
   "Created At": "Kreirano",
   Actions: "Akcije",
-  "Create new customer": "Kreiraj novog kupca",
+  "Create new customer": "Izradi novog kupca",
   "Copy customer ID": "Kopiraj ID kupca",
-  "View customer": "Prikazi kupca",
+  "View customer": "Prikaži kupca",
   "Edit customer": "Uredi kupca",
-  "Delete customer": "Obrisi kupca",
+  "Delete customer": "Obriši kupca",
   "Deleting...": "Brisanje...",
   "Open menu": "Otvori izbornik",
   // Empty state translations
-  "Your list is empty": "Vasa lista kupaca je prazna",
-  "Get started by creating your first entry": "Pocnite kreiranjem prvog kupca",
-  "No results found": "Nije pronadjen nijedan kupac",
-  "Try adjusting your search criteria": "Pokusajte prilagoditi kriterije pretrazivanja",
-  "Clear search": "Ocisti pretragu",
+  "Your list is empty": "Vaš popis kupaca je prazan",
+  "Get started by creating your first entry": "Započnite izradom prvog kupca",
+  "No results found": "Nije pronađen nijedan kupac",
+  "Try adjusting your search criteria": "Pokušajte prilagoditi kriterije pretraživanja",
+  "Clear search": "Očisti pretragu",
   "Clear all": "Očisti sve",
 } as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Eyða viðskiptavini",
+  "Deleting...": "Eyðir...",
+  "No results found": "No customers found",
+  Name: "Nafn",
+  Address: "Heimilisfang",
+  "Post Code": "Póstnúmer",
+  City: "Borg",
+  State: "Hérað",
+  Country: "Land",
+  "Tax number": "Kennitala",
+  Email: "Netfang",
+  "Created At": "Created At",
+  Actions: "Aðgerðir",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Opna valmynd",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Slett kunde",
+  "Deleting...": "Sletter …",
+  "No results found": "No customers found",
+  Name: "Navn",
+  Address: "Adresse",
+  "Post Code": "Postnummer",
+  City: "By",
+  State: "Fylke",
+  Country: "Land",
+  "Tax number": "Organisasjonsnummer",
+  Email: "E-post",
+  "Created At": "Created At",
+  Actions: "Handlinger",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Åpne menyen",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Vymazať zákazníka",
+  "Deleting...": "Odstraňuje sa...",
+  "No results found": "No customers found",
+  Name: "Meno",
+  Address: "Adresa",
+  "Post Code": "PSC",
+  City: "Mesto",
+  State: "Kraj",
+  Country: "Krajina",
+  "Tax number": "IČO / DIČ",
+  Email: "Email",
+  "Created At": "Created At",
+  Actions: "Akcie",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Otvoriť menu",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

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

@@ -0,0 +1,25 @@
+export default {
+  "Your list is empty": "Your customer list is empty",
+  "Get started by creating your first entry": "Get started by creating your first customer",
+  "Edit customer": "Edit customer",
+  "Delete customer": "Ta bort kund",
+  "Deleting...": "Tar bort...",
+  "No results found": "No customers found",
+  Name: "Namn",
+  Address: "Adress",
+  "Post Code": "Postnummer",
+  City: "Stad",
+  State: "Län",
+  Country: "Land",
+  "Tax number": "Skattenummer",
+  Email: "E-post",
+  "Created At": "Created At",
+  Actions: "Åtgärder",
+  "Create new customer": "Create new customer",
+  "Copy customer ID": "Copy customer ID",
+  "View customer": "View customer",
+  "Open menu": "Öppna menyn",
+  "Try adjusting your search criteria": "Try adjusting your search criteria",
+  "Clear search": "Clear search",
+  "Clear all": "Clear all",
+} as const;

package/src/components/customers/customers.hooks.ts

@@ -1,24 +1,18 @@
-import type { CreateCustomerBody, Customer } from "@spaceinvoices/js-sdk";
-
+import type { CreateCustomerBody, Customer, UpdateCustomerBody } from "@spaceinvoices/js-sdk";
+import { customers } from "@spaceinvoices/js-sdk";
 import { useQuery } from "@tanstack/react-query";
-
 import { createResourceHooks } from "@/ui/hooks/create-resource-hooks";
-import { useSDK } from "@/ui/providers/sdk-provider";
 
 // Define a constant for the customers cache key
 export const CUSTOMERS_CACHE_KEY = "customers";
 
 export const useCustomerSearch = (entityId: string, search: string) => {
-  const { sdk } = useSDK();
-
   return useQuery({
-    // Don't include SDK in query key - it's guaranteed non-null by provider
-    // Including it breaks cache due to object reference changes
     queryKey: [CUSTOMERS_CACHE_KEY, "search", entityId, search],
     queryFn: async () => {
       if (!search) return { data: [] };
 
-      const response = await sdk.customers.list({
+      const response = await customers.list({
         entity_id: entityId,
         search,
         limit: 10,
@@ -26,18 +20,15 @@ export const useCustomerSearch = (entityId: string, search: string) => {
 
       return response;
     },
-    // SDK is always available, only check search and entityId
     enabled: Boolean(entityId && search),
   });
 };
 
 export const useRecentCustomers = (entityId: string) => {
-  const { sdk } = useSDK();
-
   return useQuery({
     queryKey: [CUSTOMERS_CACHE_KEY, "recent", entityId],
     queryFn: async () => {
-      const response = await sdk.customers.list({
+      const response = await customers.list({
         entity_id: entityId,
         limit: 5,
         order_by: "-created_at", // Sort by most recently created
@@ -56,7 +47,13 @@ export const {
   useDeleteResource: useDeleteCustomer,
   useRestoreResource: useRestoreCustomer,
   usePermanentDeleteResource: usePermanentDeleteCustomer,
-} = createResourceHooks<Customer, CreateCustomerBody>("customers", CUSTOMERS_CACHE_KEY, {
-  restoreMethodName: "restoreCustomer",
-  permanentDeleteMethodName: "permanentDeleteCustomer",
-});
+} = createResourceHooks<Customer, CreateCustomerBody, UpdateCustomerBody>(
+  {
+    create: customers.create,
+    update: customers.update,
+    delete: customers.delete,
+    restore: customers.restoreCustomer,
+    permanentDelete: customers.permanentDeleteCustomer,
+  },
+  CUSTOMERS_CACHE_KEY,
+);

package/src/components/customers/edit-customer-form/locales/bg.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Име",
+  "Enter name": "Въведете име",
+  Address: "Адрес",
+  "Enter address": "Enter address",
+  "Post Code": "Пощенски код",
+  City: "Град",
+  State: "Област",
+  Country: "Държава",
+  "Tax Number": "ДДС номер",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/cs.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Jméno",
+  "Enter name": "Zadejte jméno",
+  Address: "Adresa",
+  "Enter address": "Enter address",
+  "Post Code": "PSČ",
+  City: "Město",
+  State: "Kraj",
+  Country: "Země",
+  "Tax Number": "DIČ",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/en.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Name",
+  "Enter name": "Enter name",
+  Address: "Address",
+  "Enter address": "Enter address",
+  "Post Code": "Post Code",
+  City: "City",
+  State: "State",
+  Country: "Country",
+  "Tax Number": "Tax Number",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/et.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Nimi",
+  "Enter name": "Sisestage nimi",
+  Address: "Aadress",
+  "Enter address": "Enter address",
+  "Post Code": "Postiindeks",
+  City: "Linn",
+  State: "Maakond",
+  Country: "Riik",
+  "Tax Number": "KMKR number",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/fi.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Nimi",
+  "Enter name": "Kirjoita nimi",
+  Address: "Address",
+  "Enter address": "Enter address",
+  "Post Code": "Post Code",
+  City: "City",
+  State: "State",
+  Country: "Country",
+  "Tax Number": "ALV-numero",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/hr.ts

@@ -3,11 +3,11 @@ export default {
   "Enter name": "Unesite naziv kupca",
   Address: "Adresa",
   "Enter address": "Unesite adresu",
-  "Post Code": "Postanski broj",
+  "Post Code": "Poštanski broj",
   City: "Grad",
-  State: "Zupanija",
-  Country: "Drzava",
+  State: "Županija",
+  Country: "Država",
   "Tax Number": "OIB",
-  "Search by company name or tax number": "Pretrazi po nazivu tvrtke ili OIB-u",
-  "There was an error updating the customer": "Doslo je do greske pri azuriranju kupca",
+  "Search by company name or tax number": "Pretraži po nazivu tvrtke ili OIB-u",
+  "There was an error updating the customer": "Došlo je do pogreške pri ažuriranju kupca",
 } as const;

package/src/components/customers/edit-customer-form/locales/is.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Nafn",
+  "Enter name": "Sláðu inn nafn",
+  Address: "Heimilisfang",
+  "Enter address": "Enter address",
+  "Post Code": "Póstnúmer",
+  City: "Borg",
+  State: "Hérað",
+  Country: "Land",
+  "Tax Number": "Skattnúmer",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/nb.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Navn",
+  "Enter name": "Skriv inn navn",
+  Address: "Adresse",
+  "Enter address": "Enter address",
+  "Post Code": "Postnummer",
+  City: "By",
+  State: "Fylke",
+  Country: "Land",
+  "Tax Number": "Skattenummer",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/sk.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Meno",
+  "Enter name": "Zadajte meno",
+  Address: "Adresa",
+  "Enter address": "Enter address",
+  "Post Code": "PSC",
+  City: "Mesto",
+  State: "Kraj",
+  Country: "Krajina",
+  "Tax Number": "Daňové číslo",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/customers/edit-customer-form/locales/sv.ts

@@ -0,0 +1,13 @@
+export default {
+  Name: "Namn",
+  "Enter name": "Ange namn",
+  Address: "Adress",
+  "Enter address": "Enter address",
+  "Post Code": "Postnummer",
+  City: "Stad",
+  State: "Län",
+  Country: "Land",
+  "Tax Number": "Skattenummer",
+  "Search by company name or tax number": "Search by company name or tax number",
+  "There was an error updating the customer": "There was an error updating the customer",
+} as const;

package/src/components/dashboard/collection-rate-card/collection-rate-card.tsx

@@ -6,8 +6,8 @@ import { LoadingCard } from "../loading-card";
 import bg from "./locales/bg";
 import cs from "./locales/cs";
 import de from "./locales/de";
-import et from "./locales/et";
 import es from "./locales/es";
+import et from "./locales/et";
 import fi from "./locales/fi";
 import fr from "./locales/fr";
 import hr from "./locales/hr";
@@ -26,6 +26,7 @@ const translations = { bg, cs, de, et, es, fi, fr, hr, is, it, nb, nl, pl, pt, s
 
 type BaseProps = {
   locale?: string;
+  translationLocale?: string;
   t?: (key: string) => string;
   namespace?: string;
 };
@@ -49,8 +50,8 @@ type TurnkeyProps = BaseProps & {
 export type CollectionRateCardProps = DataProps | TurnkeyProps;
 
 export function CollectionRateCard(props: CollectionRateCardProps) {
-  const { locale, t: externalT, namespace } = props;
-  const t = createTranslation({ t: externalT, namespace, locale, translations });
+  const { locale, translationLocale, t: externalT, namespace } = props;
+  const t = createTranslation({ t: externalT, namespace, locale, translationLocale, translations });
 
   // Turnkey mode - fetch own data
   const hookResult = useCollectionRateData("entityId" in props ? props.entityId : undefined);
@@ -81,11 +82,11 @@ export function CollectionRateCard(props: CollectionRateCardProps) {
   };
 
   return (
-    <Card>
-      <CardHeader className="pb-2">
+    <Card className="gap-2">
+      <CardHeader className="pb-1">
         <CardTitle className="font-medium text-muted-foreground text-sm">{t("Collection Rate")}</CardTitle>
       </CardHeader>
-      <CardContent>
+      <CardContent className="pt-0">
         <div className={`font-bold text-2xl ${getVariantColor(collectionRate)}`}>{collectionRate.toFixed(1)}%</div>
         <p className="mt-1 text-muted-foreground text-xs">
           {formatCurrency(totalCollected)} / {formatCurrency(totalInvoiced)}

package/src/components/dashboard/collection-rate-card/locales/en.ts

@@ -0,0 +1,3 @@
+export default {
+  "Collection Rate": "Collection Rate",
+} as const;

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

@@ -17,17 +17,18 @@ export type CollectionRateData = {
 
 export function useCollectionRateData(entityId: string | undefined) {
   const queries: StatsQueryRequest[] = [
-    // [0] Total invoiced (including voided — counter credit notes cancel them out)
+    // [0] Total invoiced (non-voided, non-draft invoices only)
     {
       metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
       table: "invoices",
-      filters: { is_draft: false },
+      filters: { is_draft: false, voided_at: null },
     },
-    // [1] Invoice payments (credit_note_id IS NULL)
+    // [1] Total collected on invoices
+    // Using invoice.total_paid avoids counting orphan payments or payments on voided invoices.
     {
-      metrics: [{ type: "sum", field: "amount", alias: "total" }],
-      table: "payments",
-      filters: { credit_note_id: null },
+      metrics: [{ type: "sum", field: "total_paid", alias: "total" }],
+      table: "invoices",
+      filters: { is_draft: false, voided_at: null },
     },
     // [2] Credit note payments / refunds (credit_note_id IS NOT NULL)
     {
@@ -39,7 +40,7 @@ export function useCollectionRateData(entityId: string | undefined) {
     {
       metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
       table: "credit_notes",
-      filters: { is_draft: false },
+      filters: { is_draft: false, voided_at: null },
     },
   ];