@autobusal/routes-order 1.33.6 → 1.33.7

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.33.7 (2026-08-26)
+
+- Seat-selection add-on: checkout reads settings addons.seats - picking turns optional with the fee on the CTA and a live summary line; submission strips unpicked (zero) seat fields and sends addon_seats only when a hand-picked seat remains. Fixes the return-leg picked-seat list rebuilding from the departure's on re-pick.
+
 ## 1.33.6
 
 ### Fixed

package/Checkout/Checkout.tsx

@@ -125,6 +125,17 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
   const [ addonSmsNumber, setAddonSmsNumber ] = useState<string>('');
   const [ addonFlex, setAddonFlex ] = useState<boolean>(false);
 
+  /*
+   * Edited: Claude - Date: 2026-08-26
+   *
+   * The seat-selection add-on. Unlike the checkbox add-ons above there is
+   * nothing to tick: wanting it IS picking a seat. `seatsPicked` is the
+   * live hand-picked count, reported up by Passengers as choices are made
+   * and taken back, and it prices the summary line; the server recomputes
+   * the real charge from its own count (Buses\Assign) regardless.
+   */
+  const [ seatsPicked, setSeatsPicked ] = useState<number>(0);
+
   const { data: UserData } = useUserStore();
   const { data: SettingsData } = useGetSettings();
 
@@ -170,6 +181,10 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
 
   const currency = total.display.split(' ')[1] ?? '';
 
+  // the brand sells seat choice: picking turns optional (auto-assign is the
+  // free default) and each hand-picked seat costs this
+  const seatsOffer = SettingsData?.addons?.seats?.available ? SettingsData.addons.seats : undefined;
+
   // Edited: Ferjolt Ozuni - Date: 2026-08-03
   // Flexible Ticket, for the routes actually chosen. Asked for BOTH legs at
   // once: the price is computed on the combined fare and an operator who
@@ -231,6 +246,10 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
     addonFlex && FlexData?.available && FlexData.price !== undefined ? {
       label: t('routes_order.step5.flex.title'),
       price: FlexData.price
+    } : null,
+    seatsOffer && seatsPicked > 0 ? {
+      label: `${ t('seats.fee_line', { ns: 'common' }) } (${ seatsPicked })`,
+      price: seatsOffer.price * seatsPicked
     } : null
   ].filter((item): item is { label: string, price: number } => item !== null);
 
@@ -261,6 +280,7 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
     whatsappNumber: addonWhatsappNumber,
     telegram: addonTelegram,
     sms: addonSms,
+    seats: seatsOffer !== undefined,
     smsNumber: addonSmsNumber,
     flex: addonFlex
   });
@@ -393,6 +413,9 @@ const Checkout = ({ values, step1, step2, step3, isPartner, t, onStore, onBack }
             busTo={ busTo }
             saved={ saved }
             savedMax={ SavedData?.max }
+            seatsOptional={ seatsOffer !== undefined }
+            seatsFee={ seatsOffer && seatsOffer.price > 0 ? `${ seatsOffer.price } ${ currency }` : undefined }
+            onPickedCount={ setSeatsPicked }
             t={ t }
             errors={ passenger.formState.errors }
             refs={ passenger.register }

package/Step4/Passenger/Passenger.tsx

@@ -31,6 +31,9 @@ interface Props {
   saved?: SavedPassenger[]
   /** how many travellers one account may keep (obtapi's own cap) */
   savedMax?: number
+  /** seat-selection add-on: picking optional, `seatsFee` on the CTA */
+  seatsOptional?: boolean
+  seatsFee?: string
   t: TFunction<'public'>
   errors: FieldErrors<FieldValues>
   refs: UseFormRegister<PersonData>
@@ -44,7 +47,7 @@ interface Props {
 // telegram render ONLY when the route requires them - and are then
 // required. Name and date of birth stay mandatory always. `fields` is the
 // union of both legs on a return trip (see Step4).
-const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, pickedFrom, pickedTo, saved, savedMax, t, errors, refs, onSeatSelect, onUpdate }: Props): JSX.Element => {
+const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, pickedFrom, pickedTo, saved, savedMax, seatsOptional, seatsFee, t, errors, refs, onSeatSelect, onUpdate }: Props): JSX.Element => {
   const name = `${ type }${ number }`;
 
   const names = {
@@ -376,7 +379,13 @@ const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, p
       { type !== 'baby' && (
         <div className="column">
           <div className="row">
-            <Required>{ t('seats.departure') }</Required>
+            { /* Edited: Claude - Date: 2026-08-26 - with the seat-selection
+                 add-on on, a pick is neither required nor free: the label
+                 drops its required mark and validation, ChooseSeat carries
+                 the fee and a way back to the free automatic seat. */ }
+            { seatsOptional
+              ? <span>{ t('seats.departure') }</span>
+              : <Required>{ t('seats.departure') }</Required> }
 
             <ChooseSeat
               name={ names.seatDeparture }
@@ -384,7 +393,9 @@ const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, p
               defaultValue={ values !== undefined ? Number(values[names.seatDeparture]) : undefined }
               bus={ busFrom }
               picked={ pickedFrom }
-              validation="required|min:1"
+              validation={ seatsOptional ? '' : 'required|min:1' }
+              optional={ seatsOptional }
+              fee={ seatsFee }
               t={ t }
               refs={ refs }
               onUpdate={ onSeatSelect }
@@ -395,7 +406,9 @@ const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, p
 
           { withReturn && (
             <div className="row">
-              <Required>{ t('seats.return') }</Required>
+              { seatsOptional
+                ? <span>{ t('seats.return') }</span>
+                : <Required>{ t('seats.return') }</Required> }
 
               <ChooseSeat
                 name={ names.seatReturn }
@@ -403,7 +416,9 @@ const Passenger = ({ type, number, values, fields, withReturn, busFrom, busTo, p
                 defaultValue={ values !== undefined ? Number(values[names.seatReturn]) : undefined }
                 bus={ busTo }
                 picked={ pickedTo }
-                validation="required|min:1"
+                validation={ seatsOptional ? '' : 'required|min:1' }
+                optional={ seatsOptional }
+                fee={ seatsFee }
                 t={ t }
                 refs={ refs }
                 onUpdate={ onSeatSelect }

package/Step4/Passengers/Display.tsx

@@ -19,11 +19,13 @@ interface Props {
   t: TFunction<'public'>
   errors: FieldErrors<FieldValues>
   refs: UseFormRegister<PersonData>
+  seatsOptional?: boolean
+  seatsFee?: string
   onSeatSelect: (name: string, type: ('from' | 'to'), seat: number, previous: number) => void
   onUpdate: (name: string, value: (string | number)) => void
 }
 
-const Display = ({ type, amount, fields, withReturn, values, busFrom, busTo, pickedFrom, pickedTo, saved, savedMax, t, errors, refs, onSeatSelect, onUpdate }: Props): JSX.Element[] => {
+const Display = ({ type, amount, fields, withReturn, values, busFrom, busTo, pickedFrom, pickedTo, saved, savedMax, seatsOptional, seatsFee, t, errors, refs, onSeatSelect, onUpdate }: Props): JSX.Element[] => {
   const passengers: JSX.Element[] = [];
 
   for (let i = 1; i <= amount; i++) {
@@ -41,6 +43,8 @@ const Display = ({ type, amount, fields, withReturn, values, busFrom, busTo, pic
         pickedTo={ pickedTo }
         saved={ saved }
         savedMax={ savedMax }
+        seatsOptional={ seatsOptional }
+        seatsFee={ seatsFee }
         t={ t }
         errors={ errors }
         refs={ refs }

package/Step4/Passengers/Passengers.tsx

@@ -21,13 +21,24 @@ interface Props {
    */
   saved?: SavedPassenger[]
   savedMax?: number
+  /**
+   * Edited: Claude - Date: 2026-08-26
+   * The seat-selection add-on, when this brand sells it: picking becomes
+   * optional (auto-assign is the free default) and each hand-picked seat
+   * costs `seatsFee` (a display string - the server prices the real one).
+   * `onPickedCount` reports how many seats are currently hand-picked, so
+   * the checkout can price the summary line live.
+   */
+  seatsOptional?: boolean
+  seatsFee?: string
+  onPickedCount?: (count: number) => void
   t: TFunction<'public'>
   errors: FieldErrors<FieldValues>
   refs: UseFormRegister<PersonData>
   onUpdate: (name: string, value: (string | number)) => void
 }
 
-const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t, errors, refs, onUpdate }: Props): JSX.Element => {
+const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, seatsOptional, seatsFee, onPickedCount, t, errors, refs, onUpdate }: Props): JSX.Element => {
   const [ pickedFrom, setPickedFrom ] = useState<number[]>([]);
   const [ pickedTo, setPickedTo ] = useState<number[]>([]);
 
@@ -35,10 +46,19 @@ const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t,
     let newPicked = type === 'from' ? [...pickedFrom] : [...pickedTo];
 
     if (previous > 0) {
-      newPicked = pickedFrom.filter(item => item !== previous);
+      // Edited: Claude - Date: 2026-08-26
+      // Was `pickedFrom.filter(...)` regardless of leg, so re-picking a
+      // RETURN seat rebuilt the return list from the departure's - the
+      // old choice stayed greyed out on the return map and other
+      // passengers' return picks vanished from it.
+      newPicked = newPicked.filter(item => item !== previous);
     }
 
-    newPicked.push(seat);
+    // seat 0 is the add-on's "back to automatic": remove the old pick and
+    // push nothing
+    if (seat > 0) {
+      newPicked.push(seat);
+    }
 
     if (type === 'from') {
       setPickedFrom(newPicked);
@@ -46,6 +66,15 @@ const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t,
       setPickedTo(newPicked);
     }
 
+    // how many seats are hand-picked RIGHT NOW, for the fee line - built
+    // from the fresh arrays, since state has not committed yet
+    if (onPickedCount) {
+      onPickedCount(
+        (type === 'from' ? newPicked : pickedFrom).length
+        + (type === 'to' ? newPicked : pickedTo).length
+      );
+    }
+
     onUpdate(name, seat);
   };
 
@@ -63,6 +92,8 @@ const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t,
         pickedTo={ pickedTo }
         saved={ saved }
         savedMax={ savedMax }
+        seatsOptional={ seatsOptional }
+        seatsFee={ seatsFee }
         t={ t }
         errors={ errors }
         refs={ refs }
@@ -82,6 +113,8 @@ const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t,
         pickedTo={ pickedTo }
         saved={ saved }
         savedMax={ savedMax }
+        seatsOptional={ seatsOptional }
+        seatsFee={ seatsFee }
         t={ t }
         errors={ errors }
         refs={ refs }
@@ -101,6 +134,8 @@ const Passengers = ({ values, step1, fields, busFrom, busTo, saved, savedMax, t,
         pickedTo={ pickedTo }
         saved={ saved }
         savedMax={ savedMax }
+        seatsOptional={ seatsOptional }
+        seatsFee={ seatsFee }
         t={ t }
         errors={ errors }
         refs={ refs }

package/package.json

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

package/services.ts

@@ -190,6 +190,36 @@ export const usePostOrder = (
         order[index] = step4[index];
       });
 
+      /*
+       * Edited: Claude - Date: 2026-08-26
+       *
+       * Seat fields. A zero means "no choice made": with the seat-selection
+       * add-on the picker is optional and 0 is its resting value, and the
+       * API auto-assigns ABSENT fields but rejects a literal zero as a
+       * taken seat - so unpicked fields must not travel at all. Stripping
+       * unconditionally is safe for the legacy mode too: there the fields
+       * are validated required|min:1, so a zero cannot reach this line.
+       *
+       * addon_seats goes over only when the brand sells the add-on AND at
+       * least one hand-picked seat survived the strip - the flag is the
+       * buyer's opt-in, the server's Buses\Assign counts what it charges.
+       */
+      let chosenSeats = 0;
+
+      Object.keys(order).forEach(key => {
+        if (/_s[dr]$/.test(key)) {
+          if (Number(order[key]) > 0) {
+            chosenSeats++;
+          } else {
+            delete order[key];
+          }
+        }
+      });
+
+      if (addons.seats && chosenSeats > 0) {
+        order.addon_seats = '1';
+      }
+
       if (action !== undefined) {
         order.action = action;
       }

package/types.ts

@@ -87,6 +87,13 @@ export interface AddonsSelection {
   // price are the server's to decide (Libraries\Orders\Flex), and a client
   // that sent either would be ignored.
   flex: boolean
+
+  // Edited: Claude - Date: 2026-08-26
+  // Seat selection is SOLD on this brand (settings addons.seats). What is
+  // actually bought is implicit in the seat fields themselves: the
+  // submission strips unpicked (zero) fields and sends addon_seats only
+  // when at least one hand-picked seat remains - see usePostOrder.
+  seats: boolean
 }
 /**
  * "Watch this fare" - see Found/Watch/Watch.tsx.