scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,050 Commits 2 Branches 0 Tags
1c5b116ed8f8ae9bccc18e152be695734e7ca25e
Commit Graph

30 Commits

Author SHA1 Message Date
Hrishikesh Vaipurkar
1c5b116ed8 Merged in feat/SW-1355-reward-night-booking-tracking (pull request #1758) 
feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Tracking implementation reward night booking

* feat: SW-1355 Updated checks and optional params

* feat: SW-1355 Typings updated

* feat: SW-1355 Removed undefined check

* feat: SW-1355 optimized code


Approved-by: Christian Andolf
 2025-04-14 11:10:03 +00:00
Hrishikesh Vaipurkar
e372b91356 Merged in feat/SW-1517-booking-codes-tracking (pull request #1745) 
Feat/SW-1517 booking codes tracking

* feat: SW-1517 Updated tracking to inlcude booking code info

* feat: SW-1517 Tracking booking codes

* feat: SW-1517 booking code multiroom tracking

* feat: SW-1517 booking code tracking select-hotel map view

* feat: SW-1517 Updated to optional param

* feat: SW-1517 Optimized with map

* feat: SW-1517 Typings update

* feat: SW-1517 Replaced reduce with map and join

* feat: SW-1517 Updated typings


Approved-by: Christian Andolf
 2025-04-14 07:17:40 +00:00
Chuma Mcphoy (We Ahead)
31370fe711 Merged in fix/SW-2197-dont-show-benefits-not-applied-text (pull request #1776) 
fix(SW-2197): remove no membership benefits message

* fix(SW-2197): remove no membership benefits message


Approved-by: Christian Andolf
Approved-by: Matilda Landström
 2025-04-14 06:40:40 +00:00
Hrishikesh Vaipurkar
2b08f257f5 Merged in fix/SW-2079-update-confirmation-page-summ (pull request #1774) 
fix: SW-2079 Fixed regular room price display confirmation page

* fix: SW-2079 Fixed regular room price display confirmation page


Approved-by: Simon.Emanuelsson
 2025-04-10 11:02:17 +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
Matilda Landström
1239f0c662 Merged in feat/SW-1711-SW-2077-icons (pull request #1709) 
Fix(SW-1711)/(SW-2077): Export icons individually

* fix(SW-1711): export icons individually


Approved-by: Michael Zetterberg
Approved-by: Erik Tiekstra
 2025-04-07 07:25:25 +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
Simon Emanuelsson
2abd4c5c12 fix: display modify dates for already guaranteed changeable rates 2025-04-04 08:46:47 +00:00
Arvid Norlin
2272bb4403 Merged in fix/SW-2136 (pull request #1720) 
fix(SW-2136): correct booking confirmation breakfast logic

* fix(SW-2136): correct booking confirmation breakfast logic


Approved-by: Simon.Emanuelsson
 2025-04-03 10:15:19 +00:00
Simon Emanuelsson
4e36fecd6e fix: initial fix of modify dates 2025-04-03 04:25:05 +00:00
Simon Emanuelsson
a222ecfc5c fix: make sure calculations in booking flow are correct 2025-04-02 15:00:39 +00:00
Arvid Norlin
5cff2e5f36 Merged in feat/SW-1889 (pull request #1670) 
Feat/SW-1889

* fix: remove download invoice from confirmation page

* feat: remove EnterDetails Accordions


Approved-by: Simon.Emanuelsson
 2025-03-31 13:14:11 +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
Arvid Norlin
81b44b357c Merged in fix/confirmation-payment-details-text (pull request #1596) 
fix: update Payment Details text

* fix: update Payment Details text


Approved-by: Simon.Emanuelsson
 2025-03-24 08:04:25 +00:00
Bianca Widstam
3c1eee88b1 Merged in feat/SW-1370/Guarantee-my-stay-ancillaries (pull request #1545) 
Feat/SW-1370/Guarantee my stay ancillaries

* feat(SW-1370): guarantee for ancillaries

* feat(SW-1370): remove console log

* feat(SW-1370): add translations

* feat(SW-1370): small fix

* feat(SW-1370): fix must be guaranteed

* feat(SW-1370): fix logic and comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): fix comments pr

* feat(SW-1370): add translation

* feat(SW-1370): add translation and fix pr comment

* feat(SW-1370): fix pr comment

* feat(SW-1370): fix encoding path refId issue

* feat(SW-1370): refactor AddAncillaryStore usage and introduce context provider

* feat(SW-1370): refactor

* feat(SW-1370): refactor ancillaries

* feat(SW-1370): fix merge


Approved-by: Simon.Emanuelsson
 2025-03-21 07:29:04 +00:00
Pontus Dreij
8f9e268802 Merged in feat(SW-1944)-update-url-to-mystay (pull request #1566) 
feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)

* feat(SW-1944) Update to correct URL to my stay (for my pages/my stays and confirmation page)

* feat(SW-1944) updated to RefId

* feat(SW-1944) updated myStay path

* feat(SW-1944) updated refId check


Approved-by: Christian Andolf
 2025-03-20 09:55:24 +00:00
Simon Emanuelsson
1812591903 feat: add multiroom tracking to booking flow 2025-03-17 09:47:42 +01: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
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
Arvid Norlin
ec60e9abdd Merged in feat/SW-1652-confirmation-page (pull request #1483) 
Feat/SW-1652 confirmation page

* feat(SW-1652): handle linkedReservations fetching

* fix: add missing translations

* feat: add linkedReservation retry functionality

* chore: align naming


Approved-by: Simon.Emanuelsson
 2025-03-07 12:47:04 +00:00
Michael Zetterberg
b8ad88de1b fix: improve labels 2025-03-03 17:12:10 +01:00
Arvid Norlin
2813dc6f84 Merged in fix/linkedReservation-typings (pull request #1431) 
fix: linkedReservation typings

* fix: correct rinkedReservation typings


Approved-by: Christian Andolf
Approved-by: Simon.Emanuelsson
 2025-02-27 09:10:13 +00:00
Christian Andolf
0c1396f2ee fix: remove useless imports and sort them 
add missing key in iterator
 2025-02-27 09:43:57 +01:00
Joakim Jäderberg
082a162257 Merged in fix/pinned-yarn-version (pull request #1428) 
fix: different packageManager versions in different package.json's caused issues when installing

* fix: different packageManager versions in different package.json's caused issues when installing

* fix: build error


Approved-by: Anton Gunnarsson
 2025-02-27 08:41:34 +00:00
Linus Flood
0c498d82ca Merged in feat/trackingsdk-client (pull request #1420) 
feat: trackingsdk as client component

* feat: trackingsdk as client component

* Cleanup

* Merge changes from feat/trackingsdk-client

* revert yarn.lock

* Added lcpTime and wait with tracking until we have the values


Approved-by: Joakim Jäderberg
 2025-02-27 07:22:58 +00:00
Arvid Norlin
eb74ea6939 Merged in fix/missing-confirmation-page-room-titles (pull request #1424) 
fix: add missing room titles

* fix: add missing room titles


Approved-by: Tobias Johansson
 2025-02-26 15:25:53 +00:00
Arvid Norlin
d5e5b9a526 Merged in feat/SW-1652-confirmation-page-multiroom (pull request #1404) 
feat(SW-1652): Fetching additional rooms on confirmation page

* feat(SW-1652): Fetching additional rooms on confirmation page


Approved-by: Tobias Johansson
 2025-02-26 12:42:54 +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