Commit Graph

3593 Commits

Author SHA1 Message Date
Christian Andolf
bc23314275 Merged in fix/LOY-136-dont-invalidate-rewards-until-redeem-close (pull request #1308)
fix(LOY-136): rewards are no longer invalidated and refetched when redeeming rewards, instead it happens when modal is closed

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-13 11:30:36 +00:00
Christian Andolf
4832688254 fix(LOY-136): rewards are no longer invalidated and refetched when redeeming rewards, instead it happens when modal is closed 2025-02-13 12:22:11 +01:00
Linus Flood
cd1ca159dc Merged in feat/sw-1637-netlify-runtime (pull request #1327)
feat/sw-1637 - Updated Netlify Runtime to latest version

* feat/sw-1637 - Updated Netlify Runtime to latest version


Approved-by: Michael Zetterberg
2025-02-13 10:40:10 +00:00
Christian Andolf
409ba5bf4c Merged in feat/LOY-134-add-informative-reward-modal (pull request #1307)
feat(LOY-134): display informative rewards and modal

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-13 10:13:35 +00:00
Joakim Jäderberg
6f51130e48 Merged in feature/hardcoded-mypages-links (pull request #1325)
Feature/hardcoded mypages links

* feat: wip use hardcoded links

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/hardcoded-mypages-links

* feat: use hardcoded links for my pages to support dynamic links

* cleanup

* code fixes

* refactor: restructure MyPagesMobileDropdown component for improved readability

* use util timeout function


Approved-by: Christian Andolf
Approved-by: Linus Flood
2025-02-13 09:28:30 +00:00
Hrishikesh Vaipurkar
eabe45b73c Merged in feat/SW-1557-implement-booking-code-select (pull request #1304)
feat: SW-1577 Implemented booking code city search

* feat: SW-1577 Implemented booking code city search

* feat: SW-1557 Strict comparison

* feat: SW-1557 Review comments fix


Approved-by: Michael Zetterberg
Approved-by: Pontus Dreij
2025-02-13 09:24:47 +00:00
Christian Andolf
509c83868d feat(LOY-134): display informative rewards and modal 2025-02-13 10:16:02 +01:00
Arvid Norlin
d46a85a529 Merged in fix/handle-bed-reselect-navigation (pull request #1321)
fix: adjust allowed step navigation condition

* fix: adjust allowed step navigation condition


Approved-by: Tobias Johansson
2025-02-13 08:39:43 +00:00
Matilda Landström
41cb32dd30 Merged in fix/accordion (pull request #1318)
Fix/accordion

* fix(SW-1621): show all children in accordion

* fix(SW-1621): change FAQ label


Approved-by: Erik Tiekstra
2025-02-13 08:24:05 +00:00
Erik Tiekstra
599c11ba37 Merged in feat/SW-1459-country-map-sidebar (pull request #1323)
feat(SW-1459): Added sidebar with citylist on destination country pages

* feat(SW-1459): Added sidebar with citylist on destination country pages


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-13 06:45:27 +00:00
Matilda Landström
c0e4553d9f Merged in feat/SW-1065-meetings-page (pull request #1287)
Feat(SW-1065): Meetings hotel subpage

Approved-by: Erik Tiekstra
2025-02-12 15:13:17 +00:00
Linus Flood
cac090df34 Merged in fix/translations-my-points (pull request #1324)
Fix/translations my points

* feat: my points - fixed translations

* feat: my points - fixed translations

* Revert test script
2025-02-12 14:32:29 +00:00
Erik Tiekstra
1532898c23 Merged in feat/SW-1457-city-dynamic-map (pull request #1320)
feat(SW-1457): Added map and fetching hotels by cityIdentifier

* feat(SW-1457): Added map and fetching hotels by cityIdentifier


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 13:02:19 +00:00
Linus Flood
019a5db549 Merged in fix/unify-gethotel-input (pull request #1319)
feat: getHotel - unify input to make sure we can use the same cache response

* feat: getHotel - unify input to make sure we can use the same cache response


Approved-by: Simon.Emanuelsson
2025-02-12 11:35:39 +00:00
Pontus Dreij
ea9d68a191 Merged in feat/SW-1540-fetch-updated-data-booking (pull request #1316)
feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Fetch data from API for MyStay

* feat(SW-1540): Moved myStaySkeleton

* feat(SW-1540) used memoized getBookingConfirmation instead


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
2025-02-12 10:22:54 +00:00
Joakim Jäderberg
38da263cb3 Merged in fix/sas-link (pull request #1317)
SAS Handle redirects from server actions on the client

* fix: return values instead of doing redirect in server action

* Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/sas-link

* fix: SAS use client side redirects since netlify doesn't seem to support redirects inside server actions


Approved-by: Linus Flood
2025-02-12 09:42:15 +00:00
Erik Tiekstra
bcfa84324f Merged in feat/SW-1456-country-dynamic-map (pull request #1310)
feat(SW-1456): Added map and fetching hotels by country

* feat(SW-1456): Added map and fetching hotels by country


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-12 09:15:33 +00:00
Pontus Dreij
3901c3ac77 Merged in fix/SW-1551-TRPCError (pull request #1313)
fix/SW-1551-TRPCError

* fix(SW-1551): Fixed error in schema


Approved-by: Hrishikesh Vaipurkar
Approved-by: Linus Flood
2025-02-12 09:01:27 +00:00
Simon.Emanuelsson
4a06162f79 Merged in fix/rateCodes (pull request #1315)
fix: taking care of missing rateDefinitions

* fix: taking care of missing rateDefinitions


Approved-by: Linus Flood
2025-02-12 08:52:08 +00:00
Bianca Widstam
8d6f4b82f3 Merged in feat/SW-1522-select-rate-alternative-hotels (pull request #1312)
feat(SW-1522): add alternative hotel link on select rate if no availability and move alert

* feat(SW-1522): add alternative hotel link on select rate and move alert


Approved-by: Linus Flood
2025-02-12 08:46:15 +00:00
Linus Flood
a8ec845273 Merged in fix/ratecodetype-tracking-2 (pull request #1314)
fix/ratecode-tracking-fix

* fix/ratecode-tracking-fix
2025-02-12 08:38:26 +00:00
Pontus Dreij
3ad5b9e73d Merged in feat/SW-1540-Fetch-correct-data-from-the-API (pull request #1309)
feat(SW-1551): Update schema for booking

* feat(SW-1551): Update schema for booking

* feat(SW-1551): Non breaking changes


Approved-by: Michael Zetterberg
2025-02-11 15:37:28 +00:00
Matilda Landström
72e8e7f1ab Merged in feat/SW-1296-external-restaurant-page (pull request #1306)
Feat(SW-1296): External restaurant page

Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-11 14:55:32 +00:00
Tobias Johansson
b394d54c3f Merged in feat/enter-details-multiroom (pull request #1280)
feat(SW-1259): Enter details multiroom

* refactor: remove per-step URLs

* WIP: map multiroom data

* fix: lint errors in details page

* fix: made useEnterDetailsStore tests pass

* fix: WIP refactor enter details store

* fix: WIP enter details store update

* fix: added room index to select correct room

* fix: added logic for navigating between steps and rooms

* fix: update summary to work with store changes

* fix: added room and total price calculation

* fix: removed unused code and added test for breakfast included

* refactor: move store selectors into helpers

* refactor: session storage state for multiroom booking

* feat: update enter details accordion navigation

* fix: added room index to each form component so they select correct room

* fix: added unique id to input to handle case when multiple inputs have same name

* fix: update payment step with store changes

* fix: rebase issues

* fix: now you should only be able to go to a step if previous room is completed

* refactor: cleanup

* fix: if no availability just skip that room for now

* fix: add select-rate Summary and adjust typings


Approved-by: Arvid Norlin
2025-02-11 14:24:24 +00:00
Matilda Landström
f43ee4a0e6 Merged in feat/SW-1430-cta-button (pull request #1290)
Feat(SW-1430): Add header button on static pages

Approved-by: Erik Tiekstra
2025-02-11 14:10:13 +00:00
Joakim Jäderberg
3d11cfb50a Merged in feature/sas-mypages (pull request #1302)
Feature/sas mypages

* feat: Add SAS partner page under my pages
* fix: feature toggle SAS Partner page in my pages
* add translations for SAS account page
* use 'flex-start' instead of 'start'
* fix: flatten css
* fix: don't use <SectionContainer /> on linkedAccounts page
2025-02-11 12:55:00 +00:00
Christian Andolf
98e3afe9db Merged in fix/LOY-119-hide-redeemed-rewards (pull request #1292)
fix(LOY-119): hiding redeemed rewards

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 12:09:44 +00:00
Fredrik Thorsson
e0996b3464 Merged in feat/SW-1064-restaurant-and-bar-subpage (pull request #1299)
feat/SW-1064 restaurant and bar subpage

* feat(SW-1064): add appendToPath to buttonlink

* feat(SW-1064): add sidebar template

* feat(SW-1064): render pages from nameInUrl

* feat(SW-1064): add content to restaurant sidebar

* feat(SW-1064): change icon size

* feat(SW-1064): move opening hours component

* feat(SW-1064): update switch statement

* feat(SW-1064): fix typo

* feat(SW-1064): rebase

* feat(SW-1064): remove accidentally added file

* feat(SW-1064): undefined check for restaurant subpage


Approved-by: Erik Tiekstra
2025-02-11 12:05:49 +00:00
Erik Tiekstra
ff820d1f31 Merged in feat/SW-1454-listing-skeletons (pull request #1301)
Feat/SW-1454 listing skeletons

* feat(SW-1453): added skeleton for city listning

* feat(SW-1454): added skeleton for hotel listning


Approved-by: Fredrik Thorsson
2025-02-11 12:05:44 +00:00
Christian Andolf
4459d5762c fix(LOY-119): hiding redeemed rewards
some smaller cleanup on coupon property to avoid optional checks
2025-02-11 13:02:29 +01:00
Michael Zetterberg
967c776ab8 feat(SW-1562): enable ContentPage, except signup pages. 2025-02-11 12:40:10 +01:00
Michael Zetterberg
e874cd9b9c feat(SW-1562): enable CollectionPage 2025-02-11 12:39:01 +01:00
Chuma Mcphoy (We Ahead)
3c4d08a894 Merged in feat/1525-info-card-themes (pull request #1300)
feat(SW-1525): Add theme support for InfoCard component

* feat(1525): Add theme support for InfoCard component

* refactor(1525): Update InfoCard theme typing


Approved-by: Christian Andolf
2025-02-11 10:40:23 +00:00
Anton Gunnarsson
6eb01750e8 Merged in fix/move-sas-comparison-to-dynamic-content (pull request #1279)
Move SASTierComparison block to DynamicContent

Approved-by: Erik Tiekstra
2025-02-11 09:36:41 +00:00
Christian Andolf
1d4993fb7f Merged in fix/LOY-89-more-user-friendly-surprise-error-message (pull request #1298)
fix(LOY-89): add a more user friendly error message for when unwrapping surprises

Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 09:13:56 +00:00
Christian Andolf
72049ed88b fix(LOY-89): add a more user friendly error message for when unwrapping surprises 2025-02-11 10:08:40 +01:00
Matilda Landström
ad7402f2e2 Merged in feat/SW-1573-subpage-url (pull request #1297)
Feat(SW-1573): Use pageInUrl for hotel subpages

* feat(SW-1573): use pageInUrl for hotel subpages


Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-11 08:27:09 +00:00
Erik Tiekstra
f021c60c2a Merged in feat/SW-1443-carousel-destination-overview-page (pull request #1289)
feat(SW-1443): added carousel block on hotel overview page

* feat(SW-1443): added carousel block on hotel overview page


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
Approved-by: Chuma Mcphoy (We Ahead)
2025-02-11 06:56:38 +00:00
Linus Flood
a86f0f3993 Merged in fix/nullcheck-gethotelpins (pull request #1296)
fix: getHotelPins - null check on hotelData

* fix: getHotelPins - null check on hotelData


Approved-by: Pontus Dreij
2025-02-10 15:11:39 +00:00
Pontus Dreij
c863294919 Merged in feat/SW-1055-Accordion-for-summary-bar-in-mobile-on-Select-Rate (pull request #1283)
Feat/SW-1055 Accordion for summary bar in mobile on Select Rate

* feat(SW-1055) created mobile summary for select rate

* feat(SW-1055) Added summary for mobile (accordion)


Approved-by: Tobias Johansson
2025-02-10 15:11:31 +00:00
Linus Flood
5a0edc9187 Merged in fix/hoteinfocard-pass-hotel (pull request #1295)
feat:hotel info card - pass hoteldata since we already fetching it on page level

* feat:hotel info card - pass hoteldata since we already fetching it on page level
2025-02-10 14:31:41 +00:00
Pontus Dreij
ec8db51c47 Merged in feat/ancillery-card (pull request #1293)
Created AncillaryCard for SW-1504 and SW-1546

* Created AncillaryCard for SW-1504 and SW-1546

* updated divider

* added dangerouslySetInnerHTML

* Added color="uiTextHighContrast"


Approved-by: Bianca Widstam
2025-02-10 14:01:49 +00:00
Tobias Johansson
450a1d4adc Merged in fix/reverse-date-input-fix (pull request #1294)
Revert "Merged in fix/remove-test-warnings (pull request #1267)"

* Revert "Merged in fix/remove-test-warnings (pull request #1267)"

This reverts commit c62ebb83bb.


Approved-by: Michael Zetterberg
2025-02-10 13:30:03 +00:00
Linus Flood
2522cd7752 Merged in feat/hotelinfocard-skeleton (pull request #1291)
feat: added skeleton to hotelinfo card

* feat: added skeleton to hotelinfo card


Approved-by: Simon.Emanuelsson
2025-02-10 12:49:27 +00:00
Erik Tiekstra
eb0b88f8ea Merged in feat/SW-1584-destination-content-blocks (pull request #1278)
Feat/SW-1584 destination content blocks

* feat(SW-1584): Added accordion and content blocks to destination city pages

* feat(SW-1584): Added accordion and content blocks to destination country pages


Approved-by: Matilda Landström
2025-02-10 09:28:32 +00:00
Erik Tiekstra
918887a63f Merged in fix/hotel-rooms (pull request #1288)
fix: Rooms images on hotel pages

* fix: Rooms images on hotel pages


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-10 09:15:48 +00:00
Pontus Dreij
e51950c8b2 Merged in feat/SW-1497-hide-special-needs (pull request #1285)
feat(SW-1497): Temporary hide Special requests dropdowns

* feat(SW-1497): Temporary hide Special requests dropdowns


Approved-by: Tobias Johansson
2025-02-10 08:31:43 +00:00
Erik Tiekstra
413c197ca0 Merged in feat/SW-1495-hide-alerts-on-hotel-pages (pull request #1268)
feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true

* feat(SW-1495): removed alerts on hotel pages when displayInBookingFlow is true


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-10 07:40:38 +00:00
Erik Tiekstra
ce445e3f0b Merged in feat/SW-327-pdf-support (pull request #1276)
feat(SW-327): added support to link to pdf files from CS

* feat(SW-327): added support to link to pdf files from CS


Approved-by: Matilda Landström
2025-02-10 07:26:56 +00:00
Pontus Dreij
8b47749508 Merged in fix/remove-composes (pull request #1286)
fix: Removed composes

Approved-by: Michael Zetterberg
2025-02-08 15:32:57 +00:00