scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,795 Commits 1 Branch 0 Tags
8a9be52fa2c3e17a772f2eb977d1dc8fb787eab6
Commit Graph

155 Commits

Author SHA1 Message Date
Simon.Emanuelsson
8a9be52fa2 Merged in fix/duplicate-rooms (pull request #1573) 
fix: we showed duplicate rooms because every bed represents a room

Approved-by: Michael Zetterberg
 2025-03-20 08:08:39 +00:00
Tobias Johansson
ac493fe325 Merged in feat/SW-1149-handle-status-polling (pull request #1562) 
Feat/SW-1149 handle status polling

* feat(SW-1149): move terms and conditions sections to separate component and added copy

* feat(SW-1149): Added client component to handle success callback for payment flow

* fix: check for bookingCompleted status as well

* feat(SW-1587): use alert instead of toast for showing payment errors

* fix: added enum for payment callback status

* fix: proper way of checking for multiple statuses

* fix: update schema type

* fix: use localised link to customer service

* fix: update to use enum for status strings


Approved-by: Arvid Norlin
 2025-03-20 07:38:29 +00:00
Simon Emanuelsson
cf91d3d947 fix: we showed duplicate rooms because every bed represents a room 2025-03-19 19:36:47 +01:00
Pontus Dreij
fb321cdb13 Merged in feat(SW-1274)-modify-date-my-stay (pull request #1528) 
Feat(SW-1274) modify date my stay

* feat(SW-1676): Modify guest details step 1

* feat(SW-1676) Integration to api to update guest details

* feat(SW-1676) Reuse of old modal

* feat(SW-1676) updated modify guest

* feat(SW-1676) cleanup

* feat(SW-1274) modify stay modal and datepicker

* feat(SW-1274) DatePicker from modify dates

* feat(SW-1274) Modify dates fixes and merge conflicts

* feat(SW-1274) handle modify for multiroom

* feat(SW-1274) update manage stay

* feat(SW-1274) fixed some comments

* feat(SW-1274) use Modal instead

* feat(SW-1274) fixed formatChildBedPreferences

* feat(SW-1274) removed any as prop

* feat(SW-1274) fix rebase conflicts

* feat(SW-1274) fix flicker on modify modal

* feat(SW-1274) CalendarButton

* feat(SW-1274) fixed gap variable

* feat(SW-1274) simplified code

* feat(SW-1274) Split up DatePicker on mode

* feat(SW-1274) Updated file structure for datepicker


Approved-by: Arvid Norlin
 2025-03-19 13:11:03 +00:00
Chuma Mcphoy (We Ahead)
b0aea68ee5 Merged in fix/LOY-180-hide-filter-modal (pull request #1568) 
fix(LOY-180): remove use of FilterRewardsModal

* fix(LOY-180): remove use of FilterRewardsModal


Approved-by: Christian Andolf
 2025-03-19 12:07:02 +00:00
Christian Andolf
7ddca4acba Merged in fix/change-ref-id-to-query-param (pull request #1578) 
fix: my stay now uses ref id in query param rather than path param to support legacy

* fix: my stay now uses ref id in query param rather than path param to support legacy


Approved-by: Michael Zetterberg
 2025-03-19 11:39:16 +00:00
Hrishikesh Vaipurkar
cb5c3bfcef feat: SW-1589 Obtain bookingCode from booking object via store 2025-03-19 11:01:56 +01:00
Hrishikesh Vaipurkar
eb2c4511c2 feat: SW-1589 Booking code booking creation 2025-03-19 09:36:34 +00:00
Anton Gunnarsson
8d1e9954d4 Merged in fix/sas-unlink-missing-intl (pull request #1534) 
Add missing intl keys for SAS unlink flow

Approved-by: Linus Flood
 2025-03-19 09:12:36 +00:00
Erik Tiekstra
9688232b2d feat(SW-1907): Not rendering preamble when at least one filter is active on destination pages 
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
 2025-03-19 08:46:44 +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
Christian Andolf
2fc33966ac Merged in fix/LOY-141-add-surprises-to-webview (pull request #1561) 
fix(LOY-141): add suprises to webview

Approved-by: Chuma Mcphoy (We Ahead)
 2025-03-18 12:33:37 +00:00
Linus Flood
0e0b065dd9 Merged in feat/SW-598 (pull request #1554) 
feat: pass specialRequest.comment to create booking

* feat: pass specialRequest.comment to create booking


Approved-by: Simon.Emanuelsson
 2025-03-18 10:43:28 +00:00
Linus Flood
fc219aaec0 Merged in fix/handle-no-meetingrooms (pull request #1563) 
Fix/handle no meetingrooms

* feat/meeting-rooms: handle no meeting rooms

* Cleanup


Approved-by: Anton Gunnarsson
Approved-by: Matilda Landström
 2025-03-18 10:36:40 +00:00
Anton Gunnarsson
d0b6f3f8b3 Merged in feat/sw-1314-transfer-sas-points (pull request #1508) 
SW-1314 Transfer SAS points

Approved-by: Linus Flood
 2025-03-18 10:07:05 +00:00
Christian Andolf
afb367c478 fix(LOY-141): add suprises to webview 2025-03-18 10:56:21 +01:00
Fredrik Thorsson
d4fe8baa49 Merged in feat/SW-1899-destination-city-mobile-map-active-pins (pull request #1557) 
feat(SW-1899): active hotel pin on carousel scroll

* feat(SW-1899): active hotel pin on carousel scroll


Approved-by: Erik Tiekstra
 2025-03-18 09:44:17 +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
da3a7c1865 feat(SW-1464): Added meeting url instead of hotel url for hotellisting with meeting information 
Approved-by: Matilda Landström
 2025-03-18 07:01:56 +00:00
Christian Andolf
6d0f47fd4f Merged in fix/SW-1942-case-in-sensitive-find-my-booking (pull request #1552) 
fix(SW-1942): fixed find my booking to be case-insensitive on form input

Approved-by: Chuma Mcphoy (We Ahead)
 2025-03-17 15:34:00 +00:00
Chuma Mcphoy (We Ahead)
0a150a4eca Merged in fix/remove-deafult-centering-behaviour-in-carousels (pull request #1543) 
refactor(SW-1941): clean up custom Carousel component centering

* refactor: clean up custom Carousel component centering

- Removed unused centerContent class from carousel.module.css.
- Simplified CarouselContent component by eliminating unnecessary state and effect hooks.
- Updated HotelCardCarousel to include responsive breakpoints for scrolling behavior.

* refactor: simplify scrolling options in HotelCardCarousel

- Updated the HotelCardCarousel component to streamline scrolling options by removing responsive breakpoints and setting containScroll to false.


Approved-by: Matilda Landström
 2025-03-17 15:28:24 +00:00
Christian Andolf
5e98ffe38d fix(SW-1942): fixed find my booking to be case-insensitive on form input 2025-03-17 16:07:23 +01:00
Christian Andolf
38f3b0e6a4 Merged in fix/access-booking-fixes (pull request #1550) 
fix: add some more informative messages when booking cant be accessed

Approved-by: Chuma Mcphoy (We Ahead)
 2025-03-17 14:54:37 +00:00
Erik Tiekstra
c5ad3cba34 feat(SW-1940): Added functionality to see hotel on map from city pages 
Approved-by: Fredrik Thorsson
 2025-03-17 13:18:38 +00:00
Christian Andolf
b65bdce277 fix: add some more informative messages when booking cant be accessed 
upped cookie length from 30 seconds to 10 minutes

added default values to prevent the default required error message to appear in form
 2025-03-17 14:09:08 +01:00
Bianca Widstam
21aea22e48 Merged in fix/api-change-remove-points-packages (pull request #1547) 
Fix/api change remove points packages

* fix/remove-points

* fix: translate if points is currency


Approved-by: Niclas Edenvin
Approved-by: Simon.Emanuelsson
 2025-03-17 10:59:17 +00:00
Simon.Emanuelsson
1d49b834ff Merged in feat/SW-1353 (pull request #1513) 
feat: add multiroom tracking to booking flow

Approved-by: Linus Flood
 2025-03-17 09:35:12 +00:00
Erik Tiekstra
aca3c7f398 feat(SW-1712): Preperation to accept multiple different icon identifiers for filters on startpage and destination overview page 
Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
 2025-03-17 08:58:29 +00:00
Simon Emanuelsson
1812591903 feat: add multiroom tracking to booking flow 2025-03-17 09:47:42 +01:00
Fredrik Thorsson
c99060363c Merged in fix/SW-1898-mobile-hotel-map-card-list (pull request #1537) 
fix/SW-1898-mobile-hotel-map-card-list

* fix(SW-1898): call reInit


Approved-by: Erik Tiekstra
 2025-03-17 07:53:32 +00:00
Fredrik Thorsson
8f0763285c Merged in fix/SW-1895-update-hotel-listning-to-show-all (pull request #1535) 
fix(SW-1895): always display full list of cities or countries

* fix(SW-1895): always display full list of cities or countries


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström
 2025-03-17 07:45:12 +00:00
Michael Zetterberg
f7e100d45c fix: translation mapping typos 2025-03-14 15:11:49 +01:00
Michael Zetterberg
33239f1f91 feat(SW-1730): add button to room sidepeek on hotelpage to select rate page for the hotel 2025-03-14 13:57:26 +00:00
Arvid Norlin
540402b969 Merged in feat/SW-1813 (pull request #1516) 
Feat/SW-1813

* feat(SW-1652): handle linkedReservations fetching

* feat: add linkedReservation retry functionality

* chore: align naming

* feat(SW-1813): Add booking confirmation PriceDetailsModal


Approved-by: Simon.Emanuelsson
 2025-03-14 13:49:22 +00:00
Michael Zetterberg
66682be4d2 fix: types for timer in platform agnostic way 2025-03-14 13:15:11 +00:00
Tobias Johansson
c0b543f18d Merged in feat/SW-1437-price-change-scenario (pull request #1532) 
Feat/SW-1437 price change scenario

* wip price change scenario

* feat(SW-1437): added updated room prices to summary

* fix: spinner not centered on page

* fix: feedback fixes


Approved-by: Arvid Norlin
Approved-by: Simon.Emanuelsson
 2025-03-14 12:39:50 +00:00
Bianca Widstam
abd401c4f4 Merged in feat/SW-1368-1369-Guarantee-late-arrival (pull request #1512) 
Feat/SW-1368 1369 Guarantee late arrival

* feat(SW-1368-SW-1369): guarantee late arrival for confirmation page and my stay

* feat(SW-1368-SW-1369): guarantee late arrival updated design

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): fix merge with master

* feat(SW-1368-SW-1369): add translations

* feat(SW-1368-SW-1369): add redirect with refId

* feat(SW-1368-SW-1369): if booking completed redirect to confirmation page

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix comments pr

* feat(SW-1368-SW-1369): fix rebase master

* feat(SW-1368-SW-1369): fix duplicate flex rate check

* feat(SW-1368-SW-1369): if any room is flex, card must be used

* feat(SW-1368-SW-1369): move callback route

* feat(SW-1368-SW-1369): top align checkbox

* feat(SW-1368-SW-1369): top align checkbox


Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
 2025-03-14 10:43:14 +00: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
Fredrik Thorsson
a8304e543e Merged in fix/SW-1763-clustering-pins-on-filtering-city-map (pull request #1520) 
fix/SW-1763 clustering pins on filtering city map

* fix(SW-1763): uncluster when filter is applied

* fix(SW-1763): pass active filters as prop

* fix(SW-1763): change prop type to boolean


Approved-by: Erik Tiekstra
 2025-03-13 15:21:18 +00:00
Anton Gunnarsson
29f0eb4f21 Merged in feat/sw-1732-trigger-tier-match (pull request #1408) 
SW-1732 Trigger SAS tier match

* Add endpoint for SAS tier match

* Add comment about future fix

* Move tier match to background request on my-pages/*

* Log result from tier match

* Clean up name etc

* Fix tier matched toast

Approved-by: Joakim Jäderberg
 2025-03-13 14:12:31 +00:00
Michael Zetterberg
065ebb57c6 fix: more label fixes 2025-03-13 10:25:05 +01:00
Michael Zetterberg
91c36ee41c fix: clean up dictionaries 2025-03-13 08:29:48 +00:00
Christian Andolf
1a8a57599c fix: encoding find my booking cookie since next decodes when parsing 
this is done in order to handle emails containing plus signs
 2025-03-13 08:28:03 +00:00
Chuma Mcphoy (We Ahead)
550474dffe Merged in feat/SW-1909-update-adobe-on-language-change (pull request #1526) 
feat(SW-1909): Fix Adobe Data Layer not updating during language changes

* feat(SW-1909): Update Tracking on language changes


Approved-by: Linus Flood
 2025-03-13 08:25:50 +00:00
Erik Tiekstra
d50cf829e6 feat(SW-1842): Making the navigation links in the header render in the initial HTML for SEO purposes 
* feat(SW-1842): Making the navigation links in the header render in the initial HTML for SEO purposes


Approved-by: Fredrik Thorsson
 2025-03-12 15:16:06 +00:00
Erik Tiekstra
689e9d72cb fix(SW-1886): Removed "firstItem" props from blocks as it generates multiple h1 tags on those pages 
* feat(SW-1886): Removed "firstItem" props from blocks as it generates multiple h1 tags on those pages


Approved-by: Fredrik Thorsson
Approved-by: Simon.Emanuelsson
 2025-03-12 14:09:20 +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
Erik Tiekstra
198f0da748 feat(SW-1888): Removed link from tripadvisor text on hotel pages 
* feat(SW-1888): Removed link from tripadvisor text on hotel pages


Approved-by: Fredrik Thorsson
 2025-03-12 10:39:12 +00:00
Tobias Johansson
ad05f792fb Merged in feat/SW-1078-rate-terms-scenarios (pull request #1500) 
feat(SW-1078): mixed rate scenario

* feat(SW-1078): mixed rate scenario

* fix: change from css string modification to array join

* refactor: split out big reduce function into smaller parts

* fix: minor fixes and improvments

* fix: added room index map to localization string


Approved-by: Christian Andolf
 2025-03-12 10:34:35 +00:00
Christian Andolf
796112ca28 Merged in feat/LOY-154-add-expiration-date-to-rewards (pull request #1506) 
feat(LOY-154): add expiration date to rewards

Approved-by: Chuma Mcphoy (We Ahead)
 2025-03-12 07:39:03 +00:00