fix(invoice): partial refund stays "Bezahlt" + use "Endbetrag" final-row label
Two related bugs surfaced when a paid order was partially refunded
(Shopify flips `displayFinancialStatus` to PARTIALLY_REFUNDED as soon
as *any* refund is posted, even a small one):
1. The status row showed "Erstattet" / "Refunded" even though the
customer paid in full and the merchant kept the difference. The
correct status is "Bezahlt" / "Paid" — only when the refund equals
(or, defensively, exceeds) the gross is the order genuinely
refunded.
2. The final row beneath the new refund block was labelled "Offener
Betrag" / "Outstanding amount", falsely suggesting the customer
still owes the kept portion. For an order that has been refunded
but is no longer owing anything, that row is just the final amount
the merchant kept — "Endbetrag" / "Total".
Truth table now implemented:
displayFinancialStatus | refunded | paymentStatus | final-row label
-----------------------+--------------+---------------+-----------------
PAID | 0 | paid | (no refund rows)
PAID | >0 | paid | Endbetrag
PARTIALLY_REFUNDED | < gross | paid (NEW) | Endbetrag (NEW)
PARTIALLY_REFUNDED | == gross | refunded | Endbetrag
REFUNDED | == gross | refunded | Endbetrag
PARTIALLY_PAID | 0 | partial | (no refund rows)
PARTIALLY_PAID | >0 (exotic) | partial | Offener Betrag
PENDING/AUTHORIZED/etc | 0 | unpaid | (no refund rows)
storno / offer | 0 (forced) | n/a | n/a
Implementation:
- composeInvoice.ts: after computing refundedAmount, reclassify
paymentStatus="refunded" → "paid" when 0 < refundedAmount <
totals.gross. requiresPayment is derived from paymentStatus, so
it correctly stays false for partial-refund-on-paid (no GiroCode,
no payment terms — nothing is owed).
- i18n.ts: new `finalAmountLabel` ("Endbetrag" / "Total") in both
languages.
- InvoiceDocument.tsx: the final-row label now picks
outstandingLabel vs. finalAmountLabel based on requiresPayment,
so PARTIALLY_PAID with a refund still says "Offener Betrag"
while PARTIALLY_REFUNDED says "Endbetrag".
Verification: render-sample now runs four refund scenarios — paid +
no refund (regression guard), full refund (status=Erstattet, final
row=Endbetrag 0,00 EUR), partial refund on a paid order (status=
Bezahlt, final row=Endbetrag, no Erstattet), and PARTIALLY_REFUNDED
with refund==gross (status stays refunded). tsc / smoke / tests /
build all green.
This commit is contained in:
@@ -87,19 +87,34 @@ export function composeInvoice({
|
||||
: undefined;
|
||||
|
||||
const paid = (order.displayFinancialStatus || "").toUpperCase() === "PAID";
|
||||
const paymentStatus = derivePaymentStatus(order.displayFinancialStatus);
|
||||
// A document only requires payment when it's a regular invoice (not a
|
||||
// storno or an offer) AND money is still actually owed. Refunded and
|
||||
// paid orders both have a 0 outstanding balance — the difference is
|
||||
// just whether the money was kept (`paid`) or returned (`refunded`).
|
||||
const requiresPayment =
|
||||
!storno && !offer && paymentStatus !== "paid" && paymentStatus !== "refunded";
|
||||
// Refunded gross amount, mirrored from Shopify's `totalRefundedSet`.
|
||||
// Storno/offer documents don't carry a refund row — a storno *is*
|
||||
// already the cancellation document, and offers have no payments yet.
|
||||
const refundedAmount = storno || offer
|
||||
? 0
|
||||
: Math.max(0, parseFloat(order.totalRefundedSet?.shopMoney.amount ?? "0") || 0);
|
||||
let paymentStatus = derivePaymentStatus(order.displayFinancialStatus);
|
||||
// Reclassification: Shopify flips `displayFinancialStatus` to
|
||||
// PARTIALLY_REFUNDED as soon as *any* refund is posted against a
|
||||
// paid order, even when the customer only got back a small fraction.
|
||||
// For our purposes such an order is still "paid" — the merchant kept
|
||||
// the difference — and showing "Erstattet" / "Refunded" in the
|
||||
// status row would falsely imply the customer got everything back.
|
||||
// Only when the refund equals (or, defensively, exceeds) the gross
|
||||
// do we keep the "refunded" status.
|
||||
if (
|
||||
paymentStatus === "refunded" &&
|
||||
refundedAmount > 0 &&
|
||||
refundedAmount < totals.gross
|
||||
) {
|
||||
paymentStatus = "paid";
|
||||
}
|
||||
// A document only requires payment when it's a regular invoice (not a
|
||||
// storno or an offer) AND money is still actually owed. Refunded and
|
||||
// paid orders both have a 0 outstanding balance — the difference is
|
||||
// just whether the money was kept (`paid`) or returned (`refunded`).
|
||||
const requiresPayment =
|
||||
!storno && !offer && paymentStatus !== "paid" && paymentStatus !== "refunded";
|
||||
const paymentGatewayNames = (order.paymentGatewayNames ?? []).filter(
|
||||
(n) => typeof n === "string" && n.trim().length > 0,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user