@autobusal/routes-order 1.33.8 → 1.33.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.33.10 (2026-08-29)
+
+- The return date falls back to the outbound when the URL carries no real one ('none' on a one-way link), so switching a collapsed search to Round Trip opens the calendar on the month being travelled and cannot offer a day before the departure.
+- The collapsed search panel sits above the step markers: its backdrop-filter creates a stacking context, so the date picker used to draw underneath them.
+
+## 1.33.9 (2026-08-28)
+
+- Return-leg empty state fetches RETURN alternatives (swapped pair + return date) and its suggested-day links fill the return slot instead of rewriting the departure; nearby-city swaps map back to the URL's outbound pair (sweep #50).
+- Checkout money parsing survives the server's space-thousands format: currency is the last token, coupon amounts strip grouping spaces - totals over 1000 no longer corrupt the rendered total or the GA4 values (sweep #51).
+- useGetFlex takes the coupon-adjusted total so the quoted flex price matches what the server bills on a couponed booking (sweep #53).
+- Passenger age bands match the server rules: adult 12+, child 2-12, baby under 2 (sweep #48).
+
 ## 1.33.8 (2026-08-28)
 
 - usePostOrder replays the stored referral token as `referral`, so widget/link arrivals attribute their affiliate at checkout.

package/Checkout/Checkout.tsx

@@ -15,7 +15,7 @@ import Addons from '../Step5/Addons/Addons';
 import Billing from '../Step5/Billing/Billing';
 import Payments from '../Step5/Payments/Payments';
 import Sidebar from './Sidebar/Sidebar';
-import { getTotal, convertCoupon, getAvailablePayments } from '../Step5/utilities';
+import { getTotal, convertCoupon, getAvailablePayments, currencyOf } from '../Step5/utilities';
 import { Title, Actions, Results, Listing } from '../styles';
 import { RoutesSearchForm } from '@autobusal/routes-search/types';
 import { PersonData, BillingData } from '@autobusal/providers/types/persons';
@@ -179,7 +179,9 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
   const busFrom = useBusOccupied(step1.departure, step2.id as number);
   const busTo = useBusOccupied(step1._return, step3?.id as (number | undefined));
 
-  const currency = total.display.split(' ')[1] ?? '';
+  // Edited: Claude - Date: 2026-08-28 (sweep, low): the currency is the
+  // LAST token - split(' ')[1] read '250.00' out of '1 250.00 EUR'
+  const currency = currencyOf(total.display);
 
   // the brand sells seat choice: picking turns optional (auto-assign is the
   // free default) and each hand-picked seat costs this
@@ -195,7 +197,9 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
     step3?.price.id as (number | undefined),
     step1.adults ?? 1,
     step1.children ?? 0,
-    step1.babies ?? 0
+    step1.babies ?? 0,
+    // the coupon-adjusted fare, so the quote and the charge share a base
+    total.value
   );
 
   /**

package/Found/Empty/Empty.tsx

@@ -4,6 +4,7 @@ import { RoutesSearchForm } from '@autobusal/routes-search/types';
 import { AlternativesData, NearbyCity, FoundDay } from '../../types';
 
 interface Props {
+  type: 'departure' | '_return'
   step1: RoutesSearchForm
   data?: AlternativesData
   loading: boolean
@@ -25,29 +26,51 @@ interface Props {
  * even when the further city is cheaper: the passenger's problem here is
  * getting to the bus, not saving two euros.
  */
-const Empty = ({ step1, data, loading, t }: Props): JSX.Element => {
+const Empty = ({ type, step1, data, loading, t }: Props): JSX.Element => {
   // obtapi wants DD/MM/YYYY, the URL carries DD-MM-YYYY
   const asPath = (date: string): string => date.replace(/\//g, '-');
 
-  const link = (from: string, to: string, departure: string): string => ([
+  /*
+   * Edited: Claude - Date: 2026-08-28 (sweep, low)
+   *
+   * The suggestions here are now leg-aware. The URL always carries the
+   * OUTBOUND pair and both dates, but on the return leg the search that
+   * came back empty is destination->origin on the return date - so a
+   * suggested day must land in the RETURN slot (the old link moved the
+   * departure the buyer never asked to change and led straight back into
+   * the same empty step), and a nearby city for the return's origin is a
+   * replacement for the URL's `to`, not its `from`.
+   */
+  const isReturn = type === '_return';
+
+  const link = (from: string, to: string, departure: string, _return: string | undefined): string => ([
     '/bus-lines',
     from,
     to,
     asPath(departure),
-    step1._return ? asPath(step1._return) : 'none',
+    _return ? asPath(_return) : 'none',
     step1.type ?? 'departure',
     String(step1.adults),
     String(step1.children),
     String(step1.babies)
   ].join('/'));
 
+  const cityLink = (item: NearbyCity, side: 'from' | 'to'): string => {
+    // `side` is relative to the leg that was searched; map it back to the
+    // URL's outbound pair
+    if (side === 'from') {
+      return isReturn
+        ? link(step1.from, item.city.slug, step1.departure, step1._return)
+        : link(item.city.slug, step1.to, step1.departure, step1._return);
+    }
+
+    return isReturn
+      ? link(item.city.slug, step1.to, step1.departure, step1._return)
+      : link(step1.from, item.city.slug, step1.departure, step1._return);
+  };
+
   const city = (item: NearbyCity, side: 'from' | 'to'): JSX.Element => (
-    <Option
-      key={ item.city.id }
-      to={ side === 'from'
-        ? link(item.city.slug, step1.to, step1.departure)
-        : link(step1.from, item.city.slug, step1.departure) }
-    >
+    <Option key={ item.city.id } to={ cityLink(item, side) }>
       <OptionName title={ item.city.name }>{ item.city.name }</OptionName>
       <OptionMeta>{ t('routes_order.step2.empty.distance', { km: item.distance }) }</OptionMeta>
       <OptionPrice>{ item.from_price_display }</OptionPrice>
@@ -55,7 +78,12 @@ const Empty = ({ step1, data, loading, t }: Props): JSX.Element => {
   );
 
   const day = (item: FoundDay): JSX.Element => (
-    <Option key={ item.id } to={ link(step1.from, step1.to, item.day) }>
+    <Option
+      key={ item.id }
+      to={ isReturn
+        ? link(step1.from, step1.to, step1.departure, item.day)
+        : link(step1.from, step1.to, item.day, step1._return) }
+    >
       <OptionName>{ item.day }</OptionName>
       <OptionMeta>{ t('routes_order.step2.empty.available') }</OptionMeta>
       { item.from_price_display && <OptionPrice>{ item.from_price_display }</OptionPrice> }

package/Found/Found.tsx

@@ -91,8 +91,21 @@ const Found = ({ type, loading, data, step1, preferredStop, t, onSearch, onSave
   // Edited: Ferjolt Ozuni - Date: 2026-08-01
   // Only fetched once the search itself has finished and come back empty,
   // so a search that found something never pays for the alternatives.
+  /*
+   * Edited: Claude - Date: 2026-08-28 (sweep, low)
+   *
+   * On the return leg the journey with no results is destination->origin
+   * on the RETURN date - the same swap useGetDates and `watched` below
+   * have always made. Passing step1 unswapped asked the API for OUTBOUND
+   * alternatives, so the empty return step suggested days for a leg the
+   * buyer already has (including the very day they booked).
+   */
+  const alternativesQuery = type === '_return'
+    ? { ...step1, from: step1.to, to: step1.from, departure: step1._return ?? '' }
+    : step1;
+
   const { data: alternatives, isFetching: alternativesLoading } = useGetAlternatives(
-    step1,
+    alternativesQuery,
     !loading && items.length === 0
   );
 

package/Found/Orders/Orders.tsx

@@ -43,7 +43,7 @@ const Orders = ({ loading, data, empty, refined, sort, type, passengers, preferr
   // confirmed actually have seats.
   if (empty) {
     return (
-      <Empty step1={ step1 } data={ alternatives } loading={ alternativesLoading } t={ t } />
+      <Empty type={ type } step1={ step1 } data={ alternatives } loading={ alternativesLoading } t={ t } />
     );
   }
 

package/Step1/prepare.ts

@@ -1,5 +1,5 @@
 import { Params } from 'react-router-dom';
-import { futureDate } from '@autobusal/utilities';
+import { futureDate, isPreparedDate } from '@autobusal/utilities';
 import { RoutesSearchForm } from '@autobusal/routes-search/types';
 
 const prepare = (
@@ -18,7 +18,26 @@ const prepare = (
   const to = params.to ?? defaultLocations.to;
 
   const departure = params.departure?.replace(/-/g, '/') ?? futureDate(1);
-  const _return = params._return?.replace(/-/g, '/') ?? futureDate(2);
+
+  /*
+   * Edited: Claude - Date: 2026-08-29
+   *
+   * THE RETURN DATE IS TIED TO THE OUTBOUND. A one-way URL carries the
+   * literal "none" in the return slot, and `??` only catches null - so
+   * "none" travelled all the way into the picker, whose grid is built by
+   * splitting on "/" and feeding Date.UTC: an Invalid Date, rendered as
+   * January. Switching a collapsed search from One Way to Round Trip
+   * showed exactly that.
+   *
+   * Anything that is not a real date falls back to the departure, which is
+   * also the picker's floor - so the return calendar opens on the month
+   * being travelled and cannot offer a day before the outbound.
+   */
+  const requested = params._return?.replace(/-/g, '/');
+
+  const _return = isPreparedDate(requested)
+    ? String(requested)
+    : (isPreparedDate(departure) ? departure : futureDate(2));
 
   const adults = params.adults ?? 1;
   const children = params.children ?? 0;

package/Step4/checkAge.ts

@@ -3,12 +3,23 @@ import { error, differenceYears, createDate } from '@autobusal/utilities';
 import { PersonData } from '@autobusal/providers/types/persons';
 import { RoutesSearchForm } from '@autobusal/routes-search/types';
 
+/**
+ * Edited: Claude - Date: 2026-08-28 (sweep finding, medium)
+ *
+ * ONE SET OF BANDS, the ones the picker advertises in all 15 languages:
+ * adults 12+, children 2-12, babies under 2. This check used to say
+ * adult>=18 / child 3-17 / baby<=2 while the server said something
+ * different again - a 2-year-old could not be booked in any category and
+ * a teenager the copy calls an adult was refused at pay time. The
+ * boundaries mirror obtapi's RulesGeneral::getDob exactly (2nd birthday
+ * makes a child, 12th an adult).
+ */
 const checkAge = (step1: RoutesSearchForm, data: PersonData, t: TFunction<'general'>): boolean => {
   // check adults ages
   for (let i = 1; i <= step1.adults; i++) {
     const age = getAge(data[`adult${ i }_dob`]);
 
-    if (age < 18) {
+    if (age < 12) {
       error(t('routes_order.step4.errors.age'));
       return false;
     }
@@ -18,7 +29,7 @@ const checkAge = (step1: RoutesSearchForm, data: PersonData, t: TFunction<'gener
   for (let i = 1; i <= step1.children; i++) {
     const age = getAge(data[`child${ i }_dob`])
 
-    if (age < 3 || age > 17) {
+    if (age < 2 || age >= 12) {
       error(t('routes_order.step4.errors.age'));
       return false;
     }
@@ -28,7 +39,7 @@ const checkAge = (step1: RoutesSearchForm, data: PersonData, t: TFunction<'gener
   for (let i = 1; i <= step1.babies; i++) {
     const age = getAge(data[`baby${ i }_dob`]);
 
-    if (age > 2) {
+    if (age >= 2) {
       error(t('routes_order.step4.errors.age'));
       return false;
     }
@@ -45,4 +56,4 @@ const getAge = (date: string | number): number => {
   return age;
 };
 
-export default checkAge;
+export default checkAge;

package/Step5/utilities.ts

@@ -2,26 +2,39 @@ import { FoundData } from '@autobusal/providers/types/routes';
 import { CouponData } from '@autobusal/providers/types/orders';
 import { ActionData, TotalData } from '../types';
 
-export const getTotal = (step2: FoundData, step3?: FoundData): TotalData => {
-  // we get the currency
-  const currency = step2.price.display.split(' ');
+/*
+ * Edited: Claude - Date: 2026-08-28 (sweep, low)
+ *
+ * The server formats thousands with a SPACE ('1 250.00 EUR', Fundable
+ * 2026-08-19), so split(' ')[0]/[1] read the wrong pieces the moment a
+ * basket crosses 1000 - the currency became '250.00' and a couponed total
+ * became the number 1, corrupting the rendered total and the GA4 values.
+ * The currency is the LAST token; the amount is everything else with the
+ * grouping spaces stripped.
+ */
+export const currencyOf = (display: string): string => (
+  display.trim().split(' ').pop() ?? ''
+);
 
+export const amountOf = (display: string): number => (
+  Number(display.trim().split(' ').slice(0, -1).join(''))
+);
+
+export const getTotal = (step2: FoundData, step3?: FoundData): TotalData => {
   const total = step2.price.value + (step3?.price.value ?? 0);
 
   return {
-    display: `${ total } ${ currency[1] }`,
+    display: `${ total } ${ currencyOf(step2.price.display) }`,
     value: total
   };
 };
 
-export const convertCoupon = (data: CouponData): TotalData => {
-  const currency = data.total.split(' ');
-
-  return {
+export const convertCoupon = (data: CouponData): TotalData => (
+  {
     display: data.total,
-    value: Number(currency[0])
-  };
-};
+    value: amountOf(data.total)
+  }
+);
 
 /**
  * The payment methods actually offered on this checkout, in the order the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/routes-order",
-  "version": "1.33.8",
+  "version": "1.33.10",
   "author": "Ferjolt Ozuni",
   "type": "module",
   "main": "index.ts"

package/services.ts

@@ -311,10 +311,14 @@ export const useGetFlex = (
   returnPriceId: (number | undefined),
   adults: number,
   children: number,
-  babies: number
+  babies: number,
+  // Edited: Claude - Date: 2026-08-28 (sweep, low): the coupon-adjusted
+  // fare, so the quoted flex price matches what Make\Addons will charge -
+  // without it a couponed booking showed one figure and billed another
+  total?: number
 ): UseQueryResult<FlexOffer> => (
   useQuery({
-    queryKey: ['flex-offer', { departurePriceId, returnPriceId, adults, children, babies }],
+    queryKey: ['flex-offer', { departurePriceId, returnPriceId, adults, children, babies, total }],
     enabled: departurePriceId !== undefined,
     queryFn: async () => (
       await apiClient
@@ -324,7 +328,8 @@ export const useGetFlex = (
             return_price_id: returnPriceId,
             adults,
             children,
-            babies
+            babies,
+            ...(total !== undefined ? { total } : {})
           }
         })
         .then(response => response.data)

package/styles.ts

@@ -94,6 +94,19 @@ export const SearchPanel = styled.div<{ $open: boolean }>`
   display: ${ props => props.$open ? 'block' : 'none' };
   margin-top: 14px;
   padding: 20px;
+
+  /**
+   * Edited: Claude - Date: 2026-08-29
+   *
+   * ABOVE THE STEPS, because backdrop-filter below creates a stacking
+   * context: everything inside this panel is confined to it, so the date
+   * picker's own z-index (100) could never beat the step markers sitting
+   * at z-index 1 in the page's context. Opening the collapsed search and
+   * clicking a date drew the calendar UNDERNEATH the 1-2-3-4 circles.
+   * Raising the panel itself lifts its whole subtree with it.
+   */
+  position: relative;
+  z-index: 20;
   background: ${ props => props.theme.header.transparent };
   backdrop-filter: blur(25px);
   -webkit-backdrop-filter: blur(25px);