@hed-hog/finance 0.0.321 → 0.0.325

package/hedhog/frontend/app/cash-and-banks/bank-accounts/page.tsx.ejs

@@ -37,7 +37,6 @@ import {
 import { Input } from '@/components/ui/input';
 import { InputMoney } from '@/components/ui/input-money';
 import { KpiCardsGrid } from '@/components/ui/kpi-cards-grid';
-import { Money } from '@/components/ui/money';
 import {
   Select,
   SelectContent,
@@ -105,6 +104,13 @@ type Currency = {
   ativo: boolean;
 };
 
+type BankAccountCurrency = {
+  id: string;
+  code: string;
+  symbol: string;
+  name: string;
+};
+
 type BankAccount = {
   id: string;
   codigo: string;
@@ -115,7 +121,7 @@ type BankAccount = {
   tipo: 'corrente' | 'poupanca' | 'investimento' | 'caixa';
   logoFileId: number | null;
   currencyId: number | null;
-  currency: Currency | null;
+  currency: BankAccountCurrency | null;
   saldoAtual: number;
   saldoConciliado: number;
   ativo: boolean;
@@ -147,6 +153,14 @@ type BankAccountDraftPayload = {
 
 const BANK_ACCOUNT_FORM_DRAFT_STORAGE_KEY = 'finance-bank-account-form-draft';
 
+function formatCurrency(value: number, currencyCode: string, locale: string) {
+  const localeTag = locale.startsWith('pt') ? 'pt-BR' : 'en-US';
+  return new Intl.NumberFormat(localeTag, {
+    style: 'currency',
+    currency: currencyCode,
+  }).format(value);
+}
+
 function BankAccountLogo({
   account,
   icon: Icon,
@@ -1049,40 +1063,52 @@ export default function ContasBancariasPage() {
     caixa: { label: t('types.caixa'), icon: Wallet },
   };
 
-  const saldoTotal = accounts
-    .filter((c) => c.ativo)
-    .reduce((acc, c) => acc + c.saldoAtual, 0);
-
-  const saldoConciliadoTotal = accounts
-    .filter((c) => c.ativo)
-    .reduce((acc, c) => acc + c.saldoConciliado, 0);
   const activeAccountsCount = accounts.filter((c) => c.ativo).length;
   const inactiveAccountsCount = accounts.length - activeAccountsCount;
-  const summaryCards = [
-    {
-      key: 'balance',
-      title: t('cards.totalBalance'),
-      value: <Money value={saldoTotal} />,
-      description: t('cards.activeAccounts', {
-        count: activeAccountsCount,
-      }),
-      icon: Landmark,
-      layout: 'compact' as const,
-    },
-    {
-      key: 'reconciled',
-      title: t('cards.reconciledBalance'),
-      value: <Money value={saldoConciliadoTotal} />,
-      description: `${t('cards.difference')}: ${new Intl.NumberFormat(
-        currentLocaleCode === 'pt' ? 'pt-BR' : 'en-US',
+
+  // Group active account balances by currency (accounts without currency default to BRL)
+  const balanceByCurrency = accounts
+    .filter((c) => c.ativo)
+    .reduce<
+      Record<
+        string,
         {
-          style: 'currency',
-          currency: 'BRL',
+          total: number;
+          reconciled: number;
+          symbol: string;
+          code: string;
+          name: string;
+          count: number;
         }
-      ).format(saldoTotal - saldoConciliadoTotal)}`,
-      icon: RefreshCw,
+      >
+    >((acc, c) => {
+      const code = c.currency?.code ?? 'BRL';
+      const symbol = c.currency?.symbol ?? 'R$';
+      const name = c.currency?.name ?? 'Real Brasileiro';
+      if (!acc[code]) {
+        acc[code] = { total: 0, reconciled: 0, symbol, code, name, count: 0 };
+      }
+      acc[code].total += c.saldoAtual;
+      acc[code].reconciled += c.saldoConciliado;
+      acc[code].count += 1;
+      return acc;
+    }, {});
+
+  const currencyGroups = Object.values(balanceByCurrency);
+
+  const summaryCards = [
+    ...currencyGroups.map((g) => ({
+      key: `balance-${g.code}`,
+      title: `${t('cards.totalBalance')} (${g.code})`,
+      value: (
+        <span className="tabular-nums">
+          {formatCurrency(g.total, g.code, currentLocaleCode)}
+        </span>
+      ),
+      description: `${t('cards.reconciledBalance')}: ${formatCurrency(g.reconciled, g.code, currentLocaleCode)}`,
+      icon: Landmark,
       layout: 'compact' as const,
-    },
+    })),
     {
       key: 'accounts',
       title: t('cards.accountsOverview'),
@@ -1175,7 +1201,10 @@ export default function ContasBancariasPage() {
         </AlertDialogContent>
       </AlertDialog>
 
-      <KpiCardsGrid items={summaryCards} columns={3} />
+      <KpiCardsGrid
+        items={summaryCards}
+        columns={Math.min(summaryCards.length, 4) as 2 | 3 | 4}
+      />
 
       <FinancePageSection variant="flat" contentClassName="p-0">
         {accounts.length > 0 ? (
@@ -1236,15 +1265,25 @@ export default function ContasBancariasPage() {
                         <p className="text-sm text-muted-foreground">
                           {t('accountCard.currentBalance')}
                         </p>
-                        <p className="text-2xl font-bold">
-                          <Money value={conta.saldoAtual} />
+                        <p className="text-2xl font-bold tabular-nums">
+                          {formatCurrency(
+                            conta.saldoAtual,
+                            conta.currency?.code ?? 'BRL',
+                            currentLocaleCode
+                          )}
                         </p>
                       </div>
                       <div className="flex items-center justify-between text-sm">
                         <span className="text-muted-foreground">
                           {t('accountCard.reconciledBalance')}
                         </span>
-                        <Money value={conta.saldoConciliado} />
+                        <span className="tabular-nums">
+                          {formatCurrency(
+                            conta.saldoConciliado,
+                            conta.currency?.code ?? 'BRL',
+                            currentLocaleCode
+                          )}
+                        </span>
                       </div>
                       {diferenca !== 0 ? (
                         <div className="flex items-center justify-between text-sm">
@@ -1253,10 +1292,17 @@ export default function ContasBancariasPage() {
                           </span>
                           <span
                             className={
-                              diferenca > 0 ? 'text-green-600' : 'text-red-600'
+                              diferenca > 0
+                                ? 'tabular-nums text-green-600'
+                                : 'tabular-nums text-red-600'
                             }
                           >
-                            <Money value={diferenca} showSign />
+                            {diferenca > 0 ? '+' : '-'}
+                            {formatCurrency(
+                              Math.abs(diferenca),
+                              conta.currency?.code ?? 'BRL',
+                              currentLocaleCode
+                            )}
                           </span>
                         </div>
                       ) : null}

package/hedhog/frontend/widgets/bank-reconciliation-status.tsx.ejs

@@ -30,6 +30,7 @@ interface FinanceData {
     saldoAtual?: number | null;
     saldoConciliado?: number | null;
     ativo?: boolean | null;
+    currency?: { code: string; symbol: string } | null;
   }>;
 }
 
@@ -68,13 +69,22 @@ export default function BankReconciliationStatus({
       difference: Math.abs(
         Number(account.saldoAtual || 0) - Number(account.saldoConciliado || 0)
       ),
+      currencyCode: account.currency?.code ?? 'BRL',
+      currencySymbol: account.currency?.symbol ?? 'R$',
     }))
     .sort((a, b) => b.difference - a.difference);
 
-  const totalDifference = accountDiffs.reduce(
-    (acc, account) => acc + account.difference,
-    0
-  );
+  // Group differences by currency — never mix different currencies in a single total
+  const differencesByCurrency = accountDiffs.reduce<
+    Record<string, { total: number; symbol: string }>
+  >((acc, account) => {
+    const code = account.currencyCode;
+    if (!acc[code]) {
+      acc[code] = { total: 0, symbol: account.currencySymbol };
+    }
+    acc[code].total += account.difference;
+    return acc;
+  }, {});
 
   return (
     <WidgetWrapper
@@ -109,9 +119,20 @@ export default function BankReconciliationStatus({
             <p className="text-[11px] font-medium uppercase tracking-[0.18em] text-muted-foreground">
               {t('bankReconciliation.difference')}
             </p>
-            <p className="text-lg font-semibold text-foreground">
-              <Money value={totalDifference} />
-            </p>
+            {Object.entries(differencesByCurrency).length > 0 ? (
+              Object.entries(differencesByCurrency).map(([code, entry]) => (
+                <p key={code} className="text-lg font-semibold text-foreground tabular-nums">
+                  {new Intl.NumberFormat('pt-BR', {
+                    style: 'currency',
+                    currency: code,
+                  }).format(entry.total)}
+                </p>
+              ))
+            ) : (
+              <p className="text-lg font-semibold text-foreground tabular-nums">
+                <Money value={0} />
+              </p>
+            )}
           </div>
 
           <div className="space-y-2">
@@ -123,8 +144,11 @@ export default function BankReconciliationStatus({
                 <span className="truncate pr-3 text-sm text-foreground">
                   {account.name}
                 </span>
-                <span className="text-sm font-medium text-muted-foreground">
-                  <Money value={account.difference} />
+                <span className="text-sm font-medium text-muted-foreground tabular-nums">
+                  {new Intl.NumberFormat('pt-BR', {
+                    style: 'currency',
+                    currency: account.currencyCode,
+                  }).format(account.difference)}
                 </span>
               </div>
             ))}

package/hedhog/frontend/widgets/cash-balance-kpi.tsx.ejs

@@ -14,6 +14,10 @@ interface CashBalanceKpiProps {
 interface FinanceData {
   kpis?: {
     saldoCaixa: number;
+    saldoCaixaPorMoeda?: Record<
+      string,
+      { total: number; reconciled: number; symbol: string; name: string }
+    >;
   };
 }
 
@@ -29,11 +33,11 @@ export default function CashBalanceKpi({
       queryKey: 'finance-kpi-cash-balance',
     });
 
-  const value = data?.kpis?.saldoCaixa ?? 0;
-  const formatted = new Intl.NumberFormat('pt-BR', {
-    style: 'currency',
-    currency: 'BRL',
-  }).format(value);
+  const saldoCaixaPorMoeda = data?.kpis?.saldoCaixaPorMoeda ?? {};
+  const currencyEntries = Object.entries(saldoCaixaPorMoeda);
+  // Fallback to the legacy single-value when the new field is absent
+  const legacyValue = data?.kpis?.saldoCaixa ?? 0;
+  const hasCurrencyBreakdown = currencyEntries.length > 0;
 
   return (
     <WidgetWrapper
@@ -48,13 +52,30 @@ export default function CashBalanceKpi({
           <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-emerald-100/80">
             <Wallet className="h-4.5 w-4.5 text-emerald-600" />
           </div>
-          <div className="flex min-w-0 flex-1 flex-col justify-center">
+          <div className="flex min-w-0 flex-1 flex-col justify-center gap-0.5">
             <span className="text-[9px] font-semibold uppercase tracking-[0.18em] text-muted-foreground">
               {t('kpis.cashBalance.title')}
             </span>
-            <span className="truncate text-base font-bold leading-none tracking-tight text-foreground sm:text-lg">
-              {formatted}
-            </span>
+            {hasCurrencyBreakdown ? (
+              currencyEntries.map(([code, entry]) => (
+                <span
+                  key={code}
+                  className="truncate text-base font-bold leading-none tracking-tight text-foreground sm:text-lg"
+                >
+                  {new Intl.NumberFormat('pt-BR', {
+                    style: 'currency',
+                    currency: code,
+                  }).format(entry.total)}
+                </span>
+              ))
+            ) : (
+              <span className="truncate text-base font-bold leading-none tracking-tight text-foreground sm:text-lg">
+                {new Intl.NumberFormat('pt-BR', {
+                  style: 'currency',
+                  currency: 'BRL',
+                }).format(legacyValue)}
+              </span>
+            )}
             <span className="truncate text-[9px] text-muted-foreground">
               {t('kpis.cashBalance.description')}
             </span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/finance",
-  "version": "0.0.321",
+  "version": "0.0.325",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -11,12 +11,12 @@
     "@nestjs/mapped-types": "*",
     "@hed-hog/api": "0.0.8",
     "@hed-hog/api-locale": "0.0.14",
-    "@hed-hog/contact": "0.0.321",
-    "@hed-hog/api-pagination": "0.0.7",
     "@hed-hog/api-prisma": "0.0.6",
+    "@hed-hog/contact": "0.0.325",
+    "@hed-hog/tag": "0.0.325",
     "@hed-hog/api-types": "0.0.1",
-    "@hed-hog/tag": "0.0.321",
-    "@hed-hog/core": "0.0.321"
+    "@hed-hog/api-pagination": "0.0.7",
+    "@hed-hog/core": "0.0.325"
   },
   "exports": {
     ".": {

package/src/dto/create-bank-account.dto.ts

@@ -1,11 +1,11 @@
 import { getLocaleText } from '@hed-hog/api-locale';
 import {
-  IsDateString,
-  IsInt,
-  IsNumber,
-  IsOptional,
-  IsString,
-  Min,
+    IsDateString,
+    IsInt,
+    IsNumber,
+    IsOptional,
+    IsString,
+    Min,
 } from 'class-validator';
 
 export class CreateBankAccountDto {
@@ -47,6 +47,12 @@ export class CreateBankAccountDto {
   })
   logo_file_id?: number | null;
 
+  @IsOptional()
+  @IsInt({
+    message: (args) => getLocaleText('validation.idMustBeInteger', args.value),
+  })
+  currency_id?: number | null;
+
   @IsOptional()
   @IsNumber(
     {},

package/src/dto/update-bank-account.dto.ts

@@ -42,6 +42,12 @@ export class UpdateBankAccountDto {
   })
   logo_file_id?: number | null;
 
+  @IsOptional()
+  @IsInt({
+    message: (args) => getLocaleText('validation.idMustBeInteger', args.value),
+  })
+  currency_id?: number | null;
+
   @IsOptional()
   @IsString({
     message: (args) =>

package/src/finance.service.ts

@@ -2286,9 +2286,36 @@ export class FinanceService {
     );
     const receivableInstallments = this.extractOpenInstallments(receivables);
 
-    const saldoCaixa = (bankAccounts || [])
-      .filter((account) => account?.ativo !== false)
-      .reduce((acc, account) => acc + Number(account?.saldoAtual || 0), 0);
+    const activeAccounts = (bankAccounts || []).filter(
+      (account) => account?.ativo !== false,
+    );
+
+    const saldoCaixa = activeAccounts.reduce(
+      (acc, account) => acc + Number(account?.saldoAtual || 0),
+      0,
+    );
+
+    const saldoCaixaPorMoeda: Record<
+      string,
+      { total: number; reconciled: number; symbol: string; name: string }
+    > = {};
+    for (const account of activeAccounts) {
+      const code = account?.currency?.code || 'BRL';
+      const symbol = account?.currency?.symbol || 'R$';
+      const name = account?.currency?.name || 'Real Brasileiro';
+      if (!saldoCaixaPorMoeda[code]) {
+        saldoCaixaPorMoeda[code] = { total: 0, reconciled: 0, symbol, name };
+      }
+      saldoCaixaPorMoeda[code].total = Number(
+        (saldoCaixaPorMoeda[code].total + Number(account?.saldoAtual || 0)).toFixed(2),
+      );
+      saldoCaixaPorMoeda[code].reconciled = Number(
+        (
+          saldoCaixaPorMoeda[code].reconciled +
+          Number(account?.saldoConciliado || 0)
+        ).toFixed(2),
+      );
+    }
 
     const aPagar7dias = this.sumInstallmentsDueBetween(
       payableInstallments,
@@ -2318,6 +2345,7 @@ export class FinanceService {
 
     return {
       saldoCaixa: Number(saldoCaixa.toFixed(2)),
+      saldoCaixaPorMoeda,
       aPagar30dias: Number(aPagar30dias.toFixed(2)),
       aPagar7dias: Number(aPagar7dias.toFixed(2)),
       aReceber30dias: Number(aReceber30dias.toFixed(2)),
@@ -2794,6 +2822,14 @@ export class FinanceService {
               description: true,
             },
           },
+          currency: {
+            select: {
+              id: true,
+              code: true,
+              symbol: true,
+              name: true,
+            },
+          },
         },
         orderBy: [{ code: 'asc' }, { name: 'asc' }],
       },
@@ -4430,6 +4466,7 @@ export class FinanceService {
           account_number: data.account || null,
           account_type: accountType,
           logo_file_id: data.logo_file_id ?? null,
+          currency_id: data.currency_id ?? null,
           status: 'active',
         },
       });
@@ -4478,6 +4515,14 @@ export class FinanceService {
             description: true,
           },
         },
+        currency: {
+          select: {
+            id: true,
+            code: true,
+            symbol: true,
+            name: true,
+          },
+        },
       },
     });
 
@@ -4587,6 +4632,8 @@ export class FinanceService {
         account_type: data.type ? this.mapAccountTypeFromPt(data.type) : undefined,
         logo_file_id:
           data.logo_file_id === undefined ? undefined : data.logo_file_id,
+        currency_id:
+          data.currency_id === undefined ? undefined : data.currency_id,
         status: data.status,
       },
       include: {
@@ -4598,6 +4645,14 @@ export class FinanceService {
             description: true,
           },
         },
+        currency: {
+          select: {
+            id: true,
+            code: true,
+            symbol: true,
+            name: true,
+          },
+        },
       },
     });
 
@@ -4758,7 +4813,7 @@ export class FinanceService {
   }
 
   async createCurrency(data: CreateCurrencyDto) {
-    const existing = await this.prisma.currency.findUnique({
+    const existing = await this.prisma.currency.findFirst({
       where: { code: data.code.toUpperCase() },
       select: { id: true },
     });
@@ -6465,6 +6520,14 @@ export class FinanceService {
             description: true,
           },
         },
+        currency: {
+          select: {
+            id: true,
+            code: true,
+            symbol: true,
+            name: true,
+          },
+        },
       },
       orderBy: [{ code: 'asc' }, { name: 'asc' }],
     });
@@ -7016,6 +7079,15 @@ export class FinanceService {
       conta: bankAccount.account_number || '-',
       tipo: this.mapAccountTypeToPt(bankAccount.account_type),
       logoFileId: bankAccount.logo_file_id ?? null,
+      currencyId: bankAccount.currency_id ?? null,
+      currency: bankAccount.currency
+        ? {
+            id: String(bankAccount.currency.id),
+            code: bankAccount.currency.code,
+            symbol: bankAccount.currency.symbol,
+            name: bankAccount.currency.name,
+          }
+        : null,
       saldoAtual: this.fromCents(currentCents),
       saldoConciliado: this.fromCents(reconciledCents),
       ativo: bankAccount.status === 'active',