Commit Graph

110 Commits

Author SHA1 Message Date
Bianca Widstam
cdfcc3623b Merged in fix/SW-2837-tracking-pageType-enter-details (pull request #2157)
fix(SW-2837): change page type for enter details

* fix(SW-2837): change page type for enter details


Approved-by: Christian Andolf
2025-05-20 09:43:22 +00:00
Linus Flood
ac892726e0 Merged in fix/enter-details-footer-margin (pull request #2150)
fix: margin to footer on enter details

* fix: margin to footer on enter details
2025-05-19 14:35:48 +00:00
Arvid Norlin
f49a13512a Merged in fix/enter-details-header (pull request #2119)
fix: hide address and decrease title size on smaller devices

* fix(SW-2791): hide address and decrease title size on smaller devices


Approved-by: Tobias Johansson
2025-05-16 08:51:49 +00:00
Bianca Widstam
9aeb38bef4 Merged in fix/SW-2756-hide-chevron-booking-summary (pull request #2102)
fix(SW-2756): hide chevron and remove button click for desktop

* fix(SW-2756): hide chevron and remove button click for desktop


Approved-by: Linus Flood
2025-05-15 05:59:44 +00:00
Simon Emanuelsson
ca29237f2e feat: add no breakfast message to price details modal and to conf page receipt 2025-05-14 11:12:24 +02:00
Tobias Johansson
13261d425c Merged in feat/SW-2703-mobile-summary-improvements (pull request #2060)
Feat/SW-2703 mobile price summary improvements

* feat(SW-2703): fixes to select rate price summary

* feat(SW-2703): fixes enter details summary mobile

* fix: z-index issue related to booking widget popover

* fix

* fix: added accessibility props to overlay div

* fix: added button inside header

* fix: rename aria button


Approved-by: Michael Zetterberg
2025-05-13 09:22:34 +00:00
Matilda Landström
0d84d4374c Merged in fix/SW-2180-room-title (pull request #2028)
Fix(SW-2180): Hide empty brackets next to room title

* fix(SW-2180): hide text when no value


Approved-by: Christian Andolf
2025-05-09 14:36:25 +00:00
Tobias Johansson
02b26e7965 Merged in fix/SW-2668-tracking-room-details-missing (pull request #2015)
fix(SW-2668): added search term and room details to tracking

* fix(SW-2668): added search term and room details to tracking

* fix: change to optional type


Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-05-08 14:13:51 +00:00
Simon Emanuelsson
a99e434d84 feat: move room charge to top in price details modal 2025-05-08 10:38:44 +00:00
Niclas Edenvin
f8b87f0142 Merged in fix/special-requests-required (pull request #1985)
fix: Don't require special requests

* fix: Don't require special requests

Special requests for room one was wrongly marked as required


Approved-by: Bianca Widstam
2025-05-06 14:07:05 +00:00
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