Commit Graph

37 Commits

Author SHA1 Message Date
Simon Emanuelsson
a222ecfc5c fix: make sure calculations in booking flow are correct 2025-04-02 15:00:39 +00:00
Linus Flood
e4907d4b47 Merged in fix/destinations-speed-test (pull request #1704)
Feat(destination pages): Performance improvements

* fix/destinations: try cache full response

* Added more caching

* Removed unsed env car

* wip

* merge master

* wip

* wip

* wip

* Renaming


Approved-by: Michael Zetterberg
2025-04-02 11:37:22 +00:00
Arvid Norlin
961e8aea91 Merged in fix/SW-1631-rate-terms-modal (pull request #1699)
fix(SW-1631): add rate terms modal

* fix(SW-1631): add rate terms modal


Approved-by: Simon.Emanuelsson
2025-04-02 09:36:53 +00:00
Erik Tiekstra
df32c08350 feat(SW-2043): Added new room packages filter
* feat(SW-2043): Added new room packages filter

* fix(SW-2043): Fixed issue with not updating price when selecting pet room

Approved-by: Tobias Johansson
Approved-by: Matilda Landström
2025-04-01 09:54:09 +00:00
Hrishikesh Vaipurkar
96fd0b73e4 feat: SW-2028 Fixed review comments 2025-04-01 08:18:22 +00:00
Hrishikesh Vaipurkar
4e9ee82efa feat: SW-2028 Fix after rebase 2025-04-01 08:18:22 +00:00
Hrishikesh Vaipurkar
03deea1102 feat: SW-2028 Updated Guarantee notification 2025-04-01 08:18:22 +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
Simon Emanuelsson
ebaea78fb3 feat(SW-1717): rewrite select-rate to show all variants of rate-cards 2025-03-28 17:07:54 +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
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
Simon Emanuelsson
cf91d3d947 fix: we showed duplicate rooms because every bed represents a room 2025-03-19 19:36:47 +01: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
Michael Zetterberg
91c36ee41c fix: clean up dictionaries 2025-03-13 08:29:48 +00:00
Tobias Johansson
1009ea87c9 Merged in fix/SW-1686-show-correct-room-availabilty-number (pull request #1491)
fix: filter to only show available rooms in roomFilter

* fix: filter to only show available rooms in roomFilter


Approved-by: Niclas Edenvin
2025-03-10 08:32:14 +00:00
Hrishikesh Vaipurkar
39b6774269 Merged in feat/SW-1589-implement-booking-code-enter (pull request #1368)
Feat/SW-1589 implement booking code enter

* feat: SW-1589 Booking code rate implementation

* feat: SW-1589 Optimized price display

* feat: SW-1589 Display standard price

* feat: SW-1589 Fixed rate title issue


Approved-by: Niclas Edenvin
2025-03-05 09:32:32 +00:00
Michael Zetterberg
b8ad88de1b fix: improve labels 2025-03-03 17:12:10 +01:00
Simon.Emanuelsson
c3e3fa62ec Merged in fix/allow-single-rateCode (pull request #1438)
fix: allow rates that only have either of member or public to be selectable

* fix: allow rates that only have either of member or public to be selectable


Approved-by: Michael Zetterberg
2025-03-03 08:28:55 +00:00
Simon Emanuelsson
92c5566c59 feat: add multiroom signup 2025-02-28 11:10:22 +01:00
Tobias Johansson
95917e5e4f Merged in fix/SW-1760-room-details-button-wrong-color (pull request #1440)
fix: added prop to ToggleSidePeek to fix color regression

* fix: added prop to ToggleSidePeek to fix color regression


Approved-by: Arvid Norlin
2025-02-28 08:23:15 +00:00
Hrishikesh Vaipurkar
6e9123aca9 feat: SW-1588 Fixed rebase issues 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
7fe217826d feat: SW-1588 Optimized review comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
2a51107500 feat: SW-1588 Optimized rate title 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
7541c74038 feat: SW-1588 Update as per review comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
bf5ce25089 feat: SW-1588 Fixed same key error 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
cd96aa2c94 feat: SW-1588 Fixed undefined handling 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
8b53ed3301 feat: SW-1588 Optimized code & comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
b0f6fa7e45 feat: SW-1588 Fix after rebase 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
71eac4e8ba feat: SW-1588 Optimized as per review comments 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
fef31237c8 feat: SW-1588 Updated rate selection 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
a7443e5750 feat: SW-1588 No booking code search results UX 2025-02-27 13:10:04 +00:00
Hrishikesh Vaipurkar
8966e56820 feat: SW-1588 Implemented booking code select-rate 2025-02-27 13:10:04 +00:00
Tobias Johansson
832b6c27e0 Merged in fix/SW-1715-price-details-with-many-rooms (pull request #1421)
Fix/SW-1715 price details with many rooms

* fix: added useMemo to stop combineRoomAvailabilities from rerunning

* fix: add max height and scroll to modal content

* fix: return new array in combineRoomAvailabilities instead of pushing


Approved-by: Christian Andolf
2025-02-27 12:55:07 +00:00
Tobias Johansson
895dce2f72 Merged in fix/SW-1686-show-correct-room-number (pull request #1417)
fix(SW-1686): display total rooms and available rooms when filtering

* fix(SW-1686): display total rooms and available rooms when filtering


Approved-by: Arvid Norlin
Approved-by: Simon.Emanuelsson
2025-02-27 09:06:22 +00:00
Anton Gunnarsson
80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00