fix(boletos): diferencia pagamentos e recebimentos

2026-06-09 23:06:01 +00:00 · 2026-05-31 15:18:55 -03:00
parent 35abe1b0bf
commit 99bc049cf4
10 changed files with 130 additions and 58 deletions
--- a/src/features/dashboard/components/bills/bill-list-item.tsx
+++ b/src/features/dashboard/components/bills/bill-list-item.tsx
@@ -1,9 +1,11 @@
-import { RiCheckboxCircleFill, RiExternalLinkLine } from "@remixicon/react";
+import { RiCheckboxCircleFill } from "@remixicon/react";
 import Link from "next/link";
 import {
 	buildBillStatusLabel,
 	buildBillWidgetStatusLabel,
+	formatBillWidgetOverdueLabel,
 	isBillOverdue,
+	isIncomeBill,
 } from "@/features/dashboard/bills/bills-helpers";
 import type { DashboardBill } from "@/features/dashboard/bills/bills-queries";
 import { EstablishmentLogo } from "@/shared/components/entity-avatar";
@@ -36,8 +38,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
 	const statusLabel = buildBillWidgetStatusLabel(bill);
 	const absoluteStatusLabel = buildBillStatusLabel(bill);
 	const overdue = isBillOverdue(bill);
+	const income = isIncomeBill(bill);
+	const overdueLabel = formatBillWidgetOverdueLabel(bill);
 	const statusTooltipLabel =
-		statusLabel && statusLabel !== absoluteStatusLabel
+		overdueLabel || (statusLabel && statusLabel !== absoluteStatusLabel)
 			? absoluteStatusLabel
 			: null;
 	const href = buildTransactionsHref(bill.name, period);
@@ -53,10 +57,6 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
 						className="inline-flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
 					>
 						<span className="truncate">{bill.name}</span>
-						<RiExternalLinkLine
-							className="size-3 shrink-0 text-muted-foreground"
-							aria-hidden
-						/>
 					</Link>
 					<div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
 						{statusLabel ? (
@@ -67,9 +67,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
 											className={cn(
 												"cursor-help rounded-full py-0.5",
 												bill.isSettled && "text-success font-semibold",
+												overdue && "text-destructive font-semibold",
 											)}
 										>
-											{statusLabel}
+											{overdueLabel ?? statusLabel}
 										</span>
 									</TooltipTrigger>
 									<TooltipContent side="top">
@@ -81,9 +82,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
 									className={cn(
 										"rounded-full py-0.5",
 										bill.isSettled && "text-success font-semibold",
+										overdue && "text-destructive font-semibold",
 									)}
 								>
-									{statusLabel}
+									{overdueLabel ?? statusLabel}
 								</span>
 							)
 						) : null}
@@ -93,29 +95,35 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {

 			<div className="flex shrink-0 flex-col items-end">
 				<MoneyValues className="font-medium" amount={bill.amount} />
-				<Button
-					type="button"
-					size="sm"
-					variant="link"
-					className="h-auto p-0 disabled:opacity-100"
-					disabled={bill.isSettled}
-					onClick={() => onPay(bill.id)}
-				>
-					{bill.isSettled ? (
-						<span className="flex items-center gap-0.5 text-success">
-							<RiCheckboxCircleFill className="size-3.5" /> Pago
-						</span>
-					) : overdue ? (
-						<span className="overdue-blink">
-							<span className="overdue-blink-primary text-destructive">
-								Atrasado
+				{bill.isSettled ? (
+					<span className="flex h-7 items-center gap-0.5 text-xs font-medium text-success">
+						<RiCheckboxCircleFill className="size-3.5" />{" "}
+						{income ? "Recebido" : "Pago"}
+					</span>
+				) : (
+					<Button
+						type="button"
+						size="sm"
+						variant="link"
+						className="-mr-1.5 h-7 px-1.5 py-0"
+						onClick={() => onPay(bill.id)}
+					>
+						{overdue ? (
+							<span className="overdue-blink">
+								<span className="overdue-blink-primary text-destructive">
+									{income ? "Atrasada" : "Atrasado"}
+								</span>
+								<span className="overdue-blink-secondary">
+									{income ? "Receber" : "Pagar"}
+								</span>
 							</span>
-							<span className="overdue-blink-secondary">Pagar</span>
-						</span>
-					) : (
-						"Pagar"
-					)}
-				</Button>
+						) : income ? (
+							"Receber"
+						) : (
+							"Pagar"
+						)}
+					</Button>
+				)}
 			</div>
 		</li>
 	);
--- a/src/features/dashboard/components/bills/bill-payment-dialog.tsx
+++ b/src/features/dashboard/components/bills/bill-payment-dialog.tsx
@@ -7,6 +7,7 @@ import {
 	type BillDialogState,
 	formatBillDateLabel,
 	getBillStatusBadgeVariant,
+	isIncomeBill,
 } from "@/features/dashboard/bills/bills-helpers";
 import type {
 	BillPaymentAccountOption,
@@ -66,11 +67,13 @@ export function BillPaymentDialog({
 	onConfirm,
 }: BillPaymentDialogProps) {
 	const isProcessing = modalState === "processing" || isPending;
+	const income = bill ? isIncomeBill(bill) : false;
+	const settlementLabel = income ? "Recebido" : "Pago";
 	const dueLabel = bill
 		? formatBillDateLabel(bill.dueDate, "Vencimento:")
 		: null;
 	const paidLabel = bill
-		? formatBillDateLabel(bill.boletoPaymentDate, "Pago em:")
+		? formatBillDateLabel(bill.boletoPaymentDate, `${settlementLabel} em:`)
 		: null;
 	const isBillPending = bill ? !bill.isSettled : false;
 	const paymentDateValue = paymentDate.toISOString().split("T")[0] ?? "";
@@ -103,8 +106,8 @@ export function BillPaymentDialog({
 			>
 				{modalState === "success" ? (
 					<PaymentSuccess
-						title="Pagamento registrado!"
-						description="Atualizamos o status do boleto para pago. Em instantes ele aparecerá como baixado no histórico."
+						title={income ? "Recebimento registrado!" : "Pagamento registrado!"}
+						description={`Atualizamos o status do boleto para ${income ? "recebido" : "pago"}. Em instantes ele aparecerá como baixado no histórico.`}
 						onClose={onClose}
 					/>
 				) : (
@@ -112,10 +115,12 @@ export function BillPaymentDialog({
 						<DialogHeader>
 							<div className="mb-1 flex items-center gap-3">
 								<div>
-									<DialogTitle>Confirmar pagamento</DialogTitle>
+									<DialogTitle>
+										{income ? "Confirmar recebimento" : "Confirmar pagamento"}
+									</DialogTitle>
 									<DialogDescription className="mt-1 text-xs">
 										{isBillPending
-											? "Escolha a conta de origem e a data em que o boleto foi pago."
+											? `Escolha a conta de ${income ? "destino" : "origem"} e a data em que o boleto foi ${income ? "recebido" : "pago"}.`
 											: "Boleto"}
 									</DialogDescription>
 								</div>
@@ -158,12 +163,15 @@ export function BillPaymentDialog({
 										<div className="flex items-center gap-1.5 text-muted-foreground">
 											<RiCalendarLine className="size-3.5" />
 											<span className="text-xs font-medium uppercase">
-												{bill.isSettled ? "Pago em" : "Vencimento"}
+												{bill.isSettled
+													? `${settlementLabel} em`
+													: "Vencimento"}
 											</span>
 										</div>
 										<p className="font-semibold">
 											{bill.isSettled
-												? (paidLabel?.replace("Pago em: ", "") ?? "—")
+												? (paidLabel?.replace(`${settlementLabel} em: `, "") ??
+													"—")
 												: (dueLabel?.replace("Vencimento: ", "") ?? "—")}
 										</p>
 									</Card>
@@ -175,7 +183,7 @@ export function BillPaymentDialog({
 									<div className="space-y-3">
 										<div className="space-y-2">
 											<Label htmlFor="bill-widget-payment-account">
-												Conta de pagamento
+												Conta de {income ? "recebimento" : "pagamento"}
 											</Label>
 											<Select
 												value={paymentAccountId}
@@ -212,7 +220,7 @@ export function BillPaymentDialog({

 										<div className="space-y-2">
 											<Label htmlFor="bill-widget-payment-date">
-												Data do pagamento
+												Data do {income ? "recebimento" : "pagamento"}
 											</Label>
 											<DatePicker
 												id="bill-widget-payment-date"
@@ -231,8 +239,8 @@ export function BillPaymentDialog({
 										<span className="text-sm text-muted-foreground">
 											Status atual
 										</span>
-										<Badge variant={getBillStatusBadgeVariant("Pago")}>
-											Pago
+										<Badge variant={getBillStatusBadgeVariant(settlementLabel)}>
+											{settlementLabel}
 										</Badge>
 									</div>
 								)}
--- a/src/features/dashboard/components/bills/bills-list.tsx
+++ b/src/features/dashboard/components/bills/bills-list.tsx
@@ -15,7 +15,7 @@ export function BillsList({ bills, period, onPay }: BillsListProps) {
 			<WidgetEmptyState
 				icon={<RiBarcodeFill className="size-6 text-muted-foreground" />}
 				title="Nenhum boleto cadastrado para o período selecionado"
-				description="Cadastre boletos para monitorar os pagamentos aqui."
+				description="Cadastre boletos para monitorar os vencimentos aqui."
 			/>
 		);
 	}
--- a/src/features/dashboard/components/bills/bills-widget-view.tsx
+++ b/src/features/dashboard/components/bills/bills-widget-view.tsx
@@ -41,9 +41,7 @@ export function BillsWidgetView({
 }: BillsWidgetViewProps) {
 	return (
 		<>
-			<div className="flex flex-col gap-4">
-				<BillsList bills={bills} period={period} onPay={onOpenPaymentDialog} />
-			</div>
+			<BillsList bills={bills} period={period} onPay={onOpenPaymentDialog} />

 			<BillPaymentDialog
 				bill={selectedBill}