- Supervisor Payments: mode tabs now wrap on mobile instead of overflowing off-screen. - Reconciling a Yoco transaction as a donation now lets staff pick who it's from. - Reports payment-method breakdown now buckets into Cash/Card/EFT/Other everywhere, folding Apple Pay, Google Pay, and Yoco-portal payments into Card. - Refunds now net against their original method's bucket (Cashup/Finance/Profit reports, My Payments filtering/display) instead of vanishing or falling into "Other". - Refund form's method dropdown mirrors the real payment methods and auto-fills from the payment being refunded, replacing an ambiguous generic "Refund" option. - Fixed donation remaining/unallocated balance inflating instead of shrinking when a donation is refunded (assign-donation endpoint, cashup reports, donations reports, and the Assign Donation panel all summed refund legs with the wrong sign). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
35 lines
1.5 KiB
TypeScript
35 lines
1.5 KiB
TypeScript
// Payment.method is free-text — online checkouts get tagged with whatever wallet type the
|
|
// gateway reports (apple_pay, google_pay, ...), not just the manual-entry methods below.
|
|
// Mirrors normalizeUserMethod in backend/src/controllers/paymentController.js: card-network
|
|
// wallets count as "card" (same settlement, no separate float); anything else is "other".
|
|
const USER_FACING_METHODS = ["cash", "card", "eft", "voucher"];
|
|
const CARD_ALIASES = ["apple_pay", "google_pay"];
|
|
|
|
const METHOD_LABELS: Record<string, string> = {
|
|
cash: "Cash",
|
|
card: "Card",
|
|
eft: "EFT",
|
|
voucher: "Voucher",
|
|
other: "Other",
|
|
};
|
|
|
|
// Refund methods are recorded as "<method>-refund" (e.g. "card-refund") so a refund nets
|
|
// against the same bucket its original payment counted under. Strip that suffix before
|
|
// bucketing so a card refund still displays as "Card", not "Other" — the negative amount
|
|
// already signals it's a refund.
|
|
function stripRefundSuffix(method: string): string {
|
|
return method.endsWith("-refund") ? method.slice(0, -"-refund".length) : method;
|
|
}
|
|
|
|
export function normalizePaymentMethod(method: string | null | undefined): string {
|
|
const m = stripRefundSuffix(String(method || "").toLowerCase());
|
|
if (USER_FACING_METHODS.includes(m)) return m;
|
|
if (CARD_ALIASES.includes(m)) return "card";
|
|
return "other";
|
|
}
|
|
|
|
export function formatPaymentMethod(method: string | null | undefined): string {
|
|
if (!method) return "Payment";
|
|
return METHOD_LABELS[normalizePaymentMethod(method)];
|
|
}
|