@spaceinvoices/react-ui 0.4.6 → 0.4.7

package/cli/dist/index.js

@@ -870,7 +870,7 @@ async function list(options = {}) {
 
 // cli/src/index.ts
 var program = new Command();
-program.name("spaceinvoices-ui").description("CLI for adding Space Invoices React UI components to your project").version("0.4.6");
+program.name("spaceinvoices-ui").description("CLI for adding Space Invoices React UI components to your project").version("0.4.7");
 program.option("--local <path>", "Use local registry from specified path (for development)");
 program.command("init").description("Initialize Space Invoices UI in your project").option("-y, --yes", "Skip prompts and use defaults").option("-f, --force", "Overwrite existing configuration").option("--cwd <path>", "Working directory (defaults to current directory)").action(async (options) => {
   const globalOpts = program.opts();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spaceinvoices/react-ui",
   "type": "module",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "private": false,
   "license": "MIT",
   "description": "Space Invoices UI components - copy-paste distribution with CLI support",

package/src/components/advance-invoices/create/create-advance-invoice-form.tsx

@@ -13,7 +13,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/ui/c
 import type { CreateAdvanceInvoiceSchema } from "@/ui/generated/schemas";
 import { createAdvanceInvoiceSchema } from "@/ui/generated/schemas";
 import { useNextDocumentNumber } from "@/ui/hooks/use-next-document-number";
-import { useViesCheck } from "@/ui/hooks/use-vies-check";
+import { useTransactionTypeCheck } from "@/ui/hooks/use-transaction-type-check";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { cn } from "@/ui/lib/utils";
@@ -350,19 +350,6 @@ export default function CreateAdvanceInvoiceForm({
   const isFinaActive =
     isFinaEnabled && hasFinaPremises && selectedFinaBusinessPremiseName && selectedFinaElectronicDeviceName;
 
-  // ============================================================================
-  // Next Advance Invoice Number Preview
-  // ============================================================================
-  const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextDocumentNumber(entityId, "advance_invoice", {
-    businessPremiseName: isFursActive ? selectedPremiseName : undefined,
-    electronicDeviceName: isFursActive ? selectedDeviceName : undefined,
-    enabled: !!entityId && !isFursLoading && isFursSelectionReady && !isFinaLoading && isFinaSelectionReady,
-  });
-
-  // Overall loading state
-  const isFormDataLoading =
-    isFursLoading || !isFursSelectionReady || isFinaLoading || !isFinaSelectionReady || isNextNumberLoading;
-
   // Update header action with FURS and e-SLOG toggle buttons
   useEffect(() => {
     if (!onHeaderActionChange) return;
@@ -472,13 +459,6 @@ export default function CreateAdvanceInvoiceForm({
     t,
   ]);
 
-  // Pre-fill advance invoice number from preview
-  useEffect(() => {
-    if (nextNumberData?.number) {
-      form.setValue("number", nextNumberData.number);
-    }
-  }, [nextNumberData?.number, form]);
-
   const formValues = useWatch({
     control: form.control,
   });
@@ -489,20 +469,55 @@ export default function CreateAdvanceInvoiceForm({
   const {
     reverseChargeApplies,
     transactionType,
-    customerCountryCode: viesCustomerCountryCode,
     isFetching: isViesFetching,
     warning: viesWarning,
-  } = useViesCheck({
+  } = useTransactionTypeCheck({
     issuerCountryCode: activeEntity?.country_code,
     isTaxSubject: activeEntity?.is_tax_subject ?? true,
     customerCountry: formValues.customer?.country,
     customerCountryCode: formValues.customer?.country_code,
     customerTaxNumber: formValues.customer?.tax_number,
+    customerIsEndConsumer: (formValues.customer as any)?.is_end_consumer,
     enabled: !!activeEntity,
   });
 
-  // FINA non-domestic guard: hide FINA selectors for non-domestic transactions
-  const isFinaNonDomestic = isFinaEnabled && viesCustomerCountryCode != null && viesCustomerCountryCode !== "HR";
+  // FINA numbering guard: use FINA numbering for domestic transactions (or all if unified numbering is on)
+  const finaUnifiedNumbering = finaSettings?.unified_numbering !== false;
+  const useFinaNumbering =
+    !!isFinaActive && (finaUnifiedNumbering || transactionType == null || transactionType === "domestic");
+  const isFinaNonDomestic = !!isFinaActive && !useFinaNumbering;
+
+  // ============================================================================
+  // Next Advance Invoice Number Preview
+  // ============================================================================
+  // Use same premise/device params for both FURS and FINA (entity is either one, never both)
+  const activePremiseNameForNumber = isFursActive
+    ? selectedPremiseName
+    : useFinaNumbering
+      ? selectedFinaBusinessPremiseName
+      : undefined;
+  const activeDeviceNameForNumber = isFursActive
+    ? selectedDeviceName
+    : useFinaNumbering
+      ? selectedFinaElectronicDeviceName
+      : undefined;
+
+  const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextDocumentNumber(entityId, "advance_invoice", {
+    businessPremiseName: activePremiseNameForNumber,
+    electronicDeviceName: activeDeviceNameForNumber,
+    enabled: !!entityId && !isFursLoading && isFursSelectionReady && !isFinaLoading && isFinaSelectionReady,
+  });
+
+  // Overall loading state
+  const isFormDataLoading =
+    isFursLoading || !isFursSelectionReady || isFinaLoading || !isFinaSelectionReady || isNextNumberLoading;
+
+  // Pre-fill advance invoice number from preview
+  useEffect(() => {
+    if (nextNumberData?.number) {
+      form.setValue("number", nextNumberData.number);
+    }
+  }, [nextNumberData?.number, form]);
 
   // Auto-populate tax_clause from entity settings when transaction type changes
   const effectiveTransactionType = transactionType ?? "domestic";
@@ -588,11 +603,7 @@ export default function CreateAdvanceInvoiceForm({
 
       // Build FINA options (skip for drafts; FINA can't be skipped)
       const finaOptions =
-        !isDraft &&
-        isFinaEnabled &&
-        !isFinaNonDomestic &&
-        selectedFinaBusinessPremiseName &&
-        selectedFinaElectronicDeviceName
+        !isDraft && useFinaNumbering && selectedFinaBusinessPremiseName && selectedFinaElectronicDeviceName
           ? {
               business_premise_name: selectedFinaBusinessPremiseName,
               electronic_device_name: selectedFinaElectronicDeviceName,
@@ -621,8 +632,7 @@ export default function CreateAdvanceInvoiceForm({
       form,
       isEslogAvailable,
       isFursEnabled,
-      isFinaEnabled,
-      isFinaNonDomestic,
+      useFinaNumbering,
       markAsPaid,
       originalCustomer,
       paymentTypes,
@@ -729,16 +739,24 @@ export default function CreateAdvanceInvoiceForm({
             <Skeleton className="h-7 w-24" />
             <Skeleton className="h-10 w-full" />
           </div>
-          <div className="flex-1 space-y-4">
+          <div className="flex-1 space-y-3">
             <Skeleton className="h-7 w-20" />
-            <Skeleton className="h-5 w-16" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-12" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-16" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-20" />
-            <Skeleton className="h-10 w-full" />
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
             <div className="space-y-3 rounded-md border p-4">
               <div className="flex items-center gap-3">
                 <Skeleton className="h-4 w-4 rounded" />
@@ -764,8 +782,6 @@ export default function CreateAdvanceInvoiceForm({
           <Skeleton className="h-5 w-12" />
           <Skeleton className="h-24 w-full" />
         </div>
-
-        <Skeleton className="h-10 w-24" />
       </div>
     );
   }
@@ -821,7 +837,7 @@ export default function CreateAdvanceInvoiceForm({
                 : undefined
             }
             finaInline={
-              isFinaEnabled && hasFinaPremises && !isFinaNonDomestic
+              useFinaNumbering
                 ? {
                     premises: activeFinaPremises.map((p: any) => ({
                       id: p.id,

package/src/components/credit-notes/create/create-credit-note-form.tsx

@@ -9,7 +9,7 @@ import { Form } from "@/ui/components/ui/form";
 import { Skeleton } from "@/ui/components/ui/skeleton";
 import { createCreditNoteSchema } from "@/ui/generated/schemas";
 import { useNextDocumentNumber } from "@/ui/hooks/use-next-document-number";
-import { useViesCheck } from "@/ui/hooks/use-vies-check";
+import { useTransactionTypeCheck } from "@/ui/hooks/use-transaction-type-check";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { useEntities } from "@/ui/providers/entities-context";
@@ -254,19 +254,6 @@ export default function CreateCreditNoteForm({
   const isFinaActive =
     isFinaEnabled && hasFinaPremises && selectedFinaBusinessPremiseName && selectedFinaElectronicDeviceName;
 
-  // ============================================================================
-  // Next Credit Note Number Preview
-  // ============================================================================
-  const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextDocumentNumber(entityId, "credit_note", {
-    businessPremiseName: isFursActive ? selectedPremiseName : undefined,
-    electronicDeviceName: isFursActive ? selectedDeviceName : undefined,
-    enabled: !!entityId && !isFursLoading && isFursSelectionReady && !isFinaLoading && isFinaSelectionReady,
-  });
-
-  // Overall loading state
-  const isFormDataLoading =
-    isFursLoading || !isFursSelectionReady || isFinaLoading || !isFinaSelectionReady || isNextNumberLoading;
-
   // No header action for credit notes - FINA can't be skipped
 
   // Get default payment terms and footer from entity settings
@@ -324,20 +311,48 @@ export default function CreateCreditNoteForm({
   const {
     reverseChargeApplies,
     transactionType,
-    customerCountryCode: viesCustomerCountryCode,
     isFetching: isViesFetching,
     warning: viesWarning,
-  } = useViesCheck({
+  } = useTransactionTypeCheck({
     issuerCountryCode: activeEntity?.country_code,
     isTaxSubject: activeEntity?.is_tax_subject ?? true,
     customerCountry: formValues.customer?.country,
     customerCountryCode: formValues.customer?.country_code,
     customerTaxNumber: formValues.customer?.tax_number,
+    customerIsEndConsumer: (formValues.customer as any)?.is_end_consumer,
     enabled: !!activeEntity,
   });
 
-  // FINA non-domestic guard: hide FINA selectors for non-domestic transactions
-  const isFinaNonDomestic = isFinaEnabled && viesCustomerCountryCode != null && viesCustomerCountryCode !== "HR";
+  // FINA numbering guard: use FINA numbering for domestic transactions (or all if unified numbering is on)
+  const finaUnifiedNumbering = finaSettings?.unified_numbering !== false;
+  const useFinaNumbering =
+    !!isFinaActive && (finaUnifiedNumbering || transactionType == null || transactionType === "domestic");
+  const isFinaNonDomestic = !!isFinaActive && !useFinaNumbering;
+
+  // ============================================================================
+  // Next Credit Note Number Preview
+  // ============================================================================
+  // Use same premise/device params for both FURS and FINA (entity is either one, never both)
+  const activePremiseNameForNumber = isFursActive
+    ? selectedPremiseName
+    : useFinaNumbering
+      ? selectedFinaBusinessPremiseName
+      : undefined;
+  const activeDeviceNameForNumber = isFursActive
+    ? selectedDeviceName
+    : useFinaNumbering
+      ? selectedFinaElectronicDeviceName
+      : undefined;
+
+  const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextDocumentNumber(entityId, "credit_note", {
+    businessPremiseName: activePremiseNameForNumber,
+    electronicDeviceName: activeDeviceNameForNumber,
+    enabled: !!entityId && !isFursLoading && isFursSelectionReady && !isFinaLoading && isFinaSelectionReady,
+  });
+
+  // Overall loading state
+  const isFormDataLoading =
+    isFursLoading || !isFursSelectionReady || isFinaLoading || !isFinaSelectionReady || isNextNumberLoading;
 
   // Auto-populate tax_clause from entity settings when transaction type changes
   const effectiveTransactionType = transactionType ?? "domestic";
@@ -408,11 +423,7 @@ export default function CreateCreditNoteForm({
 
       // Build FINA options (skip for drafts; FINA can't be skipped)
       const finaOptions =
-        !isDraft &&
-        isFinaEnabled &&
-        !isFinaNonDomestic &&
-        selectedFinaBusinessPremiseName &&
-        selectedFinaElectronicDeviceName
+        !isDraft && useFinaNumbering && selectedFinaBusinessPremiseName && selectedFinaElectronicDeviceName
           ? {
               business_premise_name: selectedFinaBusinessPremiseName,
               electronic_device_name: selectedFinaElectronicDeviceName,
@@ -445,8 +456,7 @@ export default function CreateCreditNoteForm({
     [
       createCreditNote,
       isFursEnabled,
-      isFinaEnabled,
-      isFinaNonDomestic,
+      useFinaNumbering,
       markAsPaid,
       originalCustomer,
       paymentTypes,
@@ -558,21 +568,23 @@ export default function CreateCreditNoteForm({
             <Skeleton className="h-7 w-24" />
             <Skeleton className="h-10 w-full" />
           </div>
-          <div className="flex-1 space-y-4">
+          <div className="flex-1 space-y-3">
             <Skeleton className="h-7 w-20" />
-            <Skeleton className="h-5 w-16" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-12" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-16" />
-            <Skeleton className="h-10 w-full" />
-            <Skeleton className="h-5 w-20" />
-            <Skeleton className="h-10 w-full" />
-            <div className="space-y-3 rounded-md border p-4">
-              <div className="flex items-center gap-3">
-                <Skeleton className="h-4 w-4 rounded" />
-                <Skeleton className="h-5 w-28" />
-              </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
             </div>
           </div>
         </div>
@@ -593,8 +605,6 @@ export default function CreateCreditNoteForm({
           <Skeleton className="h-5 w-12" />
           <Skeleton className="h-24 w-full" />
         </div>
-
-        <Skeleton className="h-10 w-24" />
       </div>
     );
   }
@@ -631,7 +641,7 @@ export default function CreateCreditNoteForm({
                 : undefined
             }
             finaInline={
-              isFinaEnabled && hasFinaPremises && !isFinaNonDomestic
+              useFinaNumbering
                 ? {
                     premises: activeFinaPremises.map((p: any) => ({
                       id: p.id,

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

@@ -1,10 +1,10 @@
 /**
  * Collection rate hook using the entity stats API.
  * Server-side aggregation for accurate totals.
+ * Sends 4 queries in a single batch request.
  */
-import { useQueries } from "@tanstack/react-query";
-import { useSDK } from "@/ui/providers/sdk-provider";
-import { STATS_QUERY_CACHE_KEY } from "../shared/use-stats-query";
+import type { StatsQueryRequest } from "@spaceinvoices/js-sdk";
+import { useStatsBatchQuery } from "../shared/use-stats-query";
 
 export const COLLECTION_RATE_CACHE_KEY = "dashboard-collection-rate";
 
@@ -16,98 +16,54 @@ export type CollectionRateData = {
 };
 
 export function useCollectionRateData(entityId: string | undefined) {
-  const { sdk } = useSDK();
+  const queries: StatsQueryRequest[] = [
+    // [0] Total invoiced (including voided — counter credit notes cancel them out)
+    {
+      metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
+      table: "invoices",
+      filters: { is_draft: false },
+    },
+    // [1] Invoice payments (credit_note_id IS NULL)
+    {
+      metrics: [{ type: "sum", field: "amount", alias: "total" }],
+      table: "payments",
+      filters: { credit_note_id: null },
+    },
+    // [2] Credit note payments / refunds (credit_note_id IS NOT NULL)
+    {
+      metrics: [{ type: "sum", field: "amount", alias: "total" }],
+      table: "payments",
+      filters: { credit_note_id: { not: null } },
+    },
+    // [3] Credit notes total (subtracted from invoiced to get net revenue)
+    {
+      metrics: [{ type: "sum", field: "total_with_tax", alias: "total" }],
+      table: "credit_notes",
+      filters: { is_draft: false },
+    },
+  ];
 
-  const queries = useQueries({
-    queries: [
-      // Total invoiced (including voided — counter credit notes cancel them out)
-      {
-        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "total-invoiced"],
-        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: "invoices",
-              filters: { is_draft: false },
-            },
-            { entity_id: entityId },
-          );
-        },
-        enabled: !!entityId && !!sdk,
-        staleTime: 120_000,
-      },
-      // Invoice payments (credit_note_id IS NULL)
-      {
-        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 },
-          );
-        },
-        enabled: !!entityId && !!sdk,
-        staleTime: 120_000,
-      },
-    ],
-  });
-
-  const [invoicedQuery, invoicePaymentsQuery, cnPaymentsQuery, cnQuery] = queries;
+  const { data: results, isLoading } = useStatsBatchQuery(entityId, "collection-rate", queries, {
+    select: (batch) => {
+      const totalInvoiced = Number(batch[0].data?.[0]?.total) || 0;
+      const invoicePayments = Number(batch[1].data?.[0]?.total) || 0;
+      const cnPayments = Number(batch[2].data?.[0]?.total) || 0;
+      const cnTotal = Number(batch[3].data?.[0]?.total) || 0;
+      const netInvoiced = totalInvoiced - cnTotal;
+      const netCollected = invoicePayments - cnPayments;
+      const collectionRate = netInvoiced > 0 ? (netCollected / netInvoiced) * 100 : 0;
 
-  const totalInvoiced = Number(invoicedQuery.data?.data?.[0]?.total) || 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 {
+        collectionRate,
+        totalCollected: netCollected,
+        totalInvoiced: netInvoiced,
+        currency: "EUR", // TODO: Get from entity settings
+      } as CollectionRateData;
+    },
+  });
 
   return {
-    data: {
-      collectionRate,
-      totalCollected: netCollected,
-      totalInvoiced: netInvoiced,
-      currency: "EUR", // TODO: Get from entity settings
-    } as CollectionRateData,
-    isLoading: queries.some((q) => q.isLoading),
+    data: results ?? { collectionRate: 0, totalCollected: 0, totalInvoiced: 0, currency: "EUR" },
+    isLoading,
   };
 }

package/src/components/dashboard/invoice-status-chart/use-invoice-status.ts

@@ -1,11 +1,10 @@
 /**
  * Invoice status hook using the entity stats API.
  * Server-side counting by invoice status.
+ * Sends 3 queries in a single batch request.
  */
-import type { StatsQueryDataItem } from "@spaceinvoices/js-sdk";
-import { useQueries } from "@tanstack/react-query";
-import { useSDK } from "@/ui/providers/sdk-provider";
-import { STATS_QUERY_CACHE_KEY } from "../shared/use-stats-query";
+import type { StatsQueryDataItem, StatsQueryRequest } from "@spaceinvoices/js-sdk";
+import { useStatsBatchQuery } from "../shared/use-stats-query";
 
 export const INVOICE_STATUS_CACHE_KEY = "dashboard-invoice-status";
 
@@ -17,89 +16,56 @@ export type InvoiceStatusData = {
 };
 
 export function useInvoiceStatusData(entityId: string | undefined) {
-  const { sdk } = useSDK();
+  const queries: StatsQueryRequest[] = [
+    // [0] Paid invoices
+    {
+      metrics: [{ type: "count", alias: "count" }],
+      table: "invoices",
+      filters: { is_draft: false, voided_at: null, paid_in_full: true },
+    },
+    // [1] Unpaid invoices grouped by overdue bucket (current = pending, others = overdue)
+    {
+      metrics: [{ type: "count", alias: "count" }],
+      table: "invoices",
+      filters: { is_draft: false, voided_at: null, paid_in_full: false },
+      group_by: ["overdue_bucket"],
+    },
+    // [2] Total count to derive voided
+    {
+      metrics: [{ type: "count", alias: "count" }],
+      table: "invoices",
+      filters: { is_draft: false },
+    },
+  ];
 
-  const queries = useQueries({
-    queries: [
-      // Paid invoices
-      {
-        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "invoice-status-paid"],
-        queryFn: async () => {
-          if (!entityId || !sdk) throw new Error("Missing entity or SDK");
-          return sdk.entityStats.queryEntityStats(
-            {
-              metrics: [{ type: "count", alias: "count" }],
-              table: "invoices",
-              filters: { is_draft: false, voided_at: null, paid_in_full: true },
-            },
-            { entity_id: entityId },
-          );
-        },
-        enabled: !!entityId && !!sdk,
-        staleTime: 120_000,
-      },
-      // Unpaid invoices grouped by overdue bucket (current = pending, others = overdue)
-      {
-        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "invoice-status-unpaid"],
-        queryFn: async () => {
-          if (!entityId || !sdk) throw new Error("Missing entity or SDK");
-          return sdk.entityStats.queryEntityStats(
-            {
-              metrics: [{ type: "count", alias: "count" }],
-              table: "invoices",
-              filters: { is_draft: false, voided_at: null, paid_in_full: false },
-              group_by: ["overdue_bucket"],
-            },
-            { entity_id: entityId },
-          );
-        },
-        enabled: !!entityId && !!sdk,
-        staleTime: 120_000,
-      },
-      // Total count to derive voided
-      {
-        queryKey: [STATS_QUERY_CACHE_KEY, entityId, "invoice-status-total"],
-        queryFn: async () => {
-          if (!entityId || !sdk) throw new Error("Missing entity or SDK");
-          return sdk.entityStats.queryEntityStats(
-            {
-              metrics: [{ type: "count", alias: "count" }],
-              table: "invoices",
-              filters: { is_draft: false },
-            },
-            { entity_id: entityId },
-          );
-        },
-        enabled: !!entityId && !!sdk,
-        staleTime: 120_000,
-      },
-    ],
-  });
-
-  const [paidQuery, unpaidQuery, totalQuery] = queries;
+  const { data: results, isLoading } = useStatsBatchQuery(entityId, "invoice-status", queries, {
+    select: (batch) => {
+      const paid = Number(batch[0].data?.[0]?.count) || 0;
 
-  const paid = Number(paidQuery.data?.data?.[0]?.count) || 0;
+      // Parse unpaid buckets
+      const unpaidData = batch[1].data || [];
+      let pending = 0;
+      let overdue = 0;
+      for (const row of unpaidData as StatsQueryDataItem[]) {
+        const bucket = String(row.overdue_bucket);
+        const count = Number(row.count) || 0;
+        if (bucket === "current") {
+          pending = count;
+        } else {
+          overdue += count;
+        }
+      }
 
-  // Parse unpaid buckets
-  const unpaidData = unpaidQuery.data?.data || [];
-  let pending = 0;
-  let overdue = 0;
-  for (const row of unpaidData as StatsQueryDataItem[]) {
-    const bucket = String(row.overdue_bucket);
-    const count = Number(row.count) || 0;
-    if (bucket === "current") {
-      pending = count;
-    } else {
-      overdue += count;
-    }
-  }
+      // Calculate voided as: total - paid - pending - overdue
+      const total = Number(batch[2].data?.[0]?.count) || 0;
+      const voided = Math.max(0, total - paid - pending - overdue);
 
-  // Calculate voided as: total - paid - pending - overdue
-  const total = Number(totalQuery.data?.data?.[0]?.count) || 0;
-  const voided = Math.max(0, total - paid - pending - overdue);
+      return { paid, pending, overdue, voided } as InvoiceStatusData;
+    },
+  });
 
   return {
-    data: { paid, pending, overdue, voided } as InvoiceStatusData,
-    isLoading: queries.some((q) => q.isLoading),
+    data: results ?? { paid: 0, pending: 0, overdue: 0, voided: 0 },
+    isLoading,
   };
 }