@ticketboothapp/booking 1.2.185 → 1.2.186

package/package.json

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

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -222,7 +222,7 @@ export function AdminChangeReceiptComparison({
       line.overrideComponentId ? [[line.overrideComponentId, line] as const] : [],
     ),
   );
-  const summaryDisplayLines = rawSummaryDisplayLines
+  const allSummaryDisplayLines = rawSummaryDisplayLines
     .filter((line) => !(line.kind === 'line' && line.label.startsWith('Override · ')))
     .map((line) => {
       const type = line.kind === 'ticket' ? 'TICKET' : String(line.type ?? '').toUpperCase();
@@ -235,6 +235,18 @@ export function AdminChangeReceiptComparison({
         ),
       };
     });
+  const isRemovedSummaryLine = (line: PriceSummaryLine) => {
+    if (!line.editable || !line.componentId) return false;
+    const override = overrideByComponentId.get(line.componentId);
+    if (!override) return false;
+    const baseAmount = line.kind === 'ticket' ? line.itemTotal : line.amount;
+    const targetAmount = baseAmount + override.amountSign * Number(override.amountInput);
+    return Number.isFinite(targetAmount) && Math.abs(targetAmount) < 0.005;
+  };
+  const summaryDisplayLines = allSummaryDisplayLines.filter(
+    (line) => !isRemovedSummaryLine(line),
+  );
+  const removedSummaryDisplayLines = allSummaryDisplayLines.filter(isRemovedSummaryLine);
   const quotedOverrideAmountInputs = Object.fromEntries(
     summaryDisplayLines.flatMap((line) => {
       if (!line.componentId || !line.lineKey) return [];
@@ -267,6 +279,34 @@ export function AdminChangeReceiptComparison({
       return next;
     });
   };
+  const handleOverrideRemove = (lineKey: string) => {
+    const line = summaryDisplayLines.find((candidate) => candidate.lineKey === lineKey);
+    if (!line?.componentId) return;
+    const baseAmount = line.kind === 'ticket' ? line.itemTotal : line.amount;
+    onSetReceiptLineOverride?.({
+      componentId: line.componentId,
+      lineKey,
+      label: line.kind === 'ticket' ? line.category : line.label,
+      baseAmount,
+      targetAmount: 0,
+    });
+    setOverrideDrafts((current) => {
+      const next = { ...current };
+      delete next[lineKey];
+      return next;
+    });
+  };
+  const handleOverrideRestore = (line: PriceSummaryLine) => {
+    if (!line.componentId || !line.lineKey) return;
+    const baseAmount = line.kind === 'ticket' ? line.itemTotal : line.amount;
+    onSetReceiptLineOverride?.({
+      componentId: line.componentId,
+      lineKey: line.lineKey,
+      label: line.kind === 'ticket' ? line.category : line.label,
+      baseAmount,
+      targetAmount: baseAmount,
+    });
+  };
   const summarySubtotal = isProductFamilyConversion
     ? familyConversionReceiptLines.reduce((sum, line) => {
         if (line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX') return sum;
@@ -353,32 +393,55 @@ 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">Loading price change…</p>
             </div>
-          ) : summaryDisplayLines.length === 0 && Math.abs(amountDue) < 0.005 && removedWithoutRefund > 0 ? (
+          ) : summaryDisplayLines.length === 0 && removedSummaryDisplayLines.length === 0 && Math.abs(amountDue) < 0.005 && removedWithoutRefund > 0 ? (
             <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-800">No refund will be created</p>
               <p className="mt-1 text-xs text-stone-600">
                 {formatCurrencyAmount(removedWithoutRefund, currency, displayLocale)} of booking value will be removed without customer credit.
               </p>
             </div>
-          ) : summaryDisplayLines.length === 0 && Math.abs(amountDue) < 0.005 ? (
+          ) : summaryDisplayLines.length === 0 && removedSummaryDisplayLines.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={summaryDisplayLines}
-              total={summaryTotal ?? amountDue}
-              totalLabel={summaryTotalLabel}
-              showPositiveTotalSign={!isProductFamilyConversion}
-              currency={currency}
-              locale={displayLocale}
-              subtotal={summarySubtotal}
-              size="sm"
-              t={t}
-              lineAmountInputs={{ ...quotedOverrideAmountInputs, ...overrideDrafts }}
-              onLineAmountInputChange={handleOverrideChange}
-              onLineAmountInputBlur={handleOverrideBlur}
-            />
+            <div>
+              <PriceSummary
+                lines={summaryDisplayLines}
+                total={summaryTotal ?? amountDue}
+                totalLabel={summaryTotalLabel}
+                showPositiveTotalSign={!isProductFamilyConversion}
+                currency={currency}
+                locale={displayLocale}
+                subtotal={summarySubtotal}
+                size="sm"
+                t={t}
+                lineAmountInputs={{ ...quotedOverrideAmountInputs, ...overrideDrafts }}
+                onLineAmountInputChange={handleOverrideChange}
+                onLineAmountInputBlur={handleOverrideBlur}
+                onLineRemove={handleOverrideRemove}
+              />
+              {removedSummaryDisplayLines.length > 0 ? (
+                <div className="mt-3 border-t border-stone-200 pt-2 text-xs text-stone-500">
+                  <span className="font-medium text-stone-600">Removed lines:</span>{' '}
+                  {removedSummaryDisplayLines.map((line, index) => {
+                    const label = line.kind === 'ticket' ? line.category : line.label;
+                    return (
+                      <span key={line.lineKey ?? `${label}-${index}`}>
+                        {index > 0 ? ', ' : ''}{label}{' '}
+                        <button
+                          type="button"
+                          className="font-medium text-stone-700 underline underline-offset-2 hover:text-stone-950"
+                          onClick={() => handleOverrideRestore(line)}
+                        >
+                          Undo
+                        </button>
+                      </span>
+                    );
+                  })}
+                </div>
+              ) : null}
+            </div>
           )}
         </section>
       </div>

package/src/components/booking/PriceBreakdown.tsx

@@ -28,6 +28,7 @@ export interface PriceBreakdownProps {
   onEditableChange?: (value: string) => void;
   onEditableBlur?: () => void;
   onEditableReset?: () => void;
+  onEditableRemove?: () => void;
   editableLabelValue?: string;
   onEditableLabelChange?: (value: string) => void;
 }
@@ -76,6 +77,7 @@ export function PriceBreakdown({
   onEditableChange,
   onEditableBlur,
   onEditableReset,
+  onEditableRemove,
   editableLabelValue,
   onEditableLabelChange,
 }: PriceBreakdownProps) {
@@ -129,6 +131,17 @@ export function PriceBreakdown({
               onChange={(e) => onEditableChange(e.target.value)}
               onBlur={onEditableBlur}
             />
+            {onEditableRemove ? (
+              <button
+                type="button"
+                className="rounded p-0.5 text-stone-400 hover:bg-red-50 hover:text-red-600"
+                onClick={onEditableRemove}
+                aria-label={`Remove ${category} line`}
+                title="Remove line"
+              >
+                <span className="inline-block h-4 w-4 text-center text-base leading-4">×</span>
+              </button>
+            ) : null}
           </div>
         ) : (
           <span className="text-sm font-medium text-stone-700">
@@ -191,6 +204,17 @@ export function PriceBreakdown({
               onChange={(e) => onEditableChange(e.target.value)}
               onBlur={onEditableBlur}
             />
+            {onEditableRemove ? (
+              <button
+                type="button"
+                className="rounded p-0.5 text-stone-400 hover:bg-red-50 hover:text-red-600"
+                onClick={onEditableRemove}
+                aria-label={`Remove ${category} line`}
+                title="Remove line"
+              >
+                <span className="inline-block h-4 w-4 text-center text-base leading-4">×</span>
+              </button>
+            ) : null}
           </div>
         ) : (
           <span

package/src/components/booking/PriceSummary.tsx

@@ -98,6 +98,8 @@ export interface PriceSummaryProps {
   onLineAmountInputBlur?: (lineKey: string) => void;
   /** Optional reset handler for inline editable line amounts. */
   onLineAmountReset?: (lineKey: string) => void;
+  /** Optional remove handler for inline editable lines. */
+  onLineRemove?: (lineKey: string) => void;
 }
 
 function getLineAmountClass(type: string | undefined, amount: number): string {
@@ -174,7 +176,6 @@ export function PriceSummary({
   locale,
   subtotal,
   taxAmount = 0,
-  taxRate: _taxRate,
   discountAmount = 0,
   discountLabel,
   size = 'sm',
@@ -194,6 +195,7 @@ export function PriceSummary({
   onLineLabelInputChange,
   onLineAmountInputBlur,
   onLineAmountReset,
+  onLineRemove,
 }: PriceSummaryProps) {
   const textSize = size === 'sm' ? 'text-sm' : 'text-base';
   const totalSize = size === 'sm' ? 'text-xl' : 'text-2xl';
@@ -247,6 +249,11 @@ export function PriceSummary({
                   ? () => onLineAmountReset(row.lineKey!)
                   : undefined
               }
+              onEditableRemove={
+                row.editable && isBeforeSubtotalBoundary && row.lineKey && onLineRemove
+                  ? () => onLineRemove(row.lineKey!)
+                  : undefined
+              }
               editableLabelValue={row.lineKey ? lineLabelInputs?.[row.lineKey] : undefined}
               onEditableLabelChange={
                 row.editable && isBeforeSubtotalBoundary && row.lineKey && onLineLabelInputChange
@@ -313,6 +320,17 @@ export function PriceSummary({
                     onChange={(e) => onLineAmountInputChange(lineKey, e.target.value)}
                     onBlur={() => onLineAmountInputBlur?.(lineKey)}
                   />
+                  {isBeforeSubtotalBoundary && onLineRemove ? (
+                    <button
+                      type="button"
+                      className="rounded p-0.5 text-stone-400 hover:bg-red-50 hover:text-red-600"
+                      onClick={() => onLineRemove(lineKey)}
+                      aria-label={`Remove ${label} line`}
+                      title="Remove line"
+                    >
+                      <span className="inline-block h-4 w-4 text-center text-base leading-4">×</span>
+                    </button>
+                  ) : null}
                 </div>
               ) : (
                 <span className={`flex-shrink-0 whitespace-nowrap font-medium ${getLineAmountClass(type, amount)}`}>

package/src/components/booking/useAdminCustomReceiptLines.ts

@@ -43,6 +43,10 @@ export function lineFromActiveAdjustment(
   replacementAdjustmentId: string,
 ): AdminCustomReceiptLine {
   const percentage = adjustment.mode !== 'FIXED_AMOUNT';
+  const overrideComponentId =
+    adjustment.reasonCode === 'LINE_ITEM_OVERRIDE' && adjustment.affectedComponentIds.length === 1
+      ? adjustment.affectedComponentIds[0]
+      : undefined;
   return {
     id: `existing:${adjustment.adjustmentId}`,
     label:
@@ -62,6 +66,7 @@ export function lineFromActiveAdjustment(
     sourceAdjustmentId: adjustment.adjustmentId,
     replacementAdjustmentId,
     isDirty: false,
+    overrideComponentId,
   };
 }
 
@@ -160,6 +165,8 @@ export function useAdminCustomReceiptLines(
     const existing = adminCustomReceiptLines.find(
       (line) => line.overrideComponentId === input.componentId,
     );
+    const sourceAdjustmentId = existing?.sourceAdjustmentId;
+    const restoringQuotedLine = Math.abs(delta) < 0.005;
     const next = Math.abs(delta) < 0.005
       ? adminCustomReceiptLines.filter((line) => line.id !== existing?.id)
       : [
@@ -177,8 +184,22 @@ export function useAdminCustomReceiptLines(
             overrideComponentId: input.componentId,
             overrideBaseAmount: input.baseAmount,
             overrideLineKey: input.lineKey,
+            ...(existing?.sourceAdjustmentId
+              ? {
+                  sourceAdjustmentId: existing.sourceAdjustmentId,
+                  replacementAdjustmentId: existing.replacementAdjustmentId,
+                  isDirty: true,
+                }
+              : {}),
           },
         ];
+    if (sourceAdjustmentId) {
+      const updateRemovedIds = (current: string[]) => restoringQuotedLine
+        ? Array.from(new Set([...current, sourceAdjustmentId]))
+        : current.filter((id) => id !== sourceAdjustmentId);
+      setRemovedExistingAdjustmentIds(updateRemovedIds);
+      setAppliedRemovedExistingAdjustmentIds(updateRemovedIds);
+    }
     setAdminCustomReceiptLines(next);
     setAppliedAdminCustomReceiptLines(next);
   }, [adminCustomReceiptLines, nextDraftId]);

package/test/change-booking-helpers.test.ts

@@ -234,6 +234,31 @@ test('existing admin adjustment hydrates for immutable reverse-and-replace editi
   assert.deepEqual(reverseAdjustmentIdsForAdminCustomLines([], ['admin-rcpt-1']), ['admin-rcpt-1']);
 });
 
+test('saved line-item override hydrates its targeted receipt component', () => {
+  const line = lineFromActiveAdjustment({
+    adjustmentId: 'override-adult-1',
+    operationId: 'op-override-adult-1',
+    mode: 'FIXED_AMOUNT',
+    scope: 'SELECTED_COMPONENTS',
+    basisCents: 19_799,
+    amountCents: 19_799,
+    taxDeltaCents: 990,
+    affectedComponentIds: ['adult-component'],
+    taxBehavior: 'TAXABLE',
+    reasonCode: 'LINE_ITEM_OVERRIDE',
+    reason: 'Override · Refund · ADULT',
+    createdAt: '2026-08-09T00:00:00Z',
+  }, 'replacement-override-adult-1');
+
+  assert.equal(line.overrideComponentId, 'adult-component');
+  assert.deepEqual(line.selectedComponentIds, ['adult-component']);
+  assert.equal(line.sourceAdjustmentId, 'override-adult-1');
+  assert.deepEqual(
+    reverseAdjustmentIdsForAdminCustomLines([{ ...line, isDirty: true }]),
+    ['override-adult-1'],
+  );
+});
+
 test('private resource quantity is not carried into a regular-tour conversion', () => {
   const quantities = deriveCompatibleInitialBookingQuantities(
     [{ category: 'RESOURCE', count: 1 }],