@ticketboothapp/booking 1.2.117 → 1.2.119

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -2765,7 +2765,9 @@ export function AdminChangeBookingFlow({
    */
   const returnOptionsWithFloor = useMemo(() => {
     const options = selectedAvailability?.returnOptions ?? [];
-    const serverReturnMap = latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
+    const serverReturnMap = useAdminFeAuthoritativeQuote
+      ? undefined
+      : latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
     const floor = effectiveChangeFlowReturnUnitFloorPerPerson;
     const applyReturnFloor = floor != null && isCustomerSelfServeChange;
     return options.map((opt) => {
@@ -2800,6 +2802,7 @@ export function AdminChangeBookingFlow({
     isCustomerSelfServeChange,
     currency,
     changeFlowSeatCreditForReturnAvailabilityId,
+    useAdminFeAuthoritativeQuote,
     latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId,
   ]);
 
@@ -2809,7 +2812,9 @@ export function AdminChangeBookingFlow({
     const applyReturnFloor = floor != null && isCustomerSelfServeChange;
     const rawPerPerson = selectedReturnOption.priceAdjustmentByCurrency?.[currency] ?? 0;
     let perPerson = rawPerPerson;
-    const serverReturnMap = latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
+    const serverReturnMap = useAdminFeAuthoritativeQuote
+      ? undefined
+      : latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId;
     if (isCustomerSelfServeChange && serverReturnMap && selectedReturnOption.returnAvailabilityId) {
       const sid = selectedReturnOption.returnAvailabilityId.trim();
       const sp = serverReturnMap[sid];
@@ -2833,6 +2838,7 @@ export function AdminChangeBookingFlow({
     effectiveChangeFlowReturnUnitFloorPerPerson,
     isCustomerSelfServeChange,
     currency,
+    useAdminFeAuthoritativeQuote,
     latestChangeQuote?.serverPreview?.returnOptionPriceByReturnAvailabilityId,
   ]);
 
@@ -2872,7 +2878,7 @@ export function AdminChangeBookingFlow({
   /** Quote `ticketUnitPriceByCategory` overrides catalog units for ticket rows (customer self-serve only). */
   const pricingForTicketSelector = useMemo(() => {
     const m = latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory;
-    if (!isCustomerSelfServeChange || !m) return pricing;
+    if (useAdminFeAuthoritativeQuote || !isCustomerSelfServeChange || !m) return pricing;
     return pricing.map((r) => {
       const u = m[r.category.toUpperCase()];
       if (u == null || !Number.isFinite(u)) return r;
@@ -2883,7 +2889,7 @@ export function AdminChangeBookingFlow({
         baseInDisplayCurrency: u,
       };
     });
-  }, [pricing, latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory, isCustomerSelfServeChange]);
+  }, [pricing, latestChangeQuote?.serverPreview?.ticketUnitPriceByCategory, isCustomerSelfServeChange, useAdminFeAuthoritativeQuote]);
 
   // Price breakdown: mid-layer returns line items (base + one per rule/deal). UI renders each line; rate in brackets when used.
   const getPriceBreakdown = useCallback((category: string, priceCAD: number, baseInDisplayCurrency: number | undefined, appliedAdjustments: Array<{ type: string; id: string; name: string; changeByCurrency?: Record<string, number> }> = []): PriceBreakdownData | null => {
@@ -3183,18 +3189,7 @@ export function AdminChangeBookingFlow({
   );
   const effectiveSubtotalForCheckout = roundMoney(effectiveSubtotal + adminCustomAdjustmentTotal);
 
-  /** Stable signature for promo discount API (avoid effect re-fire on object identity churn). */
-  const quantitiesSignature = useMemo(
-    () =>
-      Object.entries(quantities)
-        .filter(([, n]) => (n ?? 0) > 0)
-        .sort(([a], [b]) => a.localeCompare(b))
-        .map(([c, n]) => `${c}:${n}`)
-        .join('|'),
-    [quantities]
-  );
-
-  /** Fee rows shown in the editor must use the same receipt-floor math as the subtotal. */
+  /** Fee rows shown in change flow must use the same receipt-floor rules as the protected subtotal. */
   const feeLineItemsForChangeFlowDisplay = useMemo(() => {
     if (!changeFlowApplyReceiptPaidFloors || totalQuantity <= 0) return feeLineItems;
     const initialParty = changeFlowInitialTicketCount;
@@ -3221,6 +3216,17 @@ export function AdminChangeBookingFlow({
     changeFlowProtectedReceiptPricing,
   ]);
 
+  /** Stable signature for promo discount API (avoid effect re-fire on object identity churn). */
+  const quantitiesSignature = useMemo(
+    () =>
+      Object.entries(quantities)
+        .filter(([, n]) => (n ?? 0) > 0)
+        .sort(([a], [b]) => a.localeCompare(b))
+        .map(([c, n]) => `${c}:${n}`)
+        .join('|'),
+    [quantities]
+  );
+
   // Fee line items including add-ons (for PriceSummary and CheckoutModal)
   const feeLineItemsWithAddOns = useMemo(() => {
     const addOnLines = addOnSelections
@@ -3409,7 +3415,7 @@ export function AdminChangeBookingFlow({
         .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(feeLineItemsWithAddOns.reduce((sum, fee) => sum + fee.totalAmount, 0) * 100)),
       String(Math.round(effectiveSubtotalForCheckout * 100)),
       lockedPromoCode ? String(Math.round(originalReceiptPromoAdjustment.amount * 100)) : '',
     ].join('::');
@@ -3424,7 +3430,7 @@ export function AdminChangeBookingFlow({
     currency,
     quantitiesSignature,
     ticketLineItemsForChangeFlowDisplay,
-    feeLineItems,
+    feeLineItemsWithAddOns,
     effectiveSubtotalForCheckout,
     lockedPromoCode,
     originalReceiptPromoAdjustment.amount,
@@ -3434,7 +3440,7 @@ export function AdminChangeBookingFlow({
     selectedAvailability,
     ticketLineItems: ticketLineItemsForChangeFlowDisplay.map((l) => ({ category: l.category, qty: l.qty, itemTotal: l.itemTotal })),
     effectiveSubtotal: effectiveSubtotalForCheckout,
-    displayedProductFeeTotal: feeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0),
+    displayedProductFeeTotal: feeLineItemsWithAddOns.reduce((sum, fee) => sum + fee.totalAmount, 0),
     appliedPromoCode,
     changeBookingPromo: lockedPromoCode
       ? { priorAmount: originalReceiptPromoAdjustment.amount }
@@ -3533,7 +3539,7 @@ export function AdminChangeBookingFlow({
 
   const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
     let raw: PriceSummaryLine[];
-    if (suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
+    if (!useAdminFeAuthoritativeQuote && suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
       const serverLines = latestChangeQuote?.serverPreview?.priceSummaryLines;
       raw = serverLines && serverLines.length > 0 ? serverLines : checkoutPriceSummaryLines;
     } else {
@@ -3561,6 +3567,7 @@ export function AdminChangeBookingFlow({
   }, [
     suppressSelfServeCurrencyUi,
     selfServePricingConfirmed,
+    useAdminFeAuthoritativeQuote,
     checkoutPriceSummaryLines,
     latestChangeQuote?.serverPreview?.priceSummaryLines,
     effectivePromoDiscountAmount,
@@ -4080,7 +4087,6 @@ export function AdminChangeBookingFlow({
           total: roundMoney(originalReceipt.total),
         }
       : null;
-
   /**
    * True until `quoteChangeBooking` returns a confirmed `serverDisplay` for the current selection.
    * Named so manual price-line UI can align with “still settling final price” without touching ticket/receipt math.
@@ -4105,7 +4111,7 @@ export function AdminChangeBookingFlow({
   const displayedChangeAmountsRaw = resolveChangeFlowDisplayedAmounts({
     providerPreview: providerTotalsPreview,
     serverQuotePreview:
-      isCustomerSelfServeChange && latestChangeQuote?.serverDisplay
+      !useAdminFeAuthoritativeQuote && isCustomerSelfServeChange && latestChangeQuote?.serverDisplay
         ? latestChangeQuote.serverDisplay
         : null,
     fromCart: {
@@ -4117,7 +4123,7 @@ export function AdminChangeBookingFlow({
   /** When cart drives display, {@link effectiveSubtotalForCheckout} already includes admin adjustments — do not add twice. */
   const displayLayerUsesExternalPricing =
     Boolean(providerTotalsPreview) ||
-    (isCustomerSelfServeChange && Boolean(latestChangeQuote?.serverDisplay));
+    (!useAdminFeAuthoritativeQuote && isCustomerSelfServeChange && Boolean(latestChangeQuote?.serverDisplay));
   const adminTaxDeltaForExternalDisplay =
     displayLayerUsesExternalPricing && !isTaxIncludedInPrice && Math.abs(adminCustomAdjustmentTotal) >= 0.0005
       ? roundMoney(adminCustomAdjustmentTotal * (pricingConfig?.taxRate ?? 0))
@@ -6196,15 +6202,13 @@ export function AdminChangeBookingFlow({
                       ? t('booking.totalOwedForBookingChange')
                       : 'Total owed for booking difference'
                 }
-                subtotal={unchangedReceiptAnchor ? undefined : adminFeAuthoritativeReceipt.subtotal}
+                subtotal={adminFeAuthoritativeReceipt.subtotal}
                 taxAmount={
-                  unchangedReceiptAnchor
-                    ? 0
-                    : !isTaxIncludedInPrice &&
-                        adminFeAuthoritativeReceipt.tax > 0 &&
-                        !priceSummaryLinesIncludeTaxRow
-                      ? adminFeAuthoritativeReceipt.tax
-                      : 0
+                  !isTaxIncludedInPrice &&
+                  adminFeAuthoritativeReceipt.tax > 0 &&
+                  !priceSummaryLinesIncludeTaxRow
+                    ? adminFeAuthoritativeReceipt.tax
+                    : 0
                 }
                 taxRate={pricingConfig?.taxRate}
                 currency={currency}