Commit Graph

35 Commits

Author SHA1 Message Date
Matilda Landström
be643e68a7 Merged in fix/SW-2980-alert (pull request #2312)
Fix/SW-2980: Only filter out child alert on hotel page

Approved-by: Erik Tiekstra
2025-06-10 07:35:12 +00:00
Matilda Landström
0383a332ad Merged in feat/SW-2888-facilities (pull request #2267)
Feat/SW-2888 facilities

* chore(SW-2944): change order of content

* chore(SW-2944): add openinghourstype from api


Approved-by: Erik Tiekstra
2025-06-05 07:29:49 +00:00
Anton Gunnarsson
7e97b74c18 Merged in chore/remove-unused-code (pull request #2229)
Remove unused code

* Remove unused scandic-web files

* Remove unused exports


Approved-by: Joakim Jäderberg
2025-05-30 12:41:18 +00:00
Erik Tiekstra
42701739a0 Merged in fix/SW-2921-countryName (pull request #2249)
fix(SW-2921): Moved countryName to attributes in locations schema

* fix(SW-2921): Moved countryName to attributes in locations schema


Approved-by: Linus Flood
2025-05-28 08:45:03 +00:00
Erik Tiekstra
efbed53be4 fix(SW-2921): Fixed issue with countryName missing from locations response
* fix(SW-2921): Added more correct cache key to locations endpoint

Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
2025-05-27 11:46:59 +00:00
Hrishikesh Vaipurkar
74a5b5748a Merged in fix/SW-2642-select-hotel-corporate-ch (pull request #2003)
fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed no availability alert for all hotels

* fix: SW-2642 Combined flags to suitable variable

* fix: SW-2642 Fixed map view to show prices


Approved-by: Arvid Norlin
2025-05-08 10:46:05 +00:00
Matilda Landström
5f38a92b74 fix(2547): filter inActive hotels from booking widget 2025-05-06 13:12:19 +00:00
Matilda Landström
6a2bb5ac2d fix(SW-2547): filter out cities and hotel with isPublished=false 2025-05-06 13:12:18 +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
Simon Emanuelsson
afb37d0cc5 feat: bedtypes is selectable again 2025-04-12 08:32:42 +00:00
Michael Zetterberg
9e84da45bc feat(SW-1446): add Jump to functionality to Destination Overview Page 2025-04-08 05:52:10 +00:00
Simon Emanuelsson
a222ecfc5c fix: make sure calculations in booking flow are correct 2025-04-02 15:00:39 +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
Hrishikesh Vaipurkar
96fd0b73e4 feat: SW-2028 Fixed review comments 2025-04-01 08:18:22 +00:00
Hrishikesh Vaipurkar
4f4e077859 feat: SW-2028 Updated validations at trpc query level 2025-04-01 08:18:22 +00:00
Simon Emanuelsson
9d584887ad fix: add bookingCode to product 2025-03-31 13:53:29 +02: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
Niclas Edenvin
fef3a785d0 Merged in feat/sw-1688-list-breakfast (pull request #1615)
Feat/sw-1688 list breakfast

Approved-by: Pontus Dreij
2025-03-25 09:56:05 +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
6fb71dea1b fix: Price types has changed to doubles in the API 2025-03-20 10:19:25 +00:00
Simon Emanuelsson
cf91d3d947 fix: we showed duplicate rooms because every bed represents a room 2025-03-19 19:36:47 +01: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
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
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
Hrishikesh Vaipurkar
5058180c41 feat: SW-1583 Implemented Reward nights on city search 2025-03-07 09:08:18 +00:00
Erik Tiekstra
81f1470405 Merged in fix/SW-1812-include-schema (pull request #1471)
fix(SW-1812): fixes the issue where we receive `null` instead of actual data inside the includeSchema

* fix(SW-1812): fixes the issue where we receive `null` instead of actual data inside the includeSchema


Approved-by: Matilda Landström
2025-03-04 14:43:36 +00:00
Matilda Landström
481d70104b Merged in fix/zod-validation (pull request #1463)
fix: displayWebPage zod schema

* fix: displayWebPage zod schema


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-03-04 07:32:44 +00: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
Hrishikesh Vaipurkar
8b53ed3301 feat: SW-1588 Optimized code & comments 2025-02-27 13:10:05 +00:00
Hrishikesh Vaipurkar
71eac4e8ba feat: SW-1588 Optimized as per review comments 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
Michael Zetterberg
43c25aea95 fix: improve handling of booking widget params from search params
now we are defensive in parsing the location
if parsing fails the not found is now displayed
2025-02-26 13:55:30 +01: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