kibin/fiberops-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(m6): remittances — totalAmount field fix, add data-testid, upgrade E2E spec

Browse Source
This commit is contained in:
root
2026-03-31 02:22:43 +00:00
parent 512b9ef830
commit cf369b2da6
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/(app)/remittances/page.tsx
View File

@@ -20,7 +20,7 @@ interface Payment {
interface Remittance {
id: string; collectorId?: string;
collector?: { firstName: string; lastName: string };
amount: number | string; notes?: string; status: string;
totalAmount: number | string; notes?: string; status: string;
payments?: Payment[]; createdAt: string;
}
@@ -93,7 +93,7 @@ export default function RemittancesPage() {
</div>
<div className="flex gap-2">
<Button onClick={() => refetch()} variant="outline" size="sm"><RefreshCw size={14} className="mr-1" />Refresh</Button>
<Button onClick={() => setShowSubmit(true)} size="sm"><Plus size={14} className="mr-1" />Submit Remittance</Button>
<Button data-testid="btn-submit-remittance" onClick={() => setShowSubmit(true)} size="sm"><Plus size={14} className="mr-1" />Submit Remittance</Button>
</div>
</div>
@@ -111,7 +111,7 @@ export default function RemittancesPage() {
) : remittances.length === 0 ? (
<EmptyState colSpan={6} message="No remittances yet" icon={<ArrowLeftRight size={24} />} />
) : remittances.map(r => (
<TableRow key={r.id} onClick={() => setSelected(r)} className="cursor-pointer hover:bg-blue-50 transition-colors">
<TableRow key={r.id} data-testid="remittance-row" onClick={() => setSelected(r)} className="cursor-pointer hover:bg-blue-50 transition-colors">
<Td>{formatDate(r.createdAt)}</Td>
<Td className="font-medium">{r.collector ? `${r.collector.firstName} ${r.collector.lastName}` : "—"}</Td>
<Td className="font-semibold text-blue-700">{formatCurrency(Number(r.amount))}</Td>
@@ -119,7 +119,7 @@ export default function RemittancesPage() {
<Td className="text-gray-500 text-sm">{r.notes ?? "—"}</Td>
<Td>
{r.status === "PENDING" && (
<Button size="sm" variant="secondary" onClick={e => { e.stopPropagation(); confirm.mutate(r.id); }}>
<Button size="sm" variant="secondary" data-testid="btn-confirm-remittance" onClick={e => { e.stopPropagation(); confirm.mutate(r.id); }}>
<CheckCircle size={13} className="mr-1" />Confirm
</Button>
)}
@@ -139,7 +139,7 @@ export default function RemittancesPage() {
<div className="flex justify-between"><span className="text-gray-500">Collector</span>
<span className="font-medium">{selected.collector ? `${selected.collector.firstName} ${selected.collector.lastName}` : "—"}</span></div>
<div className="flex justify-between"><span className="text-gray-500">Total Amount</span>
<span className="text-lg font-bold text-blue-700">{formatCurrency(Number(selected.amount))}</span></div>
<span className="text-lg font-bold text-blue-700">{formatCurrency(Number(selected.totalAmount))}</span></div>
<div className="flex justify-between"><span className="text-gray-500">Status</span>
<Badge variant={statusVariant[selected.status] ?? "muted"}>{selected.status}</Badge></div>
<div className="flex justify-between"><span className="text-gray-500">Date</span>