Commit Graph

60 Commits

Author SHA1 Message Date
Joakim Jäderberg
45d474385c Merged in fix/noindex-contentpages (pull request #2066)
fix: add noindex+nofollow to contentpages

* fix: add noindex+nofollow to contentpages

* fix: move no-index/no-follow to the shared generateMetadata function instead

* remove comment


Approved-by: Erik Tiekstra
2025-05-13 08:29:49 +00:00
Anton Gunnarsson
60af31762b Merged in fix/make-user-loyalty-optional (pull request #2044)
fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-05-12 09:00:11 +00:00
Michael Zetterberg
8cb63c4947 fix(SW-2116): add compatibility with RefId from Current Web 2025-05-08 11:52:31 +00:00
Michael Zetterberg
baee0ee40c fix(SW-2116): add compatibility with unencoded RefId as input 2025-05-08 11:52:31 +00:00
Michael Zetterberg
b8e9ed2a58 fix(SW-2116): do not replace + with - for encrypted output result 2025-05-08 11:52:31 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +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
Arvid Norlin
7eeb0bbcac feat(SW-2116): avoid passing entire booking object to Room client component 2025-05-02 11:47:14 +02: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
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
Bianca Widstam
972d530be8 Merged in fix/SW-1997-tracking-ancillaries-adjust-total (pull request #1893)
fix(SW-1997): productPoints and productPrice should be the total

* fix(SW-1997): productPoints and productPrice should be the total


Approved-by: Matilda Landström
2025-04-29 09:01:02 +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
416a95d592 Merged in fix/SW-1997-tracking-correct-price-or-points (pull request #1869)
fix(SW-1997): only add points or card if payed with

* fix(SW-1997): only add points or card if payed with

* fix(SW-1997): use buildAncillaries function


Approved-by: Michael Zetterberg
2025-04-28 09:05:55 +00:00
Matilda Landström
d097547ec7 Merged in feat/SW-1755-facility-cards (pull request #1847)
fix(SW-1755): Handle facility card images left or right side

* fix(SW-1755): handle facility card images


Approved-by: Erik Tiekstra
Approved-by: Christian Andolf
2025-04-24 14:42:46 +00:00
Bianca Widstam
77eff2b49c Merged in fix/SW-1997-gla-tracking (pull request #1852)
fix(SW-1997): add price and currency

* fix(SW-1997): add price and currency

* fix(SW-1997): wrap lateArrivalGuaranteee and guaranteedProduct in hotelInfo


Approved-by: Niclas Edenvin
2025-04-24 13:41:29 +00:00
Erik Tiekstra
d827bf04d0 fix(SW-2210): Checking for session inside MyPagesMenu to sync session state 2025-04-24 00:48:42 +02:00
Chuma Mcphoy (We Ahead)
27aef3982e Merged in fix/LOY-222-find-my-booking-urls-for-prod (pull request #1817)
Fix(LOY-222): Find my booking url handling

* fix(LOY-222): adapt findMyBooking url based on HIDE_FOR_NEXT_RELEASE

* feat(LOY-222): add current web paths for findMyBooking in multiple languages

* refactor(LOY-222): better env and new url constructions

* refactor(LOY-222): decouple env var handling from getCurrentWebUrl

* fix(LOY-222): update findMyBooking URL construction to use baseUrl

* fix(LOY-222): simplify findMyBooking URL handling for new web urls

* fix(LOY-222): Update Finnish path for hotel reservation lookup

* refactor(LOY-222): rename PUBLIC_URL to NEXT_PUBLIC_PUBLIC_URL for consistency


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-04-22 07:03:23 +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
Michael Zetterberg
440e1f92df feat(SW-706): make eslint rule 'formatjs/no-literal-string-in-jsx' pass 2025-04-14 11:30:06 +00:00
Bianca Widstam
77c03905e4 Merged in fix/hide-payment-if-only-points (pull request #1741)
Feat(SW-1943): add new design for pay ancillaries with points

* fix: hide card and payment info if only quantity with points is selected

* feat(SW-1943): add new design for pay ancillaries with points

* feat(SW-1943): add missing translation

* feat(SW-1943): fix rebase

* feat(SW-1943): remove console log


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-04-10 06:18:02 +00:00
Bianca Widstam
c41dea4118 Merged in feat/SW-1414-guarantee-enter-details-tracking (pull request #1744)
Feat/SW-1414 guarantee enter details tracking

* feat(SW-1414): add tracking for gla enter details

* feat(SW-1414): add tracking for gla

* feat(SW-1414): add tracking for gla in enter details

* feat(SW-1414): fix pr comments

* feat(SW-1414): fix pr comment client only

* feat(SW-1414): fix pr comments

* feat(SW-1414): add tracking on load


Approved-by: Christian Andolf
2025-04-09 06:26:19 +00:00
Hrishikesh Vaipurkar
73cb423c95 Merged in feat/SW-2078-update-confirmation-page-vouchers (pull request #1731)
Feat/SW-2078 update confirmation page vouchers and Corp Cheques rate

* feat: SW-2078 Tablet bookingCode ref forward issue fix

(cherry picked from commit 16a6a00fd99b6b6220a98ad74de062d67d35e1c0)

* feat: SW-2078 Display Vouchers and Cheques prices on confirmation page

(cherry picked from commit a76494de497a7d5e7641cb0036bd7055acf875c1)

* feat: SW-2078 Rebase issue fix

* feat: SW-2079 Updated rate title in terms modal

* feat: SW-2078 Optimized code

* feat: SW-2078 Removed extra tags


Approved-by: Christian Andolf
2025-04-08 07:27:40 +00:00
Anton Gunnarsson
c56a0b8ce9 Merged in feat/sw-1975-get-profile-v2 (pull request #1651)
Use get Profile V2 endpoint

Approved-by: Linus Flood
2025-04-08 06:26:00 +00:00
Hrishikesh Vaipurkar
ae1010bfce Merged in feat/SW-2079-update-booking-page-to-show-points- (pull request #1683)
feat: SW-2079 Show points in confirmation page

* feat: SW-2079 Show points in confirmation page

* feat: SW-2079 Optimized code

* feat: SW-2079 Updated Body to Typography

* feat: SW-2079 Multi-room total cost display

* feat: SW-2079 Add reward nights condition rate title

* feat: SW-2079 Removed extra checks

* feat: SW-2079 Optimmized formatPrice function

* feat: SW-2079 Typo fix


Approved-by: Christian Andolf
2025-04-04 09:39:55 +00:00
Joakim Jäderberg
3c810d67a2 Merged in feature/SW-1736-foating-booking-widget (pull request #1696)
Feature/SW-1736 floating booking widget

* feature: Add floating booking widget on start page SW-1736

* fix: Make sure we don't try to use IntersectionObserver on the server

* fix: make sure that we disconnect the intersectionobserver when dismounting

* fix: pass searchparams to floating bookingwidget


Approved-by: Michael Zetterberg
2025-04-04 06:52:37 +00:00
Chuma Mcphoy (We Ahead)
56d5ad77d1 Merged in fix/SW-2068-correct-public-url-from-my-stays-overview-page (pull request #1694)
feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

* feat(SW-2068): Link to Correct Public URL from within My Stays Overview Page

- Added language parameter to previous and upcoming stays queries.
- Updated Client components to utilize the new language hook.
- Refactored EmptyUpcomingStays component to dynamically generate links based on the current language.
- Adjusted user input validation to include optional language parameter.

* refactor(SW-2068): Update EmptyUpcomingStays components to use PUBLIC_URL + add utility to handle TLD based on language

* chore(SW-2068): Clarify TLD

* feat(SW-2068): documentation for getTldForLanguage

* refactor(SW-2068): Simplify booking URL construction in updateStaysBookingUrl

* refactor(SW-2068): Remove incorrect TLD update logic from booking URL construction

* refactor(SW-2068): Centralize booking URL paths using myBookingPath constant

* refactor(SW-2068): Streamline search params in booking URL construction logic in updateStaysBookingUrl


Approved-by: Christian Andolf
2025-04-02 12:44:02 +00:00
Bianca Widstam
35c1724afb Merged in feat/SW-1997-tracking-gla-my-stay-ancillaries (pull request #1657)
Feat/SW-1997 tracking gla my stay ancillaries

* feat(SW-1996): tracking gla my stay

* feat(SW-1996): update gla tracking

* feat(SW-1996): fix comment

* feat(SW-1997): add tracking for gla my stay and ancillaries

* feat(SW-1997): rebase master

* feat(SW-1997): fix duplicate import

* feat(SW-1997): add hotelId and category for ancillaries, and add more tracking

* feat(SW-1997): remove commments and fix spelling mistake

* feat(SW-1997): if addAncillary failed, but guarantee is successful, default to card in booking


Approved-by: Niclas Edenvin
2025-04-01 09:38:36 +00:00
Tobias Johansson
7434f30c20 Merged in feat/SW-2033-implement-new-room-feature-request (pull request #1665)
feat(SW-2033): Added new route for fetching room features, and merged the data with existing availability data

* feat(SW-2033): Added new route for fetching room features, and merged the data with existing availability data

* fix: issue with total price not including room features

* fix: add return null

* fix

* fix

* fixes from PR feedback


Approved-by: Arvid Norlin
2025-03-31 11:20:49 +00:00
Christian Andolf
32e769fd09 chore: debounce function is now typed to accommodate typed parameters in a callback 2025-03-28 14:40:36 +01:00
Bianca Widstam
a28fa67195 Merged in feat/SW-1996-tracking-gla-my-stay (pull request #1625)
Feat/SW-1996 tracking gla my stay

* feat(SW-1996): tracking gla my stay

* feat(SW-1996): update gla tracking

* feat(SW-1996): update gla tracking

* feat(SW-1996): fix comment

* feat(SW-1996): fix camelCase


Approved-by: Niclas Edenvin
Approved-by: Erik Tiekstra
2025-03-27 14:09:39 +00:00
Linus Flood
0f9c9c2af8 Merged in feat/tracking-sessionId (pull request #1653)
Feat(tracking): add sessionId to all events. Fixed some invalid session bugs

* Feat(tracking): add sessionId to all events. Fixed some invalid session bugs


Approved-by: Anton Gunnarsson
2025-03-27 10:42:24 +00:00
Matilda Landström
5de2a993a7 Merged in feat/SW-1711-switch-icons (pull request #1558)
Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons.

Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
Christian Andolf
f272dde1ef chore: remove unused filter modal
remove old cms model

refactor reward types
2025-03-26 09:55:26 +01:00
Christian Andolf
45d57a9c89 fix(LOY-175): fix issues of getting correct expiration date on reward coupon 2025-03-26 09:55:26 +01:00
Christian Andolf
b86347b4f4 refactor(LOY-175): rewrite reward types according to new api endpoints 2025-03-26 09:55:26 +01:00
Erik Tiekstra
93962e4c59 fix: Added altText_EN as fallback alt text before using title
Approved-by: Fredrik Thorsson
2025-03-25 12:50:29 +00:00
Linus Flood
4cd6e7b55b Merged in fix/tracking-pageload-issues (pull request #1630)
fix(tracking): fixes not sending pageview events when promise isn't resolving

* fix(tracking): fixes not sending pageview events when promise isn't resolving

* Refactor


Approved-by: Anton Gunnarsson
2025-03-25 12:33:04 +00:00
Hrishikesh Vaipurkar
b0674d07f5 Merged in feat/SW-1308-booking-codes-track-b (pull request #1607)
Feat/SW-1308 booking codes track b

* feat: SW-1308 Booking codes track b

* feat: SW-1308 Booking codes Track B implementation

* feat: SW-1308 Optimized after rebase


Approved-by: Arvid Norlin
2025-03-24 11:23:11 +00:00
Hrishikesh Vaipurkar
c5e294c7ea Merged in feat/SW-1356-reward-night-booking-2- (pull request #1559)
feat: SW-1356 Reward night bookingflow

* feat: SW-1356 Reward night bookingflow

* feat: SW-1356 Removed extra param booking call

* feat: SW-1356 Optimized as review comments

* feat: SW-1356 Schema validation updates

* feat: SW-1356 Fix after rebase

* feat: SW-1356 Optimised price.redemptions check

* feat: SW-1356 Updated Props naming


Approved-by: Arvid Norlin
2025-03-24 08:54:02 +00:00
Niclas Edenvin
efa7336ebd Merged in feat/sw-1602-preliminary-receipt (pull request #1595)
feat/sw-1602 preliminary receipt

* feat(sw-1602): create page for preliminary receipt

* Add link to my stay page


Approved-by: Pontus Dreij
2025-03-24 07:55:15 +00:00
Pontus Dreij
2bc14a6eeb Merged in feat(SW-1993)-tracking-mystay-cancellation (pull request #1588)
Feat(SW-1993) tracking mystay

* feat(SW-1993) added trackEvent for cancelStay and mypagelink

* feat(SW-1993) implement trackCancelStay and trackMyStayPageLink


Approved-by: Linus Flood
2025-03-21 07:24:01 +00:00
Erik Tiekstra
b2b197b1ef Feat/SW-1519 remove deprecated hotel data from schema
* feat(SW-1519): Removed displayWebpage from hotel schema

* feat(SW-1519): Removed gallery from hotel schema

* feat(SW-1519): Removed conferencesAndMeetings from hotel schema

* feat(SW-1519): Removed healthAndWellness from hotel schema

* feat(SW-1519): Removed restaurantImages from hotel schema

* feat(SW-1519): Removed restaurantsOverviewPage from hotel schema


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-03-19 06:28:13 +00:00
Erik Tiekstra
f096b70c45 feat(SW-1472): adjustments to destination page tracking
Approved-by: Matilda Landström
2025-03-18 07:09:40 +00:00
Erik Tiekstra
05addfa0bb feat(SW-1885): Added noindex/nofollow to pages with searchparams when generating metadata to avoid duplicate content issues
Approved-by: Linus Flood
2025-03-17 13:15:13 +00:00
Simon Emanuelsson
1812591903 feat: add multiroom tracking to booking flow 2025-03-17 09:47:42 +01:00
Joakim Jäderberg
fa63b20ed0 Merged in feature/redis (pull request #1478)
Distributed cache

* cache deleteKey now uses an options object instead of a lonely argument variable fuzzy

* merge

* remove debug logs and cleanup

* cleanup

* add fault handling

* add fault handling

* add pid when logging redis client creation

* add identifier when logging redis client creation

* cleanup

* feat: add redis-api as it's own app

* feature: use http wrapper for redis

* feat: add the possibility to fallback to unstable_cache

* Add error handling if redis cache is unresponsive

* add logging for unstable_cache

* merge

* don't cache errors

* fix: metadatabase on branchdeploys

* Handle when /en/destinations throws
add ErrorBoundary

* Add sentry-logging when ErrorBoundary catches exception

* Fix error handling for distributed cache

* cleanup code

* Added Application Insights back

* Update generateApiKeys script and remove duplicate

* Merge branch 'feature/redis' of bitbucket.org:scandic-swap/web into feature/redis

* merge


Approved-by: Linus Flood
2025-03-14 07:54:21 +00:00
Chuma Mcphoy (We Ahead)
1ef6fd02c1 Merged in feat/LOY-55-Filter-Modal (pull request #1509)
feat(LOY-55): Add FilterRewardsModal

* feat(LOY-55): Add rewards filtering functionality

- Implement dynamic rewards filtering by category and membership level
- Create FilterRewardsModal component for filtering rewards
- Add useFilteredRewards hook to handle filtering logic
- Update rewards schema and constants to support new filtering features
- Remove hardcoded page size and replace with constant

* fix(LOY-55): reuse existing tier to friend map

* refactor(LOY-55): fix checkbox onChange type safety

* refactor(LOY-55): Improve rewards filtering type safety and validation

* refactor(LOY-55): Update filter modal border color using design token


Approved-by: Christian Andolf
2025-03-12 13:29:35 +00:00
Christian Andolf
b45157818f feat(LOY-154): add expiration date to rewards 2025-03-11 16:25:33 +01:00
Anton Gunnarsson
393546d35d Merged in feat/sw-1291-show-sas-membership-data (pull request #1503)
Show SAS membership data in Linked Accounts

* Rip out old styling

* Desktop version of new linked accounts design

* Use new design system tokens

* Refactor SASLinkedAccount to handle all states

* Improve small screen styling

* Add intl etc

* Skeletons

* Tiny fixes

* Add i18n keys to all languages


Approved-by: Linus Flood
2025-03-10 10:13:18 +00:00