@ticketboothapp/booking 1.2.114 → 1.2.116

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -3194,6 +3194,33 @@ export function AdminChangeBookingFlow({
     [quantities]
   );
 
+  /** Fee rows shown in the editor must use the same receipt-floor math as the subtotal. */
+  const feeLineItemsForChangeFlowDisplay = useMemo(() => {
+    if (!changeFlowApplyReceiptPaidFloors || totalQuantity <= 0) return feeLineItems;
+    const initialParty = changeFlowInitialTicketCount;
+    return feeLineItems.map((line) => {
+      const key = normalizeLineLabelForCompare(line.name || '');
+      const bookedFeePerPerson = key ? changeFlowBookedFeeUnitByNormalizedLabel.get(key) : undefined;
+      return {
+        ...line,
+        totalAmount: changeFlowFeeLineTotalWithReceiptFloor({
+          totalQuantity,
+          initialTicketCount: initialParty,
+          bookedFeePerPerson,
+          liveFeeLineTotal: Number(line.totalAmount) || 0,
+          protectedReceiptPricing: changeFlowProtectedReceiptPricing,
+        }),
+      };
+    });
+  }, [
+    changeFlowApplyReceiptPaidFloors,
+    totalQuantity,
+    feeLineItems,
+    changeFlowInitialTicketCount,
+    changeFlowBookedFeeUnitByNormalizedLabel,
+    changeFlowProtectedReceiptPricing,
+  ]);
+
   // Fee line items including add-ons (for PriceSummary and CheckoutModal)
   const feeLineItemsWithAddOns = useMemo(() => {
     const addOnLines = addOnSelections
@@ -3210,8 +3237,8 @@ export function AdminChangeBookingFlow({
         return { name, totalAmount: amt, description: addOn.description ?? undefined };
       })
       .filter((x): x is NonNullable<typeof x> => x != null);
-    return [...feeLineItems, ...addOnLines];
-  }, [feeLineItems, addOnSelections, addOns]);
+    return [...feeLineItemsForChangeFlowDisplay, ...addOnLines];
+  }, [feeLineItemsForChangeFlowDisplay, addOnSelections, addOns]);
 
   const providerPricingUi = flowUi?.providerDashboardChangePricingUi;
   const providerQuotedLines = providerPricingUi?.quotedLines ?? [];
@@ -3298,7 +3325,7 @@ export function AdminChangeBookingFlow({
             showProviderPricingInlineEditor
               ? providerEditableLineByNormalizedLabel.get(
                   normalizeReceiptLabel(
-                    feeLineItems.some((f) => f.name === fee.name)
+                    feeLineItemsForChangeFlowDisplay.some((f) => f.name === fee.name)
                       ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
                       : fee.name
                   )
@@ -3308,12 +3335,12 @@ export function AdminChangeBookingFlow({
             showProviderPricingInlineEditor &&
             providerEditableLineByNormalizedLabel.has(
               normalizeReceiptLabel(
-                feeLineItems.some((f) => f.name === fee.name)
+                feeLineItemsForChangeFlowDisplay.some((f) => f.name === fee.name)
                   ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
                   : fee.name
               )
             ),
-          label: feeLineItems.some((f) => f.name === fee.name)
+          label: feeLineItemsForChangeFlowDisplay.some((f) => f.name === fee.name)
             ? `${fee.name} (${totalQuantity} ${totalQuantity === 1 ? 'person' : 'people'})`
             : fee.name,
           amount: fee.totalAmount,
@@ -3337,7 +3364,7 @@ export function AdminChangeBookingFlow({
     selectedCancellationPolicy,
     effectiveCancellationPolicyLabel,
     feeLineItemsWithAddOns,
-    feeLineItems,
+    feeLineItemsForChangeFlowDisplay,
     showProviderPricingInlineEditor,
     providerEditableLineByNormalizedLabel,
   ]);
@@ -3351,8 +3378,9 @@ export function AdminChangeBookingFlow({
   /** Latest cart context for get-promo-discount; effect only keys off promoDiscountFetchKey. */
   const promoDiscountParamsRef = useRef({
     selectedAvailability: null as Availability | null,
-    ticketLineItems: [] as Array<{ category: string; qty: number }>,
+    ticketLineItems: [] as Array<{ category: string; qty: number; itemTotal: number }>,
     effectiveSubtotal: 0,
+    displayedProductFeeTotal: 0,
     appliedPromoCode: null as string | null,
     changeBookingPromo: null as { priorAmount?: number } | null,
   });
@@ -3377,6 +3405,11 @@ export function AdminChangeBookingFlow({
       selectedAvailability.availabilityId ?? '',
       currency,
       quantitiesSignature,
+      ticketLineItemsForChangeFlowDisplay
+        .map((line) => `${line.category}:${line.qty}:${Math.round(line.itemTotal * 100)}`)
+        .sort()
+        .join('|'),
+      String(Math.round(feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotalForCheckout * 100)),
       lockedPromoCode ? String(Math.round(originalReceiptPromoAdjustment.amount * 100)) : '',
     ].join('::');
@@ -3390,6 +3423,8 @@ export function AdminChangeBookingFlow({
     product.productId,
     currency,
     quantitiesSignature,
+    ticketLineItemsForChangeFlowDisplay,
+    feeLineItems,
     effectiveSubtotalForCheckout,
     lockedPromoCode,
     originalReceiptPromoAdjustment.amount,
@@ -3397,8 +3432,9 @@ export function AdminChangeBookingFlow({
 
   promoDiscountParamsRef.current = {
     selectedAvailability,
-    ticketLineItems: ticketLineItems.map((l) => ({ category: l.category, qty: l.qty })),
+    ticketLineItems: ticketLineItemsForChangeFlowDisplay.map((l) => ({ category: l.category, qty: l.qty, itemTotal: l.itemTotal })),
     effectiveSubtotal: effectiveSubtotalForCheckout,
+    displayedProductFeeTotal: feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
       ? { priorAmount: originalReceiptPromoAdjustment.amount }
@@ -3421,6 +3457,7 @@ export function AdminChangeBookingFlow({
         selectedAvailability: sel,
         ticketLineItems: lines,
         effectiveSubtotal: sub,
+        displayedProductFeeTotal,
         appliedPromoCode: code,
         changeBookingPromo,
       } = promoDiscountParamsRef.current;
@@ -3445,8 +3482,13 @@ export function AdminChangeBookingFlow({
           ? {
               forBookingChange: true,
               priorPromoDiscountAmount: changeBookingPromo.priorAmount,
+              displayedTicketLines: lines,
+              displayedProductFeeTotal,
+            }
+          : {
+              displayedTicketLines: lines,
+              displayedProductFeeTotal,
             }
-          : undefined
       )
         .then((res) => {
           if (cancelled) return;
@@ -4030,6 +4072,14 @@ export function AdminChangeBookingFlow({
     providerHasAdditionalAdjustments ||
     providerHasEditableSummaryLineOverrides ||
     Math.abs(adminCustomAdjustmentTotal) >= 0.005;
+  const unchangedReceiptAnchor =
+    originalReceipt && !hasEffectiveChangeSelection
+      ? {
+          subtotal: roundMoney(originalReceipt.subtotal),
+          tax: roundMoney(originalReceipt.tax),
+          total: roundMoney(originalReceipt.total),
+        }
+      : null;
 
   /**
    * True until `quoteChangeBooking` returns a confirmed `serverDisplay` for the current selection.
@@ -4073,14 +4123,22 @@ export function AdminChangeBookingFlow({
       ? roundMoney(adminCustomAdjustmentTotal * (pricingConfig?.taxRate ?? 0))
       : 0;
   const displayChangeFlowSubtotal = roundMoney(
-    displayedChangeAmountsRaw.subtotal +
-      (displayLayerUsesExternalPricing ? adminCustomAdjustmentTotal : 0)
+    unchangedReceiptAnchor
+      ? unchangedReceiptAnchor.subtotal
+      : displayedChangeAmountsRaw.subtotal +
+        (displayLayerUsesExternalPricing ? adminCustomAdjustmentTotal : 0)
+  );
+  const displayChangeFlowTax = roundMoney(
+    unchangedReceiptAnchor
+      ? unchangedReceiptAnchor.tax
+      : displayedChangeAmountsRaw.tax + adminTaxDeltaForExternalDisplay
   );
-  const displayChangeFlowTax = roundMoney(displayedChangeAmountsRaw.tax + adminTaxDeltaForExternalDisplay);
   const displayChangeFlowProposedTotal = roundMoney(
-    displayLayerUsesExternalPricing
-      ? displayedChangeAmountsRaw.total + adminCustomAdjustmentTotal + adminTaxDeltaForExternalDisplay
-      : displayedChangeAmountsRaw.total
+    unchangedReceiptAnchor
+      ? unchangedReceiptAnchor.total
+      : displayLayerUsesExternalPricing
+        ? displayedChangeAmountsRaw.total + adminCustomAdjustmentTotal + adminTaxDeltaForExternalDisplay
+        : displayedChangeAmountsRaw.total
   );
   const displayChangeFlowProposedTotalWithEditableLines = roundMoney(
     displayChangeFlowProposedTotal + editableSummaryPreSubtotalDelta
@@ -4176,6 +4234,7 @@ export function AdminChangeBookingFlow({
 
   const changeFlowClientEstimateDueBase = (() => {
     if (!originalReceipt) return totalPrice;
+    if (unchangedReceiptAnchor) return 0;
     // Self-serve quote: match BE receipt / intent: (newTotalCents − previousTotalCents) / 100.
     if (isCustomerSelfServeChange && latestChangeQuote != null && !changeQuoteFetchError) {
       const pq = latestChangeQuote.quotePreviousTotalCents;
@@ -4291,6 +4350,7 @@ export function AdminChangeBookingFlow({
     displayedChangeAmountsRaw.tax,
     displayedChangeAmountsRaw.total,
     editableSummaryPreSubtotalDelta,
+    unchangedReceiptAnchor,
     displayChangeFlowProposedTotal,
     displayChangeFlowProposedTotalWithEditableLines,
     adminFeAuthoritativeReceipt,

package/src/components/booking/ChangeBookingFlow.tsx

@@ -3173,8 +3173,9 @@ export function ChangeBookingFlow({
   /** Latest cart context for get-promo-discount; effect only keys off promoDiscountFetchKey. */
   const promoDiscountParamsRef = useRef({
     selectedAvailability: null as Availability | null,
-    ticketLineItems: [] as Array<{ category: string; qty: number }>,
+    ticketLineItems: [] as Array<{ category: string; qty: number; itemTotal: number }>,
     effectiveSubtotal: 0,
+    displayedProductFeeTotal: 0,
     appliedPromoCode: null as string | null,
     /** Change flow: pass BE stored promo discount for expired / fixed promo locking. */
     changeBookingPromo: null as { priorAmount?: number } | null,
@@ -3195,6 +3196,11 @@ export function ChangeBookingFlow({
       selectedAvailability.availabilityId ?? '',
       currency,
       quantitiesSignature,
+      ticketLineItemsForChangeFlowDisplay
+        .map((line) => `${line.category}:${line.qty}:${Math.round(line.itemTotal * 100)}`)
+        .sort()
+        .join('|'),
+      String(Math.round(feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotal * 100)),
       lockedPromoCode ? String(Math.round((originalReceipt?.promoAmount ?? 0) * 100)) : '',
     ].join('::');
@@ -3208,6 +3214,8 @@ export function ChangeBookingFlow({
     product.productId,
     currency,
     quantitiesSignature,
+    ticketLineItemsForChangeFlowDisplay,
+    feeLineItems,
     effectiveSubtotal,
     lockedPromoCode,
     originalReceipt?.promoAmount,
@@ -3215,8 +3223,9 @@ export function ChangeBookingFlow({
 
   promoDiscountParamsRef.current = {
     selectedAvailability,
-    ticketLineItems: ticketLineItems.map((l) => ({ category: l.category, qty: l.qty })),
+    ticketLineItems: ticketLineItemsForChangeFlowDisplay.map((l) => ({ category: l.category, qty: l.qty, itemTotal: l.itemTotal })),
     effectiveSubtotal,
+    displayedProductFeeTotal: feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
       ? { priorAmount: originalReceipt?.promoAmount }
@@ -3239,6 +3248,7 @@ export function ChangeBookingFlow({
         selectedAvailability: sel,
         ticketLineItems: lines,
         effectiveSubtotal: sub,
+        displayedProductFeeTotal,
         appliedPromoCode: code,
         changeBookingPromo,
       } = promoDiscountParamsRef.current;
@@ -3263,8 +3273,13 @@ export function ChangeBookingFlow({
           ? {
               forBookingChange: true,
               priorPromoDiscountAmount: changeBookingPromo.priorAmount,
+              displayedTicketLines: lines,
+              displayedProductFeeTotal,
+            }
+          : {
+              displayedTicketLines: lines,
+              displayedProductFeeTotal,
             }
-          : undefined
       )
         .then((res) => {
           if (cancelled) return;