Commit Graph

100 Commits

Author SHA1 Message Date
Niclas Edenvin 9e0332ba8a Merged in fix/SW-2625 (pull request #1980)
fix(SW-2625): set correct submitting status when validation fails

* fix(SW-2625): set correct submitting status when validation fails


Approved-by: Bianca Widstam
2025-05-06 12:51:41 +00:00
Tobias Johansson 25ae368210 Merged in fix/SW-1353-and-SW-2497-tracking-fixes (pull request #1977)
fix: tracking fixes SW-1353 and SW-2497

* fix: tracking fixes

* fix: remove console log and rename variable


Approved-by: Michael Zetterberg
Approved-by: Arvid Norlin
2025-05-06 11:15:52 +00:00
Michael Zetterberg c6a0ce86df feat(SW-2605): confirmation page only valid for 1 minute for the session 2025-05-06 11:01:32 +00:00
Matilda Landström 8bff7f2cf2 Merged in fix/SW-2440-breakfast-tracking (pull request #1967)
fix(SW-2440): correct total price

* fix(SW-2440): correct total price

* Merge branch 'fix/SW-2440-breakfast-tracking' of bitbucket.org:scandic-swap/web into fix/SW-2440-breakfast-tracking

* fix(SW-2440): multiply by number of nights for breakfast tracking


Approved-by: Niclas Edenvin
2025-05-06 08:52:20 +00:00
Simon Emanuelsson 4d41d4fd92 feat: autofill all fields on enter details and countryselector clean up 2025-05-06 10:03:24 +02:00
Matilda Landström 5c6f468bd6 Merged in fix/SW-2440-breakfast-tracking (pull request #1947)
Fix/SW-2440 breakfast tracking

* fix(SW-2440): fix confirmation ancillaries tracking

* fix(SW-2440): add breakfast ancillary when preselected


Approved-by: Bianca Widstam
2025-05-05 12:27:25 +00:00
Michael Zetterberg b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Christian Andolf d6b70edfa3 chore: replace old border-radius variables with new tokens 2025-05-05 11:11:37 +02:00
Niclas Edenvin 4191441f32 Merged in fix/submit-booking-disabled (pull request #1936)
Don't disable payment based on room forms

* Don't disable payment based on room forms


Approved-by: Arvid Norlin
Approved-by: Tobias Johansson
2025-05-05 07:55:25 +00:00
Simon Emanuelsson 91933f47cf feat: comment updates 2025-05-03 22:43:09 +02:00
Tobias Johansson f56a1ece0f feat(SW-1255): Added loading state to submit button in enter details 2025-05-03 22:18:50 +02:00
Matilda Landström cd01b34606 fix: update copy 2025-05-03 09:59:55 +00:00
Matilda Landström e059c5d30d fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström 19407d1b09 fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström 2a333334ac fix: update copy 2025-05-03 09:59:54 +00:00
Hrishikesh Vaipurkar e8b17deb52 Merged in fix/SW-2579-aa-tracking-2-times-bed-sel- (pull request #1932)
Fix: SW-2579 Fixed bed selection triggering twice

* Fix: SW-2579 Fixed bed selection triggering twice


Approved-by: Tobias Johansson
2025-05-03 09:21:45 +00:00
Tobias Johansson 71f1e9fe2c Merged in fix/tracking-fixes (pull request #1930)
Fix/tracking fixes

* fix: remove hotelInfo and paymentInfo when user reloads page on confirmation page

* fix: clean session storage item on unmount

* fix: commented out hard navigation hook

* fix: update price calculation on room ancillary in tracking

* fix: update discount calculation

* fix: add space between fns

* fix: allow useSoftNavigation to fire pageview again on same pathname

* fix: prevent bedSelection and breakfastSelection from tracking twice


Approved-by: Hrishikesh Vaipurkar
2025-05-03 07:27:54 +00:00
Niclas Edenvin fb44990777 Merged in fix/SW-2501-validation-trigger (pull request #1924)
fix(SW-2501): validation trigger

* fix(SW-2501): validation trigger

On enter details, when submitting we want to trigger the validation for
the details forms for each room. This will display error messages for
the form fields with errors if they are not already displayed, so the
user knows which fields has errors.


Approved-by: Tobias Johansson
2025-05-02 13:59:23 +00:00
Linus Flood 6979ac0c3b Merged in revert-pr-1925 (pull request #1927)
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
2025-05-02 13:05:42 +00:00
Hrishikesh Vaipurkar e6a3e5dbd8 Merged in feat/SW-2398-ui-update-for-booking-codes (pull request #1862)
feat: SW-2398 UI updates booking codes

* feat: SW-2398 UI updates booking codes

* feat: SW-2398 Rate cards UI changes

* feat: SW-2398 Optimized css with vars and chip code

* feat: SW-2398 Optimized code as review comments

* feat: SW-2398 Optimized code

* feat: SW-2398 Optimized code and mobile UX

* feat: SW-2398 Optimized code

* feat: SW-2398 Fixed UI

* feat: SW-2398 Updated animation


Approved-by: Erik Tiekstra
2025-05-02 12:36:22 +00:00
Arvid Norlin 74d37dad93 feat(SW-2116): RefId instead of confirmationNumber 2025-05-02 12:44:07 +02:00
Tobias Johansson bf79168216 Merged in fix/SW-2462-room-availability-error (pull request #1920)
Fix/SW-2462 room availability error

* fix: added toast error when availability fails and you get redirect to select-rate

* fix: added support for showing alert when availability error happens

* fix: rename PaymentAlert -> BookingAlert


Approved-by: Erik Tiekstra
2025-05-02 08:35:29 +00:00
Simon.Emanuelsson 862d4abbe3 Merged in feat/SW-2202 (pull request #1909)
feat: trigger validation on form upon autofill in enter details

* feat: trigger validation on form upon autofill in enter details


Approved-by: Niclas Edenvin
2025-05-02 08:12:33 +00:00
Niclas Edenvin d7708b682a Merged in fix/sw-2543-toc-text (pull request #1921)
fix(SW-2543): Change terms and conditions text for flex

* fix(SW-2543): Change terms and conditions text for flex

Approved-by: Michael Zetterberg
2025-05-02 07:45:37 +00:00
Christian Andolf 0cd2e9c89f fix(SW-2463): scroll to payment error 2025-05-02 06:37:37 +00:00
Erik Tiekstra 8b32abbefc Fix/SW-1563 accessibility
* fix(SW-1563): Added new IconButton component to the design system and removed Icon variant inside the Button component
* fix(SW-1563): Added buttons around clickable images and changed to design system components
* fix(SW-1563): Renamed variants to match Figma
* fix(SW-1563): Renamed AriaButton to ButtonRAC

Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
2025-05-02 06:27:30 +00:00
Bianca Widstam 8931fe5312 Merged in fix/SW-2438-change-to-breakfast-buffet-remove-dash (pull request #1918)
fix(SW-2438): change to breakfast buffet always and replace dash with empty string

* fix(SW-2438): change to breakfast buffet always and replace dash with empty string

* fix(SW-2438): remove none from ageOfChildren


Approved-by: Tobias Johansson
Approved-by: Matilda Landström
2025-04-30 09:46:03 +00:00
Michael Zetterberg efb7219b6d fix: copy fixes for English labels 2025-04-30 09:37:54 +00:00
Niclas Edenvin 341be43a53 Merged in fix/sw-2501-remove-continue-button-light (pull request #1892)
fix(sw-2501): remove the continue buttons on enter details

This removes the continue buttons on the enter details page.

This is only that, not the refactoring of the whole enter details page with changing to one form etc. Since I just didn’t complete that refactor today I decided to do this light variant for now.

A quick explanation is that the continue buttons are removed and instead the form is submitted (meaning saving the form data to the store) on blur on the input elements IF the form is valid. If it’s invalid we change the isComplete flag in the store to false. This will hopefully also fix a bug where you were able to submit old data if the new data is invalid.

When clicking the submit button and a room is incomplete/invalid the browser scrolls to the first invalid room.

Approved-by: Erik Tiekstra
2025-04-30 08:56:16 +00:00
Hrishikesh Vaipurkar 05c8be489f Merged in feat/SW-1355-reward-night-booking-track-3 (pull request #1913)
feat: SW-1355 Updated tracking to localPrice instead of requestedPrice


Approved-by: Michael Zetterberg
2025-04-29 20:53:49 +00:00
Arvid Norlin 96c1912d63 Merged in fix/SW-2177 (pull request #1907)
fix: combine radiogroups on payment step

* fix: combine radiogroups on payment step


Approved-by: Christian Andolf
2025-04-29 14:08:40 +00:00
Bianca Widstam 03902da897 Merged in fix/SW-2438-remove-breakfast-tracking (pull request #1872)
fix(SW-2438): remove breakfast tracking on enter details

* fix(SW-2438): remove breakfast tracking on enter details

* fix(SW-2438): show breakfastOption if already chosen on page load

* fix(SW-2438): if breakfast option does not exists (scandic go) remove breakfastOption from tracking

* fix(SW-2438): fix merge conflicts

* fix(SW-2438): fix comment

* fix(SW-2438): fix comment

* fix(SW-2438): fix merge


Approved-by: Tobias Johansson
Approved-by: Matilda Landström
2025-04-29 10:46:52 +00:00
Hrishikesh Vaipurkar 6520bc5bc5 Merged in fix/SW-1879-aa-track-bed-breakfast-pay-3 (pull request #1900)
fix: SW-1879 Updated values in tracking

* fix: SW-1879 Updated bed type value in tracking

* fix: SW-1879 Updated breakfast price to indicate total price


Approved-by: Michael Zetterberg
2025-04-29 10:00:58 +00:00
Michael Zetterberg 9aa70f0b37 feat(SW-2470): render correct terms on Enter details 2025-04-29 08:08:21 +00:00
Michael Zetterberg 2366b4e785 feat(SW-2470): render correct terms on Select rate 2025-04-29 08:08:21 +00:00
Hrishikesh Vaipurkar e34d75969a Merged in fix/SW-1879-aa-bed-breakfastpayment- (pull request #1888)
fix: SW-1879 Updated breakfast price to 0 and removed paymentSectionOpen tracking

* fix: SW-1879 Updated breakfast price to 0 and removed paymentSectionOpen tracking


Approved-by: Michael Zetterberg
2025-04-29 07:07:40 +00:00
Joakim Jäderberg c1505ce50e Merged in feature/warmup (pull request #1887)
* unified warmup function

Approved-by: Linus Flood
2025-04-29 06:18:14 +00:00
Bianca Widstam bfc25453c7 Merged in fix/SW-1415-my-stay-tracking-hotelId (pull request #1880)
fix(SW-1415): add hotelId in tracking for my stay

* fix(SW-1415): add hotelId in tracking for my stay

* fix: remove toast if cancel guarantee

* fix(SW-1415): rebase master

* fix(SW-1415): fix comment shorthand hotelId


Approved-by: Christian Andolf
2025-04-28 13:20:18 +00:00
Simon Emanuelsson ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Simon Emanuelsson b5deb84b33 fix: always use totalPrice to display roomCharge 2025-04-28 12:40:52 +00:00
Matilda Landström 5c189da123 Merged in feat/SW-2495-card-type-tracking (pull request #1868)
fix(SW-2495): add saved card type to payment tracking

* fix(SW-2495): add saved card type to tracking


Approved-by: Michael Zetterberg
2025-04-27 14:47:04 +00:00
Niclas Edenvin 3a958c4dd1 Merged in fix/sw-1897-member-price-modal (pull request #1856)
fix(sw-1897): show member price modal immediately

* fix(sw-1897): show member price modal immediately

* Make checkbox fully controlled

* Remove action in the store that wasn't used


Approved-by: Hrishikesh Vaipurkar
2025-04-25 09:55:24 +00:00
Chuma Mcphoy (We Ahead) 169094fc37 Merged in refactor/SW-2476-use-react-aria-radio-group-for-payment-options (pull request #1849)
Refactor(SW-2177): Use react aria RadioGroup & Radio for payment options

* fix(SW-SW-2177): enhance accessibility for payment options

* Added keyboard navigation support to payment options.
* Updated CSS to improve focus styles for payment option labels.

* refactor: use RadioGroup & Radio from react aria for payment options

* refactor(SW-2177): replace setValue and watch with useController for payment method handling

* fix(SW-2177): remove comment and use cx for styles on PaymentOption

* fix(SW-2177): Add keyboard focus indicator to payment option


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-04-24 11:22:36 +00:00
Bianca Widstam 2f0a196b49 Merged in fix/SW-1414-tracking-gla (pull request #1837)
fix(SW-1414): add hotelId to tracking for gla

* fix(SW-1414): add hotelId to tracking for gla


Approved-by: Niclas Edenvin
2025-04-23 11:05:43 +00:00
Simon Emanuelsson 722d4505ba fix: always use totalPrice to display roomCharge 2025-04-23 11:50:44 +02:00
Simon Emanuelsson 1f94c581ae fix: unite all price details modals to one and align on ui 2025-04-23 08:45:50 +00:00
Erik Tiekstra c23a32cd10 fix(SW-2414): Removed continue button on single room member bookings
Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-04-23 08:33:15 +00:00
Niclas Edenvin 3f6a65d390 Merged in fix/sw-1867-multiroom-guests (pull request #1822)
fix(sw-1867): Don't allow same name or membno between rooms

* fix(sw-1867): Don't allow same name or membno between rooms

We don't want to allow two different rooms to have the same firstname
and lastname combination or the same membership number.

* Fine tune validation triggers

* Add comments explaining manual validation triggering

* Change to react-hook-form built-in deps instead


Approved-by: Simon.Emanuelsson
2025-04-22 09:06:43 +00:00
Hrishikesh Vaipurkar 8c0597727b Merged in feat/SW-1879-aa-tracking-bed-breakfastpayment (pull request #1789)
feat: SW-1879 Tracking enter-details sections

* feat: SW-1879 Tracking enter-details sections

* feat: SW-1879 removed onSelect to trigger in onSubmit

* feat: SW-1879 Removed onSelect and triggered inside onSubmit

* feat: SW-1879 Optimized to remove unnecessary useEffect triggers in every re-render

* feat: SW-1879 Updated breakfast package typings

* feat: SW-1879 Reverted RadioCardProps

* feat: SW-1879 Optimised code


Approved-by: Tobias Johansson
Approved-by: Christian Andolf
2025-04-16 14:06:15 +00:00
Christian Andolf 595eb575d7 fix(SW-2385): handle error messages provided from zod validation in forms client side 2025-04-16 10:17:17 +00:00