@ticketboothapp/booking 1.2.147 → 1.2.149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.147",
+  "version": "1.2.149",
   "private": false,
   "sideEffects": [
     "**/*.css",

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -43,6 +43,15 @@ function hasTaxLine(lines: PriceSummaryLine[]): boolean {
   );
 }
 
+function amendmentLineOrder(line: PriceSummaryLine): number {
+  if (line.kind === 'ticket') return 0;
+  const type = String(line.type ?? '').toUpperCase();
+  if (type === 'TICKET') return 0;
+  if (type === 'RETURN_OPTION' || type === 'CANCELLATION_UPGRADE') return 1;
+  if (type === 'FEE' || type === 'ADD_ON') return 2;
+  return 3;
+}
+
 export function AdminChangeReceiptComparison({
   originalReceipt,
   amendmentLines,
@@ -61,6 +70,39 @@ export function AdminChangeReceiptComparison({
   const existingLines = originalLines(originalReceipt);
   const originalCurrency = originalReceipt.currency ?? currency;
   const quoteReady = amendmentLines != null && amountDue != null && updatedTotal != null;
+  const amendmentTax = amendmentLines?.reduce(
+    (sum, line) =>
+      line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
+        ? sum + line.amount
+        : sum,
+    0,
+  ) ?? 0;
+  const amendmentNonTaxLines = amendmentLines
+    ? amendmentLines
+        .filter(
+          (line) => line.kind !== 'line' || String(line.type ?? '').toUpperCase() !== 'TAX',
+        )
+        .map((line, index) => ({ line, index }))
+        .sort((a, b) => amendmentLineOrder(a.line) - amendmentLineOrder(b.line) || a.index - b.index)
+        .map(({ line }) => line)
+    : [];
+  const amendmentSubtotal = amendmentNonTaxLines.reduce(
+    (sum, line) => sum + (line.kind === 'ticket' ? line.itemTotal : line.amount),
+    0,
+  );
+  const amendmentDisplayLines: PriceSummaryLine[] = amendmentLines
+    ? [
+        ...amendmentNonTaxLines,
+        ...(Math.abs(amendmentTax) >= 0.005
+          ? [{
+              kind: 'line' as const,
+              label: amendmentTax < 0 ? 'Refunded tax' : 'Additional tax',
+              amount: amendmentTax,
+              type: 'TAX',
+            }]
+          : []),
+      ]
+    : [];
   const amountDueClass =
     amountDue != null && amountDue < -0.005
       ? 'text-emerald-700'
@@ -114,16 +156,17 @@ export function AdminChangeReceiptComparison({
             <div className="rounded-md border border-dashed border-stone-300 bg-white/70 px-3 py-4 text-center">
               <p className="text-sm font-medium text-stone-700">Waiting for server price…</p>
             </div>
-          ) : amendmentLines.length === 0 && Math.abs(amountDue) < 0.005 ? (
+          ) : amendmentDisplayLines.length === 0 && Math.abs(amountDue) < 0.005 ? (
             <div className="rounded-md border border-dashed border-stone-300 bg-white/70 px-3 py-4 text-center">
               <p className="text-sm font-medium text-stone-700">No pricing changes</p>
             </div>
           ) : (
             <PriceSummary
-              lines={amendmentLines}
+              lines={amendmentDisplayLines}
               total={amountDue}
               currency={currency}
               locale={displayLocale}
+              subtotal={amendmentSubtotal}
               size="sm"
               t={t}
             />

package/src/lib/booking/change-booking-server-preview.ts

@@ -132,6 +132,19 @@ function breakdownFromPriceBasis(priceBasis: PriceBasisSnapshot | null | undefin
   };
 }
 
+function finalUnitOnlyBreakdown(itemTotal: number, quantity: number) {
+  const finalUnitAmount = quantity > 0 ? roundMoney(itemTotal / quantity) : roundMoney(itemTotal);
+  return {
+    lineItems: [],
+    subtotalAfterAdjustments: finalUnitAmount,
+    feeLines: [],
+    taxRate: 0,
+    taxAmount: 0,
+    isTaxIncluded: false,
+    finalPrice: finalUnitAmount,
+  };
+}
+
 function hasPaymentCreditLine(lines: PriceSummaryLine[]): boolean {
   return lines.some((line) => {
     if (line.kind !== 'line') return false;
@@ -193,7 +206,8 @@ export function mapQuoteLineItemsToPriceSummaryLines(
         category,
         qty: qty > 0 ? qty : 1,
         itemTotal: amount,
-        breakdown: breakdownFromPriceBasis(item.priceBasis),
+        breakdown:
+          breakdownFromPriceBasis(item.priceBasis) ?? finalUnitOnlyBreakdown(amount, qty > 0 ? qty : 1),
       });
       continue;
     }
@@ -213,7 +227,8 @@ export function mapQuoteLineItemsToPriceSummaryLines(
         category: lettersOnly,
         qty,
         itemTotal: amount,
-        breakdown: breakdownFromPriceBasis(item.priceBasis),
+        breakdown:
+          breakdownFromPriceBasis(item.priceBasis) ?? finalUnitOnlyBreakdown(amount, qty),
       });
       continue;
     }