@ticketboothapp/booking 1.2.132 → 1.2.134

package/package.json

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

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -554,6 +554,7 @@ export function AdminChangeBookingFlow({
     providerPricingOverrides,
     adminCustomLinesAsAdditionalAdjustments,
     mergedProviderAdditionalAdjustments,
+    adminStructuredAdjustments,
     unchangedReceiptAnchor,
     showChangeFlowManualPriceLines,
     showAdminCustomLineEditor,
@@ -870,6 +871,7 @@ export function AdminChangeBookingFlow({
     displayChangeFlowProposedTotalWithEditableLines,
     providerPricingOverrides,
     mergedProviderAdditionalAdjustments,
+    adminStructuredAdjustments,
     providerApplyAuthoritativeReceipt,
     onSuccess,
     totalPrice,

package/src/components/booking/AdminChangePricingPanel.tsx

@@ -9,10 +9,17 @@ export type AdminCustomReceiptLine = {
   label: string;
   amountInput: string;
   amountSign: 1 | -1;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+  scope: 'POSITIVE_AMENDMENT_VALUE' | 'CURRENT_ACTIVE_TICKETS' | 'CURRENT_ACTIVE_BOOKING';
+  taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+  reasonCode: string;
 };
 
 type AdminCustomReceiptLinePatch = Partial<
-  Pick<AdminCustomReceiptLine, 'label' | 'amountInput' | 'amountSign'>
+  Pick<
+    AdminCustomReceiptLine,
+    'label' | 'amountInput' | 'amountSign' | 'calculation' | 'scope' | 'taxBehavior' | 'reasonCode'
+  >
 >;
 
 export interface AdminChangePricingMessagesProps {
@@ -181,6 +188,19 @@ export function AdminChangePricingAdjustments({
                     onUpdateAdminCustomReceiptLine(adj.id, { label: e.target.value })
                   }
                 />
+                <select
+                  className="rounded-md border border-stone-300 bg-white px-2 py-1 text-xs text-stone-700"
+                  aria-label="Adjustment calculation"
+                  value={adj.calculation}
+                  onChange={(e) =>
+                    onUpdateAdminCustomReceiptLine(adj.id, {
+                      calculation: e.target.value as AdminCustomReceiptLine['calculation'],
+                    })
+                  }
+                >
+                  <option value="FIXED_AMOUNT">Fixed amount</option>
+                  <option value="PERCENTAGE">Percentage</option>
+                </select>
                 <div
                   className="flex shrink-0 rounded-lg border border-stone-300 bg-stone-100/90 p-0.5 shadow-sm"
                   role="group"
@@ -215,7 +235,7 @@ export function AdminChangePricingAdjustments({
                   type="text"
                   inputMode="decimal"
                   className="admin-custom-receipt-input-amount w-[7rem] shrink-0 rounded-md border border-stone-300 bg-white text-right text-sm font-medium tabular-nums text-stone-800 placeholder:text-stone-400 focus:outline-none focus:ring-2 focus:ring-stone-400/80"
-                  placeholder="0.00"
+                  placeholder={adj.calculation === 'PERCENTAGE' ? '10' : '0.00'}
                   aria-label="Amount"
                   value={adj.amountInput}
                   onChange={(e) =>
@@ -224,6 +244,38 @@ export function AdminChangePricingAdjustments({
                     })
                   }
                 />
+                <span className="text-xs text-stone-500" aria-hidden>
+                  {adj.calculation === 'PERCENTAGE' ? '%' : ''}
+                </span>
+                <select
+                  className="rounded-md border border-stone-300 bg-white px-2 py-1 text-xs text-stone-700"
+                  aria-label="Adjustment scope"
+                  value={adj.scope}
+                  onChange={(e) =>
+                    onUpdateAdminCustomReceiptLine(adj.id, {
+                      scope: e.target.value as AdminCustomReceiptLine['scope'],
+                    })
+                  }
+                >
+                  <option value="POSITIVE_AMENDMENT_VALUE">Added/change value</option>
+                  <option value="CURRENT_ACTIVE_TICKETS">All active tickets</option>
+                  <option value="CURRENT_ACTIVE_BOOKING">Entire active booking</option>
+                </select>
+                <select
+                  className="rounded-md border border-stone-300 bg-white px-2 py-1 text-xs text-stone-700"
+                  aria-label="Tax treatment"
+                  value={adj.taxBehavior}
+                  onChange={(e) =>
+                    onUpdateAdminCustomReceiptLine(adj.id, {
+                      taxBehavior: e.target.value as AdminCustomReceiptLine['taxBehavior'],
+                    })
+                  }
+                >
+                  <option value="NON_TAXABLE">Non-taxable</option>
+                  <option value="TAXABLE">Taxable</option>
+                  <option value="PRE_TAX_DISCOUNT">Pre-tax discount</option>
+                  <option value="POST_TAX_DISCOUNT">Post-tax discount</option>
+                </select>
                 <button
                   type="button"
                   className="admin-custom-receipt-remove ml-auto shrink-0 rounded-md text-stone-400 hover:bg-stone-100 hover:text-stone-700 sm:ml-0"

package/src/components/booking/admin-change-provider-payload.ts

@@ -32,6 +32,7 @@ export interface BuildAdminChangeProviderPayloadParams {
   newTotalAmount: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
+  adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
   providerApplyAuthoritativeReceipt?: ProviderDashboardChangeBookingPayload['authoritativeReceipt'];
   previousPassengerCount: number;
   previousAvailabilityId?: string | null;
@@ -52,6 +53,7 @@ export function buildAdminChangeProviderPayload({
   newTotalAmount,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
+  adminStructuredAdjustments,
   providerApplyAuthoritativeReceipt,
   previousPassengerCount,
   previousAvailabilityId,
@@ -90,6 +92,7 @@ export function buildAdminChangeProviderPayload({
           }
         : undefined,
     authoritativeReceipt: providerApplyAuthoritativeReceipt,
+    structuredAdjustments: adminStructuredAdjustments,
     capacitySeatCredit: {
       enabled: true,
       previousPassengerCount,

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

@@ -1,5 +1,35 @@
 import type { Currency } from './CurrencySwitcher';
 
+export type AdminAmendmentAdjustmentMode =
+  | 'FIXED_AMOUNT'
+  | 'PERCENTAGE_DISCOUNT'
+  | 'PERCENTAGE_SURCHARGE';
+
+export type AdminAmendmentAdjustmentScope =
+  | 'POSITIVE_AMENDMENT_VALUE'
+  | 'CURRENT_ACTIVE_TICKETS'
+  | 'CURRENT_ACTIVE_BOOKING'
+  | 'SELECTED_COMPONENTS';
+
+export type AdminAmendmentTaxBehavior =
+  | 'NON_TAXABLE'
+  | 'TAXABLE'
+  | 'PRE_TAX_DISCOUNT'
+  | 'POST_TAX_DISCOUNT';
+
+export type AdminAmendmentStructuredAdjustment = {
+  adjustmentId: string;
+  mode: AdminAmendmentAdjustmentMode;
+  fixedAmount?: number | null;
+  percentageBasisPoints?: number | null;
+  scope: AdminAmendmentAdjustmentScope;
+  selectedComponentIds?: string[];
+  taxBehavior: AdminAmendmentTaxBehavior;
+  reasonCode: string;
+  referenceCode?: string | null;
+  reason?: string | null;
+};
+
 /** Payload passed to `onChangeBooking` when applying a dashboard-managed booking change. */
 export type ProviderDashboardChangeBookingPayload = {
   /** Parent catalog product id. Present when admin changes the booking to a different product. */
@@ -26,6 +56,15 @@ 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;
+  /** Server-resolved amendment adjustments. Percentage amounts are never calculated by the browser. */
+  structuredAdjustments?: AdminAmendmentStructuredAdjustment[];
+  /** Immutable adjustment ids selected for reversal. */
+  reverseAdjustmentIds?: string[];
+  /** Admin refund decision for removal operations returned by the quote preview. */
+  refundDispositionsByOperationId?: Record<
+    string,
+    'REFUND_TO_ORIGINAL_PAYMENT' | 'PENDING_REFUND' | 'NO_REFUND'
+  >;
   /**
    * 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.

package/src/components/booking/useAdminChangeCheckoutController.ts

@@ -126,6 +126,7 @@ export interface UseAdminChangeCheckoutControllerParams {
   displayChangeFlowProposedTotalWithEditableLines: number;
   providerPricingOverrides: AdminChangeProviderLineOverride[];
   mergedProviderAdditionalAdjustments: AdminChangeProviderAdditionalAdjustment[];
+  adminStructuredAdjustments: NonNullable<ProviderDashboardChangeBookingPayload['structuredAdjustments']>;
   providerApplyAuthoritativeReceipt?: ProviderDashboardChangeBookingPayload['authoritativeReceipt'];
   onSuccess?: ChangeBookingFlowProps['onSuccess'];
   totalPrice: number;
@@ -223,6 +224,7 @@ export function useAdminChangeCheckoutController({
   displayChangeFlowProposedTotalWithEditableLines,
   providerPricingOverrides,
   mergedProviderAdditionalAdjustments,
+  adminStructuredAdjustments,
   providerApplyAuthoritativeReceipt,
   onSuccess,
   totalPrice,
@@ -320,6 +322,7 @@ export function useAdminChangeCheckoutController({
       newTotalAmount: displayChangeFlowProposedTotalWithEditableLines,
       providerPricingOverrides,
       mergedProviderAdditionalAdjustments,
+      adminStructuredAdjustments,
       providerApplyAuthoritativeReceipt,
       previousPassengerCount: changeFlowInitialTicketCount,
       previousAvailabilityId: initialValues?.availabilityId ?? null,

package/src/components/booking/useAdminChangePriceSummary.ts

@@ -27,7 +27,12 @@ import { useAdminChangeProtectedPricing } from './useAdminChangeProtectedPricing
 import { useAdminChangePromoDiscount } from './useAdminChangePromoDiscount';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
-type AdminCustomReceiptLine = { label: string; amountInput: string; amountSign?: number };
+type AdminCustomReceiptLine = {
+  label: string;
+  amountInput: string;
+  amountSign?: number;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+};
 type ProviderPricingUi = NonNullable<
   NonNullable<ChangeBookingFlowProps['flowUi']>['providerDashboardChangePricingUi']
 >;
@@ -171,6 +176,10 @@ export function useAdminChangePriceSummary({
     addOns,
     adminCustomReceiptLines,
   });
+  const promoEligibleSubtotalForCheckoutExcludingCancellation = Math.max(
+    0,
+    promoEligibleSubtotalForCheckout - cancellationPolicyFee,
+  );
 
   const providerPricingUi = flowUi?.providerDashboardChangePricingUi;
   const providerQuotedLines = useMemo(
@@ -315,7 +324,7 @@ export function useAdminChangePriceSummary({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItemsWithAddOns,
     effectiveSubtotalForCheckout,
-    promoEligibleSubtotalForCheckout,
+    promoEligibleSubtotalForCheckout: promoEligibleSubtotalForCheckoutExcludingCancellation,
     addOnTotal,
     originalAddOnSubtotal,
     originalProductOptionId,

package/src/components/booking/useAdminChangePromoDiscount.ts

@@ -37,7 +37,7 @@ interface UseAdminChangePromoDiscountParams {
 function originalReceiptGrossSubtotalBeforePromo(
   originalReceipt: ChangeBookingFlowProps['originalReceipt'],
 ): number {
-  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION', 'CANCELLATION_UPGRADE']);
+  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION']);
   return (originalReceipt?.lineItems ?? []).reduce((sum, line) => {
     const amount = Number(line.amount) || 0;
     if (amount <= 0) return sum;

package/src/components/booking/useAdminChangeProtectedPricing.ts

@@ -15,7 +15,12 @@ import type { Currency } from './CurrencySwitcher';
 import { normalizeLineLabelForCompare } from './change-booking-flow-helpers';
 
 type AddOnSelection = { addOnId: string; variantId?: string; quantity?: number };
-type AdminCustomReceiptLine = { label: string; amountInput: string; amountSign?: number };
+type AdminCustomReceiptLine = {
+  label: string;
+  amountInput: string;
+  amountSign?: number;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+};
 
 function addOnSelectionTotal(selections: AddOnSelection[] | null | undefined, addOns: AddOn[]): number {
   let sum = 0;
@@ -215,6 +220,7 @@ export function useAdminChangeProtectedPricing({
     () =>
       roundMoney(
         adminCustomReceiptLines.reduce((sum, line) => {
+          if (line.calculation !== 'FIXED_AMOUNT') return sum;
           const raw = line.amountInput.trim();
           if (raw === '' || raw === '+' || raw === '-') return sum;
           const n = Number(raw);

package/src/components/booking/useAdminChangeQuoteDisplayState.tsx

@@ -336,6 +336,7 @@ export function useAdminChangeQuoteDisplayState({
     providerPricingOverrides,
     adminCustomLinesAsAdditionalAdjustments,
     mergedProviderAdditionalAdjustments,
+    adminStructuredAdjustments,
   } = useAdminProviderPricingAdjustments({
     isProviderDashboardChange,
     showProviderPricingInlineEditor,
@@ -425,6 +426,7 @@ export function useAdminChangeQuoteDisplayState({
     providerPricingOverrides,
     adminCustomLinesAsAdditionalAdjustments,
     mergedProviderAdditionalAdjustments,
+    adminStructuredAdjustments,
     unchangedReceiptAnchor,
     showChangeFlowManualPriceLines,
     showAdminCustomLineEditor,

package/src/components/booking/useAdminCustomReceiptLines.ts

@@ -5,10 +5,17 @@ export type AdminCustomReceiptLine = {
   label: string;
   amountInput: string;
   amountSign: 1 | -1;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+  scope: 'POSITIVE_AMENDMENT_VALUE' | 'CURRENT_ACTIVE_TICKETS' | 'CURRENT_ACTIVE_BOOKING';
+  taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+  reasonCode: string;
 };
 
 type AdminCustomReceiptLinePatch = Partial<
-  Pick<AdminCustomReceiptLine, 'label' | 'amountInput' | 'amountSign'>
+  Pick<
+    AdminCustomReceiptLine,
+    'label' | 'amountInput' | 'amountSign' | 'calculation' | 'scope' | 'taxBehavior' | 'reasonCode'
+  >
 >;
 
 export function useAdminCustomReceiptLines(resetKey: string | null | undefined) {
@@ -25,6 +32,10 @@ export function useAdminCustomReceiptLines(resetKey: string | null | undefined)
         label: '',
         amountInput: '',
         amountSign: 1,
+        calculation: 'FIXED_AMOUNT',
+        scope: 'POSITIVE_AMENDMENT_VALUE',
+        taxBehavior: 'NON_TAXABLE',
+        reasonCode: 'STAFF_ADJUSTMENT',
       },
     ]);
   }, []);

package/src/components/booking/useAdminProviderPricingAdjustments.ts

@@ -6,7 +6,19 @@ import type {
 } from './booking-flow-ui';
 import type { ProviderDashboardChangeBookingPayload } from './provider-dashboard-change-booking';
 
-type AdminCustomReceiptLine = { label: string; amountInput: string; amountSign?: number };
+type AdminCustomReceiptLine = {
+  id: string;
+  label: string;
+  amountInput: string;
+  amountSign?: number;
+  calculation: 'FIXED_AMOUNT' | 'PERCENTAGE';
+  scope: 'POSITIVE_AMENDMENT_VALUE' | 'CURRENT_ACTIVE_TICKETS' | 'CURRENT_ACTIVE_BOOKING';
+  taxBehavior: 'NON_TAXABLE' | 'TAXABLE' | 'PRE_TAX_DISCOUNT' | 'POST_TAX_DISCOUNT';
+  reasonCode: string;
+};
+type AdminStructuredAdjustment = NonNullable<
+  ProviderDashboardChangeBookingPayload['structuredAdjustments']
+>[number];
 type ProviderLineOverride = NonNullable<
   NonNullable<ProviderDashboardChangeBookingPayload['pricingAdjustment']>['lineOverrides']
 >[number];
@@ -124,9 +136,33 @@ export function useAdminProviderPricingAdjustments({
     [adminCustomReceiptLines],
   );
 
+  const adminStructuredAdjustments = useMemo(
+    (): AdminStructuredAdjustment[] =>
+      adminCustomReceiptLines.flatMap((line) => {
+        const value = Number(line.amountInput.trim());
+        if (!Number.isFinite(value) || value <= 0) return [];
+        const discount = (line.amountSign ?? 1) < 0;
+        const percentage = line.calculation === 'PERCENTAGE';
+        return [{
+          adjustmentId: line.id,
+          mode: percentage
+            ? discount ? 'PERCENTAGE_DISCOUNT' : 'PERCENTAGE_SURCHARGE'
+            : 'FIXED_AMOUNT',
+          ...(percentage
+            ? { percentageBasisPoints: Math.round(value * 100) }
+            : { fixedAmount: roundMoney((discount ? -1 : 1) * value) }),
+          scope: line.scope,
+          taxBehavior: line.taxBehavior,
+          reasonCode: line.reasonCode.trim() || 'STAFF_ADJUSTMENT',
+          reason: line.label.trim() || null,
+        }];
+      }),
+    [adminCustomReceiptLines],
+  );
+
   const mergedProviderAdditionalAdjustments = useMemo(
-    () => [...providerAdditionalAdjustments, ...adminCustomLinesAsAdditionalAdjustments],
-    [providerAdditionalAdjustments, adminCustomLinesAsAdditionalAdjustments],
+    () => providerAdditionalAdjustments,
+    [providerAdditionalAdjustments],
   );
 
   const hasEffectiveChangeSelection =
@@ -142,5 +178,6 @@ export function useAdminProviderPricingAdjustments({
     providerPricingOverrides,
     adminCustomLinesAsAdditionalAdjustments,
     mergedProviderAdditionalAdjustments,
+    adminStructuredAdjustments,
   };
 }

package/src/components/booking/useChangeBookingPriceSummary.ts

@@ -142,6 +142,10 @@ export function useChangeBookingPriceSummary({
     originalAddOnSelections,
     addOns,
   });
+  const promoEligibleSubtotalExcludingCancellation = Math.max(
+    0,
+    promoEligibleSubtotal - cancellationPolicyFee,
+  );
 
   const {
     effectivePromoDiscountAmount,
@@ -159,7 +163,7 @@ export function useChangeBookingPriceSummary({
     ticketLineItemsForChangeFlowDisplay,
     feeLineItems,
     effectiveSubtotal,
-    promoEligibleSubtotal,
+    promoEligibleSubtotal: promoEligibleSubtotalExcludingCancellation,
     addOnTotal,
     originalAddOnSubtotal,
     originalProductOptionId,

package/src/components/booking/useChangeBookingPromoDiscount.ts

@@ -34,7 +34,7 @@ interface UseChangeBookingPromoDiscountParams {
 function originalReceiptGrossSubtotalBeforePromo(
   originalReceipt: ChangeBookingFlowProps['originalReceipt'],
 ): number {
-  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION', 'CANCELLATION_UPGRADE']);
+  const chargeTypes = new Set(['TICKET', 'FEE', 'RETURN_OPTION']);
   return (originalReceipt?.lineItems ?? []).reduce((sum, line) => {
     const amount = Number(line.amount) || 0;
     if (amount <= 0) return sum;

package/src/components/booking/useStandardBookingPriceSummary.ts

@@ -246,7 +246,7 @@ export function useStandardBookingPriceSummary({
   const checkoutReturnLineAmount = returnPriceAdjustment;
   const effectiveSubtotalBeforeAddOns = subtotal;
   const effectiveSubtotal = effectiveSubtotalBeforeAddOns + addOnTotal;
-  const promoEligibleSubtotal = effectiveSubtotalBeforeAddOns;
+  const promoEligibleSubtotal = Math.max(0, effectiveSubtotalBeforeAddOns - cancellationPolicyFee);
 
   const feeLineItemsWithAddOns = useMemo(() => {
     const addOnLines = addOnSelections

package/src/index.ts

@@ -26,6 +26,10 @@ export type {
 export { PrivateShuttleBookingFlow } from './components/booking/PrivateShuttleBookingFlow';
 export type { BookingFlowUiOptions } from './components/booking/booking-flow-ui';
 export type {
+  AdminAmendmentAdjustmentMode,
+  AdminAmendmentAdjustmentScope,
+  AdminAmendmentStructuredAdjustment,
+  AdminAmendmentTaxBehavior,
   ProviderDashboardChangeBookingPayload,
   ProviderDashboardInitialBooking,
 } from './components/booking/provider-dashboard-change-booking';