@ticketboothapp/booking 1.2.153 → 1.2.154

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -1058,7 +1058,11 @@ export function AdminChangeBookingFlow({
         serverAmendmentLines: latestChangeQuote?.serverPreview?.priceSummaryLines ?? null,
         serverAmountDue: latestChangeQuote?.serverPreview?.amountDue ?? null,
         serverUpdatedTotal: latestChangeQuote?.serverPreview?.totalNewBooking ?? null,
-        serverQuoteError: changeQuoteFetchError,
+        serverQuoteError:
+          changeQuoteFetchError ??
+          (isChangeQuoteBlocked
+            ? (latestChangeQuote?.reasonIfBlocked ?? 'This change cannot be priced right now.')
+            : null),
         refundDecisionOperations: activeRefundDecisionContext?.operations ?? [],
         allowedRefundDispositionsByOperationId:
           activeRefundDecisionContext?.allowedByOperationId ?? {},

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -153,7 +153,9 @@ export function useAdminChangeQuotePreview({
     !!initialValues?.bookingReference?.trim() &&
     !!lastName.trim();
 
-  const isChangeQuoteBlocked = isCustomerSelfServeChange && latestChangeQuote?.canProceed === false;
+  const isChangeQuoteBlocked =
+    latestChangeQuote?.canProceed === false &&
+    (latestChangeQuote.refundDecisionOperations?.length ?? 0) === 0;
   const refundDecisionRequired = (latestChangeQuote?.refundDecisionOperations?.length ?? 0) > 0;
   const changeQuoteInputsKey = useMemo(() => buildAdminChangeQuoteRequestKey({
     bookingReference: initialValues?.bookingReference,
@@ -192,11 +194,19 @@ export function useAdminChangeQuotePreview({
   const changeCheckoutButtonLabel = (() => {
     if (!hasEffectiveChangeSelection) return undefined;
     if (isProviderDashboardChange) {
-      const est = Math.round(changeFlowClientEstimateDue * 100) / 100;
-      return est > 0
-        ? `Change booking (${formatCurrencyAmount(est, currency, locale as 'en' | 'fr')})`
-        : est < 0
-          ? `Change booking (${formatCurrencyAmount(est, currency, locale as 'en' | 'fr')})`
+      if (isChangeQuoteBlocked) {
+        const tr = t('booking.changeBookingNotAvailable');
+        return tr !== 'booking.changeBookingNotAvailable' ? tr : 'Change not available';
+      }
+      // Prefer authoritative V2 signed due (charge positive / refund negative). Do not use the
+      // FE cart estimate once a server quote exists — receipt total deltas can disagree with
+      // floored/settlement amounts (DEFECT-PV2-018 follow-up).
+      const serverDue = latestChangeQuote?.serverPreview?.amountDue;
+      const due = Math.round((serverDue ?? changeFlowClientEstimateDue) * 100) / 100;
+      return due > 0
+        ? `Change booking (${formatCurrencyAmount(due, currency, locale as 'en' | 'fr')})`
+        : due < 0
+          ? `Change booking (${formatCurrencyAmount(due, currency, locale as 'en' | 'fr')})`
           : 'Change booking (no charge)';
     }
     if (changeFlowNeedsServerPrice) {
@@ -234,10 +244,10 @@ export function useAdminChangeQuotePreview({
   const checkoutFormError =
     (error || '') ||
     (missingRequiredReturnSelection ? 'Please select a return time for this product.' : '') ||
-    (isCustomerSelfServeChange && isChangeQuoteBlocked && !refundDecisionRequired
-      ? (latestChangeQuote?.reasonIfBlocked ?? '')
+    (isChangeQuoteBlocked && !refundDecisionRequired
+      ? (latestChangeQuote?.reasonIfBlocked ?? 'This change cannot be priced right now.')
       : '') ||
-    (isCustomerSelfServeChange ? changeQuoteFetchError ?? '' : '');
+    (changeQuoteFetchError ?? '');
 
   const changeFlowSelectionPreview = useMemo((): ChangeFlowSelectionPreview | null => {
     if (!selectedAvailability || totalQuantity <= 0) return null;

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

@@ -251,12 +251,14 @@ export function mapQuoteLineItemsToPriceSummaryLines(
 
 function signedAmountDueFromQuote(quote: ChangeBookingQuoteResponse): number {
   const pricingQuote = quote.pricingQuote ?? quote.quote;
-  if (quote.balanceDeltaMajorUnits != null) return quote.balanceDeltaMajorUnits;
-  if (quote.balanceDelta != null) return quote.balanceDelta;
-  if (pricingQuote?.balanceDelta != null) return pricingQuote.balanceDelta;
+  // Prefer explicit settlement fields over balanceDelta. Receipt-total math and balanceDelta
+  // can disagree with charge/refund when value is removed but not yet dispositioned.
   const charge = pricingQuote?.amountToCharge ?? quote.amountToCharge;
   const refund = pricingQuote?.refundCandidate ?? quote.refundCandidate;
   if (charge != null || refund != null) return (charge ?? 0) - (refund ?? 0);
+  if (quote.balanceDeltaMajorUnits != null) return quote.balanceDeltaMajorUnits;
+  if (quote.balanceDelta != null) return quote.balanceDelta;
+  if (pricingQuote?.balanceDelta != null) return pricingQuote.balanceDelta;
   if (quote.amountDueCents != null) return quote.amountDueCents / 100;
   return quote.priceDiff ?? 0;
 }

package/src/lib/booking/change-flow-pricing.ts

@@ -271,12 +271,14 @@ export function sliceChangeQuoteForUi(
   const pricingQuote = quote.pricingQuote ?? quote.quote;
   /** Staff JWT on quote: signed new − previous (refund owed negative). Otherwise same as legacy nonnegative amount-due. */
   const priceDiff = (() => {
+    const charge = quote.amountToCharge ?? pricingQuote?.amountToCharge;
+    const refund = quote.refundCandidate ?? pricingQuote?.refundCandidate;
+    if (charge != null || refund != null) {
+      return (charge ?? 0) - (refund ?? 0);
+    }
     if (quote.balanceDeltaMajorUnits != null) return quote.balanceDeltaMajorUnits;
     if (quote.balanceDelta != null) return quote.balanceDelta;
     if (pricingQuote?.balanceDelta != null) return pricingQuote.balanceDelta;
-    if (quote.amountToCharge != null || quote.refundCandidate != null) {
-      return (quote.amountToCharge ?? 0) - (quote.refundCandidate ?? 0);
-    }
     if (quote.amountDueCents != null) return quote.amountDueCents / 100;
     return quote.priceDiff ?? 0;
   })();