@hed-hog/finance 0.0.251 → 0.0.252

package/hedhog/frontend/app/page.tsx.ejs

@@ -221,8 +221,12 @@ function Alertas({
     (e) => e.statusConciliacao === 'pendente'
   ).length;
 
-  const periodoBase = periodoAberto?.inicio ? new Date(periodoAberto.inicio) : new Date();
-  const mes = new Intl.DateTimeFormat(locale, { month: 'long' }).format(periodoBase);
+  const periodoBase = periodoAberto?.inicio
+    ? new Date(periodoAberto.inicio)
+    : new Date();
+  const mes = new Intl.DateTimeFormat(locale, { month: 'long' }).format(
+    periodoBase
+  );
   const periodoAtual = `${mes.charAt(0).toUpperCase()}${mes.slice(1)}/${periodoBase.getFullYear()}`;
 
   return (
@@ -281,6 +285,9 @@ export default function DashboardPage() {
   } = data;
 
   const getPessoaById = (id?: string) => pessoas.find((p) => p.id === id);
+  const titulosPagarAprovados = titulosPagar.filter(
+    (titulo) => titulo.status !== 'rascunho' && titulo.status !== 'cancelado'
+  );
 
   return (
     <Page>
@@ -335,7 +342,7 @@ export default function DashboardPage() {
           </CardContent>
         </Card>
         <Alertas
-          titulosPagar={titulosPagar}
+          titulosPagar={titulosPagarAprovados}
           extratos={extratos}
           periodoAberto={periodoAberto}
           locale={locale}
@@ -344,7 +351,7 @@ export default function DashboardPage() {
       </div>
 
       <ProximosVencimentos
-        titulosPagar={titulosPagar}
+        titulosPagar={titulosPagarAprovados}
         titulosReceber={titulosReceber}
         getPessoaById={getPessoaById}
         t={t}

package/hedhog/frontend/messages/en.json

@@ -198,6 +198,44 @@
       "reverse": "Reverse",
       "cancel": "Cancel"
     },
+    "validation": {
+      "installmentRequired": "Installment is required",
+      "amountGreaterThanZero": "Amount must be greater than zero"
+    },
+    "dialogs": {
+      "cancel": {
+        "title": "Confirm cancellation",
+        "description": "This action changes the title status to canceled and does not remove audit records.",
+        "cancel": "Cancel",
+        "confirm": "Confirm cancellation"
+      },
+      "reverse": {
+        "title": "Confirm reversal",
+        "description": "This action reverses the selected settlement, recalculates installment balances, and updates the title status.",
+        "cancel": "Cancel",
+        "confirm": "Confirm reversal"
+      }
+    },
+    "settleSheet": {
+      "title": "Register settlement",
+      "description": "Provide the installment and settlement amount. The backend validates status and amount limits automatically.",
+      "installmentLabel": "Installment",
+      "installmentPlaceholder": "Select",
+      "installmentOption": "Installment {number} - open amount: {amount}",
+      "amountLabel": "Amount",
+      "descriptionLabel": "Description (optional)",
+      "confirm": "Confirm settlement"
+    },
+    "messages": {
+      "approveSuccess": "Title approved successfully",
+      "approveError": "Could not approve the title",
+      "settleSuccess": "Settlement registered successfully",
+      "settleError": "Could not register settlement",
+      "reverseSuccess": "Reversal completed successfully",
+      "reverseError": "Could not reverse the settlement",
+      "cancelSuccess": "Title canceled successfully",
+      "cancelError": "Could not cancel the title"
+    },
     "documentData": {
       "title": "Document Data",
       "supplier": "Supplier",
@@ -254,6 +292,12 @@
       "fine": "Fine",
       "account": "Account",
       "method": "Method",
+      "actions": "Actions",
+      "reverseButton": "Reverse",
+      "reverseDialogTitle": "Confirm reversal",
+      "reverseDialogDescription": "This action creates a reversal for the settlement and recalculates balances and status.",
+      "reverseDialogCancel": "Cancel",
+      "reverseDialogConfirm": "Confirm reversal",
       "none": "No settlement recorded"
     },
     "audit": { "none": "No audit event" }

package/hedhog/frontend/messages/pt.json

@@ -198,6 +198,44 @@
       "reverse": "Estornar",
       "cancel": "Cancelar"
     },
+    "validation": {
+      "installmentRequired": "Parcela obrigatória",
+      "amountGreaterThanZero": "Valor deve ser maior que zero"
+    },
+    "dialogs": {
+      "cancel": {
+        "title": "Confirmar cancelamento",
+        "description": "Essa ação altera o título para cancelado e não remove os registros de auditoria.",
+        "cancel": "Cancelar",
+        "confirm": "Confirmar cancelamento"
+      },
+      "reverse": {
+        "title": "Confirmar estorno",
+        "description": "Esta ação estorna a liquidação selecionada, recalcula os saldos das parcelas e atualiza o status do título.",
+        "cancel": "Cancelar",
+        "confirm": "Confirmar estorno"
+      }
+    },
+    "settleSheet": {
+      "title": "Registrar baixa",
+      "description": "Informe a parcela e o valor da baixa. O backend valida os estados e limites de valor automaticamente.",
+      "installmentLabel": "Parcela",
+      "installmentPlaceholder": "Selecione",
+      "installmentOption": "Parcela {number} - em aberto: {amount}",
+      "amountLabel": "Valor",
+      "descriptionLabel": "Descrição (opcional)",
+      "confirm": "Confirmar baixa"
+    },
+    "messages": {
+      "approveSuccess": "Título aprovado com sucesso",
+      "approveError": "Não foi possível aprovar o título",
+      "settleSuccess": "Baixa registrada com sucesso",
+      "settleError": "Não foi possível registrar a baixa",
+      "reverseSuccess": "Estorno realizado com sucesso",
+      "reverseError": "Não foi possível estornar a liquidação",
+      "cancelSuccess": "Título cancelado com sucesso",
+      "cancelError": "Não foi possível cancelar o título"
+    },
     "documentData": {
       "title": "Dados do Documento",
       "supplier": "Fornecedor",
@@ -254,6 +292,12 @@
       "fine": "Multa",
       "account": "Conta",
       "method": "Método",
+      "actions": "Ações",
+      "reverseButton": "Estornar",
+      "reverseDialogTitle": "Confirmar estorno",
+      "reverseDialogDescription": "Esta ação cria o estorno da liquidação e recalcula saldos e status.",
+      "reverseDialogCancel": "Cancelar",
+      "reverseDialogConfirm": "Confirmar estorno",
       "none": "Nenhuma liquidação registrada"
     },
     "audit": { "none": "Nenhum evento de auditoria" }

package/hedhog/query/constraints.sql

@@ -102,7 +102,9 @@ BEGIN
 	SELECT COALESCE(SUM(sa.allocated_amount_cents), 0)
 	INTO allocated_total_cents
 	FROM settlement_allocation sa
-	WHERE sa.installment_id = target_installment_id;
+	INNER JOIN settlement s ON s.id = sa.settlement_id
+	WHERE sa.installment_id = target_installment_id
+	AND s.status <> 'reversed';
 
 	IF allocated_total_cents > installment_amount_cents THEN
 		RAISE EXCEPTION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/finance",
-  "version": "0.0.251",
+  "version": "0.0.252",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -9,14 +9,14 @@
     "@nestjs/core": "^11",
     "@nestjs/jwt": "^11",
     "@nestjs/mapped-types": "*",
-    "@hed-hog/api-pagination": "0.0.5",
-    "@hed-hog/contact": "0.0.251",
     "@hed-hog/api-prisma": "0.0.4",
+    "@hed-hog/contact": "0.0.251",
+    "@hed-hog/api-pagination": "0.0.5",
     "@hed-hog/tag": "0.0.251",
     "@hed-hog/api-locale": "0.0.11",
     "@hed-hog/api-types": "0.0.1",
-    "@hed-hog/api": "0.0.3",
-    "@hed-hog/core": "0.0.251"
+    "@hed-hog/core": "0.0.251",
+    "@hed-hog/api": "0.0.3"
   },
   "exports": {
     ".": {

package/src/finance.service.ts

@@ -4,6 +4,7 @@ import { PrismaService } from '@hed-hog/api-prisma';
 import { AiService, FileService } from '@hed-hog/core';
 import {
   BadRequestException,
+  ConflictException,
   forwardRef,
   Inject,
   Injectable,
@@ -833,7 +834,9 @@ export class FinanceService {
     const day7 = this.addDays(today, 7);
     const day30 = this.addDays(today, 30);
 
-    const payableInstallments = this.extractOpenInstallments(payables);
+    const payableInstallments = this.extractOpenInstallments(
+      (payables || []).filter((title) => this.isPayableTitleApproved(title)),
+    );
     const receivableInstallments = this.extractOpenInstallments(receivables);
 
     const saldoCaixa = (bankAccounts || [])
@@ -887,6 +890,11 @@ export class FinanceService {
     );
   }
 
+  private isPayableTitleApproved(title: any) {
+    const status = String(title?.status || '').toLowerCase();
+    return status !== 'rascunho' && status !== 'cancelado';
+  }
+
   private sumInstallmentsDueBetween(
     installments: any[],
     startDate: Date,
@@ -2906,12 +2914,46 @@ export class FinanceService {
         throw new BadRequestException('Title cannot be canceled in current status');
       }
 
+      const hasActiveSettlements = await tx.settlement_allocation.findFirst({
+        where: {
+          financial_installment: {
+            title_id: title.id,
+          },
+          settlement: {
+            status: {
+              not: 'reversed',
+            },
+          },
+        },
+        select: {
+          id: true,
+        },
+      });
+
+      if (hasActiveSettlements) {
+        throw new ConflictException(
+          'Não é possível cancelar enquanto houver liquidações ativas. Estorne primeiro.',
+        );
+      }
+
       await this.assertDateNotInClosedPeriod(
         tx,
         title.competence_date,
         'cancel title',
       );
 
+      await tx.financial_installment.updateMany({
+        where: {
+          title_id: title.id,
+          status: {
+            not: 'canceled',
+          },
+        },
+        data: {
+          status: 'canceled',
+        },
+      });
+
       await tx.financial_title.update({
         where: { id: title.id },
         data: {
@@ -2966,8 +3008,9 @@ export class FinanceService {
       throw new BadRequestException('Invalid settlement date');
     }
 
-    const result = await this.prisma.$transaction(async (tx) => {
-      const title = await tx.financial_title.findFirst({
+    try {
+      const result = await this.prisma.$transaction(async (tx) => {
+        const title = await tx.financial_title.findFirst({
         where: {
           id: titleId,
           title_type: titleType,
@@ -2991,6 +3034,10 @@ export class FinanceService {
       }
 
       if (!['open', 'partial'].includes(title.status)) {
+        if (title.status === 'canceled') {
+          throw new ConflictException('Título cancelado não pode receber baixa');
+        }
+
         throw new BadRequestException(
           'Only open/partial titles can be settled',
         );
@@ -2998,7 +3045,7 @@ export class FinanceService {
 
       await this.assertDateNotInClosedPeriod(
         tx,
-        title.competence_date,
+        settledAt,
         'settle installment',
       );
 
@@ -3022,11 +3069,15 @@ export class FinanceService {
       }
 
       if (installment.status === 'settled' || installment.status === 'canceled') {
-        throw new BadRequestException('This installment cannot be settled');
+        if (installment.status === 'settled') {
+          throw new ConflictException('Parcela já liquidada');
+        }
+
+        throw new ConflictException('Parcela cancelada não pode receber baixa');
       }
 
       if (amountCents > installment.open_amount_cents) {
-        throw new BadRequestException('Settlement amount exceeds open amount');
+        throw new ConflictException('Settlement amount exceeds open amount');
       }
 
       const paymentMethodId = await this.resolvePaymentMethodId(
@@ -3145,16 +3196,27 @@ export class FinanceService {
         throw new NotFoundException('Financial title not found');
       }
 
+        return {
+          title: updatedTitle,
+          settlementId: settlement.id,
+        };
+      });
+
       return {
-        title: updatedTitle,
-        settlementId: settlement.id,
+        ...this.mapTitleToFront(result.title),
+        settlementId: String(result.settlementId),
       };
-    });
+    } catch (error: any) {
+      const message = String(error?.message || '');
 
-    return {
-      ...this.mapTitleToFront(result.title),
-      settlementId: String(result.settlementId),
-    };
+      if (message.includes('Soma de settlement_allocation')) {
+        throw new ConflictException(
+          'Não foi possível registrar a baixa. Existe alocação ativa acima do limite da parcela.',
+        );
+      }
+
+      throw error;
+    }
   }
 
   private async reverseTitleSettlement(
@@ -3228,7 +3290,7 @@ export class FinanceService {
       }
 
       if (settlement.status === 'reversed') {
-        throw new BadRequestException('This settlement is already reversed');
+        throw new ConflictException('Liquidação já estornada.');
       }
 
       for (const allocation of settlement.settlement_allocation) {
@@ -3279,6 +3341,28 @@ export class FinanceService {
         },
       });
 
+      await tx.bank_reconciliation.updateMany({
+        where: {
+          settlement_id: settlement.id,
+          status: 'pending',
+        },
+        data: {
+          status: 'reversed',
+        },
+      });
+
+      await tx.bank_reconciliation.updateMany({
+        where: {
+          settlement_id: settlement.id,
+          status: {
+            in: ['reconciled', 'adjusted'],
+          },
+        },
+        data: {
+          status: 'adjusted',
+        },
+      });
+
       const previousTitleStatus = title.status;
       const nextTitleStatus = await this.recalculateTitleStatus(tx, title.id);