@ticketboothapp/booking 1.2.119 → 1.2.121

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -4208,18 +4208,12 @@ export function AdminChangeBookingFlow({
         type: 'TAX',
       });
     }
-    let subtotal = roundMoney(displayChangeFlowSubtotal + editableSummaryPreSubtotalDelta);
     const tax = roundMoney(displayChangeFlowTax);
     const expectedTotal = roundMoney(displayChangeFlowProposedTotalWithEditableLines);
-    const promoAdjustmentTotal = roundMoney(
-      lineItems.reduce((sum, line) => (
-        isPromoDiscountGiftCardOrVoucherLine(line) ? sum + (Number(line.amount) || 0) : sum
-      ), 0)
-    );
-    const recomputed = roundMoney(subtotal + tax + promoAdjustmentTotal);
-    if (!unchangedReceiptAnchor && Math.abs(recomputed - expectedTotal) >= 0.005) {
-      subtotal = roundMoney(expectedTotal - tax - promoAdjustmentTotal);
-    }
+    // Receipt subtotal means "subtotal before tax" after discount/payment-adjustment lines.
+    // The visible line list already includes promo/voucher/gift-card rows, so deriving from
+    // total minus tax keeps the footer aligned with the receipt totals we send to the API.
+    const subtotal = roundMoney(expectedTotal - tax);
     return {
       subtotal,
       tax,
@@ -4231,14 +4225,27 @@ export function AdminChangeBookingFlow({
     taxIncludedReconciledCheckoutPriceSummaryLines,
     quantities,
     displayChangeFlowTax,
-    displayChangeFlowSubtotal,
-    editableSummaryPreSubtotalDelta,
     displayChangeFlowProposedTotalWithEditableLines,
-    unchangedReceiptAnchor,
     currency,
     t,
   ]);
 
+  const providerApplyAuthoritativeReceipt = useMemo(() => {
+    if (!useAdminFeAuthoritativeQuote) return undefined;
+    return {
+      subtotalBeforeTax: adminFeAuthoritativeReceipt.subtotal,
+      taxAmount: adminFeAuthoritativeReceipt.tax,
+      totalAmount: adminFeAuthoritativeReceipt.total,
+      currency: adminFeAuthoritativeReceipt.currency ?? currency,
+      lineItems: adminFeAuthoritativeReceipt.lineItems.map((line) => ({
+        type: String(line.type || 'FEE'),
+        label: String(line.label || 'Adjustment'),
+        amount: Number(line.amount) || 0,
+        ...(line.quantity != null ? { quantity: Number(line.quantity) || 0 } : {}),
+      })),
+    };
+  }, [adminFeAuthoritativeReceipt, currency, useAdminFeAuthoritativeQuote]);
+
   const changeFlowClientEstimateDueBase = (() => {
     if (!originalReceipt) return totalPrice;
     if (unchangedReceiptAnchor) return 0;
@@ -5401,6 +5408,7 @@ export function AdminChangeBookingFlow({
                         : {}),
                     }
                   : undefined,
+              authoritativeReceipt: providerApplyAuthoritativeReceipt,
               capacitySeatCredit: {
                 enabled: true,
                 previousPassengerCount: changeFlowInitialTicketCount,
@@ -5796,6 +5804,7 @@ export function AdminChangeBookingFlow({
                     : {}),
                 }
               : undefined,
+          authoritativeReceipt: providerApplyAuthoritativeReceipt,
           capacitySeatCredit: {
             enabled: true,
             previousPassengerCount: changeFlowInitialTicketCount,

package/src/components/booking/PrivateShuttleBookingFlow.tsx

@@ -352,7 +352,7 @@ export function PrivateShuttleBookingFlow({
     itineraryDisplay?: ItineraryDisplayStep[] | null;
     clientSecret: string;
     ticketLinesForModal: CheckoutModalLineItem[];
-    feeLineItems: { name: string; totalAmount: number }[];
+    feeLineItems: { name: string; totalAmount: number; description?: string }[];
     cancellationPolicyFee: number;
     cancellationPolicyLabel?: string;
     subtotal: number;
@@ -1095,6 +1095,17 @@ export function PrivateShuttleBookingFlow({
   const cancellationPolicyFee = selectedCancellationPolicy
     ? (selectedCancellationPolicy.feeByCurrency[currency] ?? 0)
     : 0;
+  const perBookingFeeLineItems = useMemo(() => {
+    if (isTaxIncludedInPrice) return [];
+    const amountsByName = pricingConfig?.perBookingFeesByCurrency?.[currency];
+    if (!amountsByName) return [];
+    const feeMetadata = pricingConfig?.perBookingFees ?? {};
+    return Object.entries(amountsByName).map(([name, amount]) => ({
+      name,
+      totalAmount: amount,
+      description: feeMetadata[name]?.description,
+    }));
+  }, [currency, isTaxIncludedInPrice, pricingConfig]);
 
   const addOnTotal = useMemo(() => {
     let sum = 0;
@@ -1114,7 +1125,8 @@ export function PrivateShuttleBookingFlow({
   }, [addOnSelections, addOns]);
 
   const additionalHoursAmount = (isAdmin ? additionalHoursCount : 0) * ADDITIONAL_HOUR_PRICE;
-  const subtotal = basePrice + addOnTotal + additionalHoursAmount;
+  const perBookingFeeTotal = perBookingFeeLineItems.reduce((sum, fee) => sum + fee.totalAmount, 0);
+  const subtotal = basePrice + addOnTotal + additionalHoursAmount + perBookingFeeTotal;
   const effectivePromoDiscountAmount = promoDiscountAmount > 0 ? promoDiscountAmount : 0;
   const taxAmount = isTaxIncludedInPrice ? 0 : subtotal * taxRate;
   const effectiveTaxAmount =
@@ -1792,6 +1804,11 @@ export function PrivateShuttleBookingFlow({
               },
             ]
           : []),
+        ...perBookingFeeLineItems.map((fee) => ({
+          label: fee.name,
+          amount: fee.totalAmount,
+          type: 'FEE' as const,
+        })),
         ...(cancellationPolicyFee > 0 && selectedCancellationPolicy
           ? [
               {
@@ -1929,23 +1946,26 @@ export function PrivateShuttleBookingFlow({
               breakdown: null,
             },
           ],
-          feeLineItems: addOnSelections
-            .map((sel) => {
-              const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
-              if (!addOn) return null;
-              const base = addOn.price ?? 0;
-              const hasVariant =
-                (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
-                sel.variantId;
-              const adj = hasVariant
-                ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
-                : 0;
-              return {
-                name: addOn.name,
-                totalAmount: (base + adj) * (sel.quantity ?? 1),
-              };
-            })
-            .filter(Boolean) as { name: string; totalAmount: number }[],
+          feeLineItems: [
+            ...addOnSelections
+              .map((sel) => {
+                const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
+                if (!addOn) return null;
+                const base = addOn.price ?? 0;
+                const hasVariant =
+                  (addOn.variantType === 'single_choice' || addOn.variantType === 'multi_quantity') &&
+                  sel.variantId;
+                const adj = hasVariant
+                  ? (addOn.variants?.find((v) => v.id === sel.variantId)?.priceAdjustment ?? 0)
+                  : 0;
+                return {
+                  name: addOn.name,
+                  totalAmount: (base + adj) * (sel.quantity ?? 1),
+                };
+              })
+              .filter(Boolean) as { name: string; totalAmount: number }[],
+            ...perBookingFeeLineItems,
+          ],
           cancellationPolicyFee,
           cancellationPolicyLabel: selectedCancellationPolicy?.label,
           subtotal,
@@ -2036,7 +2056,7 @@ export function PrivateShuttleBookingFlow({
           breakdown: null,
         },
       ];
-      const feeLineItemsForModal = addOnSelections
+      const addOnFeeLineItemsForModal = addOnSelections
         .map((sel) => {
           const addOn = addOns.find((a) => a.addOnId === sel.addOnId);
           if (!addOn) return null;
@@ -2053,6 +2073,7 @@ export function PrivateShuttleBookingFlow({
           };
         })
         .filter(Boolean) as { name: string; totalAmount: number }[];
+      const feeLineItemsForModal = [...addOnFeeLineItemsForModal, ...perBookingFeeLineItems];
 
       setCheckoutClientSecret(paymentIntent.clientSecret ?? '');
       setCheckoutModalData({
@@ -2913,6 +2934,12 @@ export function PrivateShuttleBookingFlow({
                         },
                       ]
                     : []),
+                  ...perBookingFeeLineItems.map((fee) => ({
+                    kind: 'line' as const,
+                    label: fee.name,
+                    amount: fee.totalAmount,
+                    type: 'fee' as const,
+                  })),
                   ...(cancellationPolicyFee > 0
                     ? [
                         {

package/src/components/booking/provider-dashboard-change-booking.ts

@@ -26,6 +26,17 @@ export type ProviderDashboardChangeBookingPayload = {
     /** Signed major-unit rows; may include admin custom receipt lines merged with provider inline adjustments. */
     additionalAdjustments?: Array<{ label: string; amount: number }>;
   } | null;
+  /**
+   * Admin/provider change flow: when FE-authoritative quoting is used, apply must persist
+   * the exact receipt that was quoted instead of rebuilding from catalog pricing.
+   */
+  authoritativeReceipt?: {
+    currency?: string | null;
+    lineItems: Array<{ type: string; label: string; amount: number; quantity?: number; reference?: string }>;
+    subtotalBeforeTax: number;
+    taxAmount: number;
+    totalAmount: number;
+  } | null;
   capacitySeatCredit?: {
     enabled: boolean;
     previousPassengerCount?: number | null;

package/src/lib/booking/pricing.ts

@@ -450,15 +450,26 @@ export function computeOrderSummary(
       : 0;
 
   const fees = pricingConfig.fees ?? {};
-  const byCurrency = hasFees ? pricingConfig.feesByCurrency?.[currency] : undefined;
-  const feeLineItems: OrderSummaryFeeLine[] =
-    !hasFees || totalQuantity === 0 || isTaxIncludedInPrice || byCurrency == null
+  const perBookingFees = pricingConfig.perBookingFees ?? {};
+  const perPersonByCurrency = hasFees ? pricingConfig.feesByCurrency?.[currency] : undefined;
+  const perBookingByCurrency = pricingConfig.perBookingFeesByCurrency?.[currency];
+  const perPersonFeeLineItems: OrderSummaryFeeLine[] =
+    !hasFees || totalQuantity === 0 || isTaxIncludedInPrice || perPersonByCurrency == null
       ? []
-      : Object.entries(byCurrency).map(([name, amountPerPerson]) => ({
+      : Object.entries(perPersonByCurrency).map(([name, amountPerPerson]) => ({
           name,
           totalAmount: round2(totalQuantity * amountPerPerson),
           description: fees[name]?.description,
         }));
+  const perBookingFeeLineItems: OrderSummaryFeeLine[] =
+    totalQuantity === 0 || isTaxIncludedInPrice || perBookingByCurrency == null
+      ? []
+      : Object.entries(perBookingByCurrency).map(([name, amountPerBooking]) => ({
+          name,
+          totalAmount: round2(amountPerBooking),
+          description: perBookingFees[name]?.description,
+        }));
+  const feeLineItems = [...perPersonFeeLineItems, ...perBookingFeeLineItems];
 
   const feesTotal = feeLineItems.reduce((s, f) => s + f.totalAmount, 0);
   const subtotal = round2(basePrice + returnPriceAdjustment + cancellationPolicyFee + feesTotal);

package/src/lib/booking-api.ts

@@ -850,6 +850,8 @@ export interface PricingConfig {
   currenciesWithTaxIncluded: string[];
   fees?: Record<string, { feePerPerson: number; description?: string }>;
   feesByCurrency?: Record<string, Record<string, number>>;
+  perBookingFees?: Record<string, { feePerBooking: number; description?: string }>;
+  perBookingFeesByCurrency?: Record<string, Record<string, number>>;
   exchangeRates?: Record<string, number>;
   cancellationPolicies?: CancellationPolicyOption[];
 }