Take cash deposit fees out of the counted cash

A bank charge on a cash deposit comes out of cash that was counted and
banked, so cash on hand is now the count less what reached the bank and
any bank-charge write-off. Before, a deposit fee showed as money "more
than expected".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

frontend/src/app/dashboard/admin/cashup/[id]/page.tsx

@@ -664,7 +664,7 @@ const WRITE_OFF_LABELS: Record<CashupWriteOffCategory, string> = {
 const WRITE_OFF_CATEGORIES = Object.keys(WRITE_OFF_LABELS) as CashupWriteOffCategory[];
 const DEFAULT_WRITE_OFF: Record<CashupMethod, CashupWriteOffCategory> = { cash: "cash_shortfall", card: "card_fees", eft: "bank_charges", other: "other" };
 const BANK_HELP: Record<CashupMethod, string> = {
-  cash: "Deposited into the bank",
+  cash: "What reached the bank, after any deposit fee",
   card: "Settled into the bank account",
   eft: "Showing on the bank statement",
   other: "Received in the bank",
@@ -684,9 +684,11 @@ const amountText = (v: string | number | null | undefined) => (v === null || v =
 function settle(method: CashupMethod, expected: number, counted: number | null, input: SettlementInput) {
   const num = (v: string) => (v.trim() === "" || isNaN(Number(v)) ? null : Number(v));
   const bank = num(input.bankAmount);
-  const onHand = method === "cash" ? (counted !== null ? round2(counted - (bank || 0)) : num(input.onHandAmount)) : null;
-  const pending = method === "cash" ? null : num(input.pendingAmount);
   const writeOffTotal = round2(input.writeOffs.reduce((s, w) => s + (num(w.amount) || 0), 0));
+  // A deposit fee comes out of the counted cash that was banked.
+  const depositFees = round2(input.writeOffs.filter(w => w.category === "bank_charges").reduce((s, w) => s + (num(w.amount) || 0), 0));
+  const onHand = method === "cash" ? (counted !== null ? round2(counted - (bank || 0) - depositFees) : num(input.onHandAmount)) : null;
+  const pending = method === "cash" ? null : num(input.pendingAmount);
   const entered = [bank, onHand, pending].some(v => v !== null) || input.writeOffs.some(w => num(w.amount) !== null);
   const actual = entered ? round2((bank || 0) + (onHand || 0) + (pending || 0)) : null;
   return { bank, onHand, pending, writeOffTotal, actual, unaccounted: actual === null ? null : round2(expected - actual - writeOffTotal) };
@@ -741,7 +743,7 @@ function SettlementCard({ method, data, counted, input, onChange }: {
               <input type="number" step="0.01" min={0} className="w-full border rounded px-2 py-1.5 text-sm" value={input.onHandAmount} onChange={e => set("onHandAmount", e.target.value)} />
             )}
             <p className="text-[10px] text-gray-400 mt-0.5">
-              {counted !== null ? `Counted ${money(counted)}, less what was deposited` : "Not deposited yet. Enter staff cash counts below to work this out."}
+              {counted !== null ? `Counted ${money(counted)}, less what was deposited and any deposit fee` : "Not deposited yet. Enter staff cash counts below to work this out."}
             </p>
           </div>
         ) : (

frontend/src/content/help/dashboard-admin-cashup.tsx

@@ -53,7 +53,7 @@ export const dashboardAdminCashupDetailHelpContent: HelpContent = {
           <p>Each method shows what&apos;s still <strong>unaccounted</strong>. You can close with an unaccounted amount, but you&apos;ll be warned and it comes off profit.</p>
           <div className="space-y-4">
             <GuideItem icon={ClipboardCheck} title="Cash accountability" tone="amber">
-              Counted cash comes from the staff cash-count panel below, where each staff member enters their physical cash by denomination. When counts are entered, cash on hand is the count less what was deposited.
+              Counted cash comes from the staff cash-count panel below, where each staff member enters their physical cash by denomination. When counts are entered, cash on hand is the count less what reached the bank and any deposit fee (written off as a bank charge).
             </GuideItem>
             <GuideItem icon={Wallet} title="Pending money after closing" tone="blue">
               Once the event is closed, pending money shows as outstanding. When it reaches the bank, use Mark received; if it never will, use Write off. You don&apos;t need to reopen the event.