@ticketboothapp/booking 1.2.124 → 1.2.126

package/package.json

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

package/src/components/booking/AdminPaymentChoiceModal.tsx

@@ -12,6 +12,8 @@ interface AdminPaymentChoiceModalProps {
   onPayNow: () => void;
   onConfirmWithoutPayment: () => void;
   onCancel: () => void;
+  description?: string;
+  payNowLabel?: string;
 }
 
 /**
@@ -28,6 +30,8 @@ export function AdminPaymentChoiceModal({
   onPayNow,
   onConfirmWithoutPayment,
   onCancel,
+  description,
+  payNowLabel,
 }: AdminPaymentChoiceModalProps) {
   if (!open) return null;
 
@@ -59,7 +63,7 @@ export function AdminPaymentChoiceModal({
             </button>
           </div>
           <p className="mt-3 text-sm text-stone-600 leading-relaxed">
-            Pay now, or confirm without payment. The customer can pay the full balance from the Manage Booking page.
+            {description ?? 'Pay now, or confirm without payment. The customer can pay the full balance from the Manage Booking page.'}
           </p>
         </div>
 
@@ -76,7 +80,7 @@ export function AdminPaymentChoiceModal({
             disabled={loading}
             className="w-full py-3 px-4 bg-emerald-600 text-white font-semibold rounded-lg hover:bg-emerald-700 disabled:opacity-50 disabled:cursor-not-allowed"
           >
-            {loading ? 'Loading...' : `Pay now (${formatCurrencyAmount(totalAmount, currency)})`}
+            {loading ? 'Loading...' : `${payNowLabel ?? 'Pay now'} (${formatCurrencyAmount(totalAmount, currency)})`}
           </button>
           <button
             type="button"

package/src/components/booking/PrivateShuttleCheckoutDialogs.tsx

@@ -57,6 +57,12 @@ export function PrivateShuttleCheckoutDialogs({
         currency={currency}
         loading={loading}
         error={error}
+        description={
+          adminChoiceData?.isDepositPayment
+            ? 'Pay the deposit now, or confirm without payment. The customer can pay the deposit or remaining balance from the Manage Booking page.'
+            : undefined
+        }
+        payNowLabel={adminChoiceData?.isDepositPayment ? 'Pay deposit' : undefined}
         onPayNow={onPayNow}
         onConfirmWithoutPayment={onConfirmWithoutPayment}
         onCancel={onAdminPaymentChoiceCancel}

package/src/components/booking/private-shuttle-checkout-controller.ts

@@ -487,7 +487,12 @@ export function usePrivateShuttleCheckoutController({
         setAdminChoiceData(buildPrivateShuttleAdminChoiceData({
           reservation,
           checkoutBreakdown,
-          totalAmount: checkoutDepositInfo.totalPrice,
+          totalAmount: checkoutDepositInfo.depositAmount,
+          fullTotalAmount: checkoutDepositInfo.totalPrice,
+          depositAmount: checkoutDepositInfo.depositAmount,
+          balanceAmount: checkoutDepositInfo.balanceAmount,
+          balanceChargeDaysBefore: balanceChargeDaysBefore ?? 7,
+          isDepositPayment: true,
           datePart: selectedDate,
           timePart: selectedStartTime,
           availabilityProductOptionId: selectedOption,

package/src/components/booking/private-shuttle-payment-choice-runner.ts

@@ -42,6 +42,11 @@ export interface PrivateShuttleAdminChoiceData {
   reservationExpiration?: string;
   checkoutBreakdown: CheckoutBreakdown;
   totalAmount: number;
+  fullTotalAmount?: number;
+  depositAmount?: number;
+  balanceAmount?: number;
+  balanceChargeDaysBefore?: number;
+  isDepositPayment?: boolean;
   datePart: string;
   timePart: string;
   availabilityProductOptionId: string;
@@ -67,6 +72,11 @@ export interface BuildPrivateShuttleAdminChoiceDataParams {
   reservation: { reservationReference: string; expiresAt?: string };
   checkoutBreakdown: CheckoutBreakdown;
   totalAmount: number;
+  fullTotalAmount?: number;
+  depositAmount?: number;
+  balanceAmount?: number;
+  balanceChargeDaysBefore?: number;
+  isDepositPayment?: boolean;
   datePart: string;
   timePart: string;
   availabilityProductOptionId: string;
@@ -176,7 +186,7 @@ export function buildPrivateShuttlePayNowCheckoutModalData(
     ticketLines: adminChoiceData.ticketLinesForModal,
     feeLineItems: adminChoiceData.feeLineItems,
     returnPriceAdjustment: 0,
-    subtotal: adminChoiceData.subtotal,
+    subtotal: adminChoiceData.fullTotalAmount ?? adminChoiceData.subtotal,
     tax: adminChoiceData.tax,
     total: adminChoiceData.totalAmount,
     totalQuantity: adminChoiceData.totalQuantity,
@@ -186,7 +196,17 @@ export function buildPrivateShuttlePayNowCheckoutModalData(
     cancellationPolicyLabel: adminChoiceData.cancellationPolicyLabel,
     promoDiscountAmount: adminChoiceData.promoDiscountAmount,
     discountLabel: adminChoiceData.discountLabel,
-    summaryOverride: adminChoiceData.summaryOverride,
+    summaryOverride: adminChoiceData.summaryOverride
+      ? {
+          ...adminChoiceData.summaryOverride,
+          fullTotalAmount:
+            adminChoiceData.summaryOverride.fullTotalAmount ??
+            adminChoiceData.fullTotalAmount ??
+            adminChoiceData.totalAmount,
+        }
+      : undefined,
+    isDepositPayment: adminChoiceData.isDepositPayment,
+    balanceChargeDaysBefore: adminChoiceData.balanceChargeDaysBefore,
   };
 }
 
@@ -255,9 +275,10 @@ export async function confirmPrivateShuttleAdminBookingWithoutPayment({
     skipConfirmationCommunications: skipConfirmationCommunications ? true : undefined,
     disableAutoCommunications: disableAutoCommunications ? true : undefined,
     checkoutBreakdown: adminChoiceData.checkoutBreakdown,
-    depositAmount: 0,
-    balanceAmount: adminChoiceData.totalAmount,
-    totalAmount: adminChoiceData.totalAmount,
+    depositAmount: adminChoiceData.depositAmount ?? 0,
+    balanceAmount: adminChoiceData.balanceAmount ?? adminChoiceData.totalAmount,
+    totalAmount: adminChoiceData.fullTotalAmount ?? adminChoiceData.totalAmount,
+    balanceChargeDaysBefore: adminChoiceData.balanceChargeDaysBefore,
     pricingQuoteId: adminChoiceData.pricingQuoteId,
     pricingQuoteInputsHash: adminChoiceData.pricingQuoteInputsHash,
     ...bookingSourceContext,

package/src/components/booking/private-shuttle-reservation-runner.ts

@@ -199,7 +199,7 @@ export async function reservePrivateShuttleForCheckout({
       productId,
       optionId: selectedOption,
       availabilityId: selectedAvailabilityId,
-      dateTime: selectedAvailability?.dateTime || selectedDate,
+      dateTime: selectedAvailability?.canonicalDateTime || selectedAvailability?.dateTime || selectedDate,
       bookingItems,
       currency,
       promoCode: activePromoCode || null,

package/src/lib/booking-api.ts

@@ -1675,6 +1675,7 @@ export interface ReturnOption {
 
 export interface Availability {
   dateTime: string;
+  canonicalDateTime?: string | null;
   productId?: string;
   vacancies: number;
   totalCapacity?: number;