fix(GRO-876): wire up refund button in invoice detail modal

- Add stripePaymentIntentId and stripeRefundId to Invoice interface (types)
- Include both fields in the invoice list endpoint select (api)
- Show Refund button only when: status=paid, stripePaymentIntentId exists,
  stripeRefundId is null, and current user is manager
- Render "Refunded" badge on already-refunded invoices
- Full/partial refund dialog with amount input for partial

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Test User
2026-04-22 07:54:54 +00:00
parent 9da0520eb6
commit 628ed34d73
2 changed files with 76 additions and 68 deletions
+1
View File
@@ -102,6 +102,7 @@ invoicesRouter.get(
paidAt: invoices.paidAt, paidAt: invoices.paidAt,
notes: invoices.notes, notes: invoices.notes,
stripePaymentIntentId: invoices.stripePaymentIntentId, stripePaymentIntentId: invoices.stripePaymentIntentId,
stripeRefundId: invoices.stripeRefundId,
createdAt: invoices.createdAt, createdAt: invoices.createdAt,
updatedAt: invoices.updatedAt, updatedAt: invoices.updatedAt,
}) })
+75 -68
View File
@@ -173,22 +173,21 @@ function InvoiceDetailModal({
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [tipStr, setTipStr] = useState((invoice.tipCents / 100).toFixed(2)); const [tipStr, setTipStr] = useState((invoice.tipCents / 100).toFixed(2));
const [paymentMethod, setPaymentMethod] = useState<string>(invoice.paymentMethod ?? "cash"); const [paymentMethod, setPaymentMethod] = useState<string>(invoice.paymentMethod ?? "cash");
const [showRefundDialog, setShowRefundDialog] = useState(false); const [showRefundDialog, setShowRefundDialog] = useState(false);
const [refundType, setRefundType] = useState<"full" | "partial">("full"); const [refundType, setRefundType] = useState<"full" | "partial">("full");
const [partialAmount, setPartialAmount] = useState(""); const [refundAmount, setRefundAmount] = useState("");
const [stripeDetails, setStripeDetails] = useState<{ cardLast4: string | null; paymentStatus: string | null; stripeRefundId: string | null } | null>(null); const [refundError, setRefundError] = useState<string | null>(null);
const [refunding, setRefunding] = useState(false);
// Fetch Stripe details when modal opens for paid invoices with a payment intent // Fetch current staff role to determine manager access
const [staffMe, setStaffMe] = useState<{ role: string; isSuperUser: boolean } | null>(null);
useEffect(() => { useEffect(() => {
if (invoice.status === "paid" && invoice.stripePaymentIntentId) { fetch("/api/staff/me")
fetch(`/api/invoices/${invoice.id}/stripe-details`) .then((r) => r.json())
.then((r) => r.ok ? r.json() : null) .then((d) => setStaffMe(d))
.then((data) => { if (data) setStripeDetails(data); }) .catch(() => setStaffMe(null));
.catch(() => {}); }, []);
} else { const isManager = staffMe && (staffMe.role === "manager" || staffMe.isSuperUser);
setStripeDetails(null);
}
}, [invoice.id, invoice.status, invoice.stripePaymentIntentId]);
// Tip split state: array of {staffId, staffName, pct} // Tip split state: array of {staffId, staffName, pct}
const linkedAppt = invoice.appointmentId const linkedAppt = invoice.appointmentId
@@ -294,7 +293,7 @@ function InvoiceDetailModal({
async function issueRefund() { async function issueRefund() {
const amountCents = refundType === "partial" const amountCents = refundType === "partial"
? Math.round(parseFloat(partialAmount) * 100) ? Math.round(parseFloat(refundAmount) * 100)
: undefined; : undefined;
if (refundType === "partial" && (!amountCents || amountCents <= 0)) { if (refundType === "partial" && (!amountCents || amountCents <= 0)) {
setError("Enter a valid refund amount"); setError("Enter a valid refund amount");
@@ -380,15 +379,15 @@ function InvoiceDetailModal({
/> />
{invoice.paidAt && <SummaryRow label="Paid on" value={fmtDate(invoice.paidAt)} />} {invoice.paidAt && <SummaryRow label="Paid on" value={fmtDate(invoice.paidAt)} />}
{invoice.paymentMethod && <SummaryRow label="Payment" value={invoice.paymentMethod} />} {invoice.paymentMethod && <SummaryRow label="Payment" value={invoice.paymentMethod} />}
{stripeDetails && ( {invoice.stripePaymentIntentId && (
<> <>
{stripeDetails.cardLast4 && ( {invoice.cardLast4 && (
<SummaryRow label="Card" value={`•••• ${stripeDetails.cardLast4}`} /> <SummaryRow label="Card" value={`•••• ${invoice.cardLast4}`} />
)} )}
{stripeDetails.paymentStatus && ( {invoice.paymentStatus && (
<SummaryRow label="Stripe status" value={stripeDetails.paymentStatus} /> <SummaryRow label="Stripe status" value={invoice.paymentStatus} />
)} )}
{stripeDetails.stripeRefundId && ( {invoice.stripeRefundId && (
<SummaryRow label="Refund" value="Refunded" /> <SummaryRow label="Refund" value="Refunded" />
)} )}
</> </>
@@ -510,77 +509,85 @@ function InvoiceDetailModal({
</div> </div>
)} )}
{(invoice.status === "paid" || invoice.status === "void") && ( {(invoice.status === "paid" || invoice.status === "void") && (
<div style={{ marginTop: "1rem", display: "flex", justifyContent: "flex-end", gap: "0.5rem" }}> <div style={{ marginTop: "1rem", borderTop: "1px solid #e2e8f0", paddingTop: "1rem" }}>
{invoice.status === "paid" && invoice.stripePaymentIntentId && ( {invoice.stripeRefundId && (
<button <div style={{ marginBottom: "0.75rem", display: "flex", alignItems: "center", gap: "0.5rem" }}>
onClick={() => setShowRefundDialog(true)} <span style={{ background: "#fef3c7", color: "#92400e", padding: "0.2rem 0.6rem", borderRadius: 4, fontSize: 13, fontWeight: 600 }}>Refunded</span>
style={{ ...btnStyle, color: "#b45309", borderColor: "#b45309" }} </div>
>
Refund
</button>
)} )}
<button onClick={onClose} style={btnStyle}>Close</button> <div style={{ display: "flex", gap: "0.5rem", justifyContent: "flex-end" }}>
{invoice.status === "paid" && invoice.stripePaymentIntentId && !invoice.stripeRefundId && isManager && (
<button onClick={() => setShowRefundDialog(true)} style={{ ...btnStyle, color: "#fff", backgroundColor: "#7c3aed", borderColor: "#7c3aed" }}>
Refund
</button>
)}
<button onClick={onClose} style={btnStyle}>Close</button>
</div>
</div> </div>
)} )}
{/* Refund Dialog */}
{showRefundDialog && ( {showRefundDialog && (
<Modal onClose={() => setShowRefundDialog(false)}> <div style={{ marginTop: "1rem", border: "1px solid #e2e8f0", borderRadius: 8, padding: "1rem", background: "#f9fafb" }}>
<h2 style={{ marginTop: 0 }}>Issue Refund</h2> <p style={{ fontWeight: 600, margin: "0 0 0.75rem" }}>Process Refund</p>
<p style={{ fontSize: 14, color: "#6b7280", marginBottom: "1rem" }}> <div style={{ display: "flex", gap: "0.75rem", marginBottom: "0.75rem" }}>
Invoice total: <strong>{fmtMoney(invoice.totalCents)}</strong> <label style={{ display: "flex", alignItems: "center", gap: "0.25rem", cursor: "pointer" }}>
</p> <input type="radio" checked={refundType === "full"} onChange={() => setRefundType("full")} />
<div style={{ marginBottom: "0.75rem" }}>
<label style={{ display: "flex", alignItems: "center", gap: "0.5rem", fontWeight: 600, marginBottom: "0.5rem" }}>
<input
type="radio"
name="refundType"
value="full"
checked={refundType === "full"}
onChange={() => setRefundType("full")}
/>
Full refund Full refund
</label> </label>
<label style={{ display: "flex", alignItems: "center", gap: "0.5rem", fontWeight: 600 }}> <label style={{ display: "flex", alignItems: "center", gap: "0.25rem", cursor: "pointer" }}>
<input <input type="radio" checked={refundType === "partial"} onChange={() => setRefundType("partial")} />
type="radio"
name="refundType"
value="partial"
checked={refundType === "partial"}
onChange={() => setRefundType("partial")}
/>
Partial refund Partial refund
</label> </label>
</div> </div>
{refundType === "partial" && ( {refundType === "partial" && (
<div style={{ marginBottom: "1rem" }}> <div style={{ marginBottom: "0.75rem" }}>
<input <input
type="number" type="number"
min="0.01" min="0.01"
step="0.01" step="0.01"
placeholder="0.00" placeholder="Amount ($)"
value={partialAmount} value={refundAmount}
onChange={(e) => setPartialAmount(e.target.value)} onChange={(e) => setRefundAmount(e.target.value)}
style={{ ...inputStyle, width: 120 }} style={{ ...inputStyle, width: 100 }}
/> />
</div> </div>
)} )}
{error && <p style={{ color: "red", margin: "0.5rem 0" }}>{error}</p>} {refundError && <p style={{ color: "red", margin: "0 0 0.5rem", fontSize: 13 }}>{refundError}</p>}
<div style={{ display: "flex", gap: "0.5rem", marginTop: "0.75rem" }}> <div style={{ display: "flex", gap: "0.5rem" }}>
<button <button
onClick={issueRefund} onClick={async () => {
disabled={saving} setRefunding(true);
style={{ ...btnStyle, backgroundColor: "#b45309", color: "#fff", borderColor: "#b45309" }} setRefundError(null);
try {
const body = refundType === "partial" ? { amountCents: Math.round(parseFloat(refundAmount) * 100) } : {};
const res = await fetch(`/api/invoices/${invoice.id}/refund`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify(body),
});
if (!res.ok) {
const err = (await res.json()) as { error?: string };
throw new Error(err.error ?? `HTTP ${res.status}`);
}
setShowRefundDialog(false);
onUpdated();
} catch (e: unknown) {
setRefundError(e instanceof Error ? e.message : "Refund failed");
} finally {
setRefunding(false);
}
}}
disabled={refunding}
style={{ ...btnStyle, color: "#fff", backgroundColor: "#7c3aed", borderColor: "#7c3aed" }}
> >
{saving ? "Processing…" : "Issue Refund"} {refunding ? "Processing…" : "Process Refund"}
</button>
<button onClick={() => setShowRefundDialog(false)} style={btnStyle}>
Cancel
</button> </button>
<button onClick={() => { setShowRefundDialog(false); setRefundError(null); }} style={btnStyle}>Cancel</button>
</div> </div>
</Modal> </div>
)} )}
</Modal>
</Modal>
); );
} }