@ticketboothapp/booking 1.2.93 → 1.2.94

package/package.json

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

package/src/components/booking/PrivateShuttleBookingFlow.tsx

@@ -44,6 +44,7 @@ import { CheckoutModal, type CheckoutModalLineItem } from './CheckoutModal';
 import { CancellationPolicySelector } from './CancellationPolicySelector';
 import { PriceSummary } from './PriceSummary';
 import { TermsAcceptance } from './TermsAcceptance';
+import { PromoCodeInput } from './PromoCodeInput';
 import { ItineraryBuilder } from './ItineraryBuilder';
 import { MealDrinkAddOnSelector, canUseMealDrinkSelector } from './MealDrinkAddOnSelector';
 import { AdminPaymentChoiceModal } from './AdminPaymentChoiceModal';
@@ -261,6 +262,7 @@ export function PrivateShuttleBookingFlow({
   const [promoDiscountAmount, setPromoDiscountAmount] = useState(0);
   const [isGiftCard, setIsGiftCard] = useState(false);
   const [isVoucher, setIsVoucher] = useState(false);
+  const activePromoCode = isAdmin ? appliedPromoCode : null;
   const [additionalHoursCount, setAdditionalHoursCount] = useState(
     () => initialBooking?.additionalHoursCount ?? initialValues?.additionalHoursCount ?? 0
   );
@@ -369,7 +371,7 @@ export function PrivateShuttleBookingFlow({
     const endDate = format(endOfDay(clampedEnd), 'yyyy-MM-dd');
     const result = await getAvailabilities(product.productId, startDate, endDate, {
       allOptions: true,
-      promoCode: appliedPromoCode || undefined,
+      promoCode: activePromoCode || undefined,
       ...(pricingProfileIdForAvailabilities
         ? { pricingProfileId: pricingProfileIdForAvailabilities }
         : {}),
@@ -417,7 +419,7 @@ export function PrivateShuttleBookingFlow({
       ? buildAvailabilitiesCacheKey(
           product.productId,
           activeOptionIdsKey,
-          appliedPromoCode,
+          activePromoCode,
           pricingProfileIdForAvailabilities,
         )
       : null;
@@ -438,7 +440,7 @@ export function PrivateShuttleBookingFlow({
     product.productId,
     selectedDate,
     companyTimezone,
-    appliedPromoCode,
+    activePromoCode,
     pricingProfileIdForAvailabilities,
     cancellationPolicyProfileIdForAvailabilities,
     activeOptionIdsKey,
@@ -477,7 +479,7 @@ export function PrivateShuttleBookingFlow({
   useEffect(() => {
     fetchedRangesRef.current = [];
   }, [
-    appliedPromoCode,
+    activePromoCode,
     pricingProfileIdForAvailabilities,
     cancellationPolicyProfileIdForAvailabilities,
   ]);
@@ -527,7 +529,7 @@ export function PrivateShuttleBookingFlow({
         ? buildAvailabilitiesCacheKey(
             product.productId,
             activeOptionIdsKey,
-            appliedPromoCode,
+            activePromoCode,
             pricingProfileIdForAvailabilities,
           )
         : null;
@@ -583,7 +585,7 @@ export function PrivateShuttleBookingFlow({
         const endDate = format(endOfDay(clampedEnd), 'yyyy-MM-dd');
         const result = await getAvailabilities(product.productId, startDate, endDate, {
           allOptions: true,
-          promoCode: appliedPromoCode || undefined,
+          promoCode: activePromoCode || undefined,
           ...(pricingProfileIdForAvailabilities
             ? { pricingProfileId: pricingProfileIdForAvailabilities }
             : {}),
@@ -657,7 +659,7 @@ export function PrivateShuttleBookingFlow({
     activeOptionIdsKey,
     selectedDate,
     product.productId,
-    appliedPromoCode,
+    activePromoCode,
     pricingProfileIdForAvailabilities,
     cancellationPolicyProfileIdForAvailabilities,
     needsFetch,
@@ -864,7 +866,7 @@ export function PrivateShuttleBookingFlow({
 
   useEffect(() => {
     if (
-      !appliedPromoCode ||
+      !activePromoCode ||
       !selectedOption ||
       !selectedDate ||
       !selectedStartTime ||
@@ -879,7 +881,7 @@ export function PrivateShuttleBookingFlow({
     if (!companyId) return;
     let cancelled = false;
     getPromoDiscount(
-      appliedPromoCode,
+      activePromoCode,
       companyId,
       product.productId,
       selectedOption,
@@ -906,7 +908,7 @@ export function PrivateShuttleBookingFlow({
       cancelled = true;
     };
   }, [
-    appliedPromoCode,
+    activePromoCode,
     selectedOption,
     selectedDate,
     selectedStartTime,
@@ -1086,6 +1088,7 @@ export function PrivateShuttleBookingFlow({
 
   const handleApplyPromo = useCallback(async () => {
     const code = promoCodeInput.trim().toUpperCase();
+    if (!isAdmin) return;
     if (!code || appliedPromoCode === code) return;
     if (!product.companyId) return;
     lastValidatedInputRef.current = code;
@@ -1116,6 +1119,7 @@ export function PrivateShuttleBookingFlow({
   }, [
     promoCodeInput,
     appliedPromoCode,
+    isAdmin,
     product.companyId,
     product.productId,
     hasOngoingDiscount,
@@ -1125,6 +1129,29 @@ export function PrivateShuttleBookingFlow({
   const handleApplyPromoRef = useRef(handleApplyPromo);
   handleApplyPromoRef.current = handleApplyPromo;
 
+  useEffect(() => {
+    if (!isAdmin) return;
+    const trimmed = promoCodeInput.trim().toUpperCase();
+    if (!trimmed) return;
+    if (!selectedOption || !selectedStartTime || resourceCount === 0) return;
+    if (appliedPromoCode === trimmed) return;
+    if (lastValidatedInputRef.current === trimmed && promoCodeError) return;
+
+    const timer = setTimeout(() => {
+      handleApplyPromoRef.current();
+    }, 600);
+
+    return () => clearTimeout(timer);
+  }, [
+    isAdmin,
+    promoCodeInput,
+    appliedPromoCode,
+    promoCodeError,
+    selectedOption,
+    selectedStartTime,
+    resourceCount,
+  ]);
+
   const itineraryDisplayItems = useMemo(() => {
     if (!selectedOption || !selectedStartTime) return [];
     const items: Array<{
@@ -1276,7 +1303,7 @@ export function PrivateShuttleBookingFlow({
           foodRestrictions: foodRestrictions.trim() || null,
           addOnSelections: addOnSelections.length > 0 ? addOnSelections : null,
           cancellationPolicyId: cancellationPolicyId ?? initialBooking?.cancellationPolicyId ?? null,
-          promoCode: appliedPromoCode ?? null,
+          promoCode: activePromoCode ?? null,
           newTotalAmount: totalPrice,
           additionalHoursCount: isAdmin ? additionalHoursCount : null,
         });
@@ -1310,7 +1337,7 @@ export function PrivateShuttleBookingFlow({
         requestedPassengerCount: isSpecialRequest ? passengerCount : undefined,
         pickupLocationId: pickupLocationId || undefined,
         cancellationPolicyId: cancellationPolicyId || undefined,
-        promoCode: (isAdmin ? appliedPromoCode : null) || undefined,
+        promoCode: activePromoCode || undefined,
         travelerHotel: selectedPickupLocation?.name || customPickupAddress || undefined,
         draftItinerary:
           draftItineraryDestinations.length > 0 || planningNotes
@@ -1427,8 +1454,8 @@ export function PrivateShuttleBookingFlow({
           ? [
               {
                 label:
-                  appliedPromoCode
-                    ? `Promo: ${appliedPromoCode}`
+                  activePromoCode
+                    ? `Promo: ${activePromoCode}`
                     : (t('booking.discount') || 'Discount'),
                 amount: -effectivePromoDiscountAmount,
                 type: isGiftCard ? 'GIFT_CARD' : 'PROMO_CODE',
@@ -1502,7 +1529,7 @@ export function PrivateShuttleBookingFlow({
           itineraryDisplay: itineraryDisplayForStorage,
           termsAcceptedAt: termsAcceptedAt ?? undefined,
           cancellationPolicyId: cancellationPolicyId || undefined,
-          promoCode: (isAdmin ? appliedPromoCode : null) || undefined,
+          promoCode: activePromoCode || undefined,
           checkoutBreakdown,
           paymentPlanType: 'DEPOSIT',
           depositAmount: depositInfo.depositAmount,
@@ -1559,7 +1586,7 @@ export function PrivateShuttleBookingFlow({
           isTaxIncludedInPrice,
           taxRate,
           promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
-          discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : undefined,
+          discountLabel: activePromoCode ? `Promo: ${activePromoCode}` : undefined,
         });
         setShowAdminPaymentChoice(true);
         setLoading(false);
@@ -1582,7 +1609,7 @@ export function PrivateShuttleBookingFlow({
         itineraryDisplay: itineraryDisplayForStorage,
         termsAcceptedAt: termsAcceptedAt ?? undefined,
         cancellationPolicyId: cancellationPolicyId || undefined,
-        promoCode: (isAdmin ? appliedPromoCode : null) || undefined,
+        promoCode: activePromoCode || undefined,
         checkoutBreakdown,
         ...(depositInfo && {
           paymentPlanType: 'DEPOSIT' as const,
@@ -1674,7 +1701,7 @@ export function PrivateShuttleBookingFlow({
         cancellationPolicyFee,
         cancellationPolicyLabel: selectedCancellationPolicy?.label,
         promoDiscountAmount: effectivePromoDiscountAmount > 0 ? effectivePromoDiscountAmount : 0,
-        discountLabel: appliedPromoCode ? `Promo: ${appliedPromoCode}` : undefined,
+        discountLabel: activePromoCode ? `Promo: ${activePromoCode}` : undefined,
         isDepositPayment: !!depositInfo,
         balanceChargeDaysBefore: depositInfo ? (privateShuttleConfig?.balanceChargeDaysBefore ?? 7) : undefined,
       });
@@ -2528,8 +2555,39 @@ export function PrivateShuttleBookingFlow({
                 total={depositInfo ? depositInfo.depositAmount : totalPrice}
                 currency={currency}
                 locale={locale as 'en' | 'fr'}
-                taxAmount={taxAmount}
+                taxAmount={effectiveTaxAmount}
                 taxRate={taxRate}
+                discountAmount={effectivePromoDiscountAmount}
+                discountLabel={activePromoCode ? `Promo: ${activePromoCode}` : undefined}
+                extraBetweenTaxAndTotal={
+                  isAdmin ? (
+                    <PromoCodeInput
+                      promoCodeInput={promoCodeInput}
+                      appliedPromoCode={appliedPromoCode}
+                      promoCodeError={promoCodeError}
+                      promoCodeValidating={promoCodeValidating}
+                      promoDiscountAmount={promoDiscountAmount}
+                      currency={currency}
+                      locale={locale}
+                      t={t}
+                      onInputChange={(value) => {
+                        setPromoCodeInput(value);
+                        setPromoCodeError('');
+                      }}
+                      onApply={handleApplyPromo}
+                      onRemove={() => {
+                        lastValidatedInputRef.current = null;
+                        setAppliedPromoCode(null);
+                        setPromoCodeInput('');
+                        setPromoCodeError('');
+                        setPromoDiscountAmount(0);
+                        setIsGiftCard(false);
+                        setIsVoucher(false);
+                        fetchedRangesRef.current = [];
+                      }}
+                    />
+                  ) : null
+                }
                 size="sm"
                 t={t}
                 depositMode={