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

30 Commits

Author SHA1 Message Date
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389) 
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
 2025-06-26 07:53:01 +00:00
Tobias Johansson
002d5f9c68 Merged in fix/SW-3078-wrong-dates-time-zones (pull request #2388) 
fix(SW-3078): change to string instead of Date in Zod schema

* fix(SW-3078): change to string instead of Date in Zod schema


Approved-by: Michael Zetterberg
Approved-by: Linus Flood
 2025-06-18 10:55:05 +00:00
Simon Emanuelsson
e082bf2e50 feat: make sure correct data is sent to tracking 2025-05-14 15:10:18 +00:00
Michael Zetterberg
b910b6a313 feat(SW-2116): Use refId instead of confirmationNumber 2025-05-05 12:26:37 +00:00
Linus Flood
6979ac0c3b Merged in revert-pr-1925 (pull request #1927) 
Revert "Feat/sw 2323 find booking (pull request #1925)"

Approved-by: Anton Gunnarsson
 2025-05-02 13:05:42 +00:00
Arvid Norlin
74d37dad93 feat(SW-2116): RefId instead of confirmationNumber 2025-05-02 12:44:07 +02:00
Simon Emanuelsson
ec087a3d15 feat: refactor of my stay 2025-04-28 12:40:52 +00:00
Bianca Widstam
128c1e3462 Merged in fix/display-added-ancillaries-only-if-nonmodifiable (pull request #1718) 
fix: fix logic for showing ancillaries and add/remove ancillaries

* fix: fix logic for showing ancillaries and add/remove ancillaries

* fix: move canModifyAncillary check


Approved-by: Niclas Edenvin
 2025-04-03 11:15:49 +00:00
Niclas Edenvin
a34951e075 Merged in fix/add-multinight-breakfast (pull request #1705) 
The number of breakfasts and total sums weren’t correctly calculated. This fixes that.

Also changes display logic of when the ancillaries sections are shown

Approved-by: Bianca Widstam
 2025-04-02 16:03:50 +00:00
Hrishikesh Vaipurkar
96fd0b73e4 feat: SW-2028 Fixed review comments 2025-04-01 08:18:22 +00:00
Pontus Dreij
b48053b8b4 Merged in feat(SW-2083)-missing-booking-codes-scenarios-my-stay (pull request #1680) 
Feat(SW-2083) missing booking codes scenarios my stay

* feat(SW-2083) Show points instead of reward nights

* feat(SW-2083) added support for cheque and voucher for totalPrice


Approved-by: Niclas Edenvin
 2025-03-31 11:42:47 +00:00
Pontus Dreij
74c5b47319 Merged in feat/SW-1737-design-mystay-multiroom (pull request #1565) 
Feat/SW-1737 design mystay multiroom

* feat(SW-1737) Fixed member view of guest details

* feat(SW-1737) fix merge issues

* feat(SW-1737) Fixed price details

* feat(SW-1737) removed unused imports

* feat(SW-1737) removed true as statement

* feat(SW-1737) updated store handling

* feat(SW-1737) fixed bug showing double numbers

* feat(SW-1737) small design fixed

* feat(SW-1737) fixed rebase errors

* feat(SW-1737) fixed create booking error with dates

* feat(SW-1737) fixed view multiroom as singleroom

* feat(SW-1737) fixes for multiroom

* feat(SW-1737) fixed bookingsummary

* feat(SW-1737) dont hide modify dates

* feat(SW-1737) updated breakfast to handle number

* feat(SW-1737) Added red color if member rate

* feat(SW-1737) fix PR comments

* feat(SW-1737) updated member tiers svg

* feat(SW-1737) updated how to handle paymentMethodDescription

* feat(SW-1737) fixes after testing mystay

* feat(SW-1737) updated Room type to just use whats used

* feat(SW-1737) fixed access

* feat(SW-1737) refactor my stay after PR comments

* feat(SW-1737) fix roomNumber translation

* feat(SW-1737) removed log


Approved-by: Arvid Norlin
 2025-03-24 09:30:10 +00:00
Pontus Dreij
542e20e69c Merged in fix/booking-guest-phone (pull request #1579) 
fix: phoneNumber doesn't need to be validated from API

* fix: phoneNumber doesn't need to be validated from API


Approved-by: Tobias Johansson
 2025-03-21 15:28:34 +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
096cf700f4 Merged in fix/dates-create-booking-output (pull request #1589) 
fix: fixed bug with wrong schema

* fix: fixed bug with wrong schema


Approved-by: Niclas Edenvin
 2025-03-20 19:05:51 +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
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
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
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
Christian Andolf
b0df70e552 feat(SW-1710): add access checks to my stay page for viewing booking 2025-03-10 09:45:56 +01:00
Pontus Dreij
2509794d0c Merged in feat/SW-1676-modify-contact-details-my-stay-anonymous (pull request #1468) 
Feat/SW-1676 modify contact details my stay anonymous

* 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-1676) updated myStayReturnRoute to sessionStorage


Approved-by: Niclas Edenvin
 2025-03-07 13:41:25 +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
Bianca Widstam
4fc25e42b5 Merged in feat/SW-1648-booking-code-my-stay (pull request #1447) 
feat(SW-1648): add booking code on my stay

* feat(SW-1648): add booking code on my stay


Approved-by: Niclas Edenvin
 2025-02-28 14:09:23 +00:00
Pontus Dreij
69139c5230 Merged in feat(SW-1279)-mystay-multirum-cancelling (pull request #1443) 
Feat(SW-1279) mystay multirum cancelling

* feat(SW-1279) Cancelation text if non-user on room 2-4

* feat(SW-1279) cancel mystay multiroom

* feat(SW-1279): Added cancellation for multiroom on mystay


Approved-by: Niclas Edenvin
 2025-02-28 07:17:25 +00:00
Niclas Edenvin
747201b0f7 Merged in feat/SW-1282-list-added-ancillaries (pull request #1416) 
Feat/SW-1282 list added ancillaries

* feat(sw-1282): add icon to accordionItem

* feat(sw-1282): list added ancillaries

* Change translation key to already existing

* Remove duplicate key

* Move new files to the new folder structure


Approved-by: Pontus Dreij
 2025-02-27 22:01:11 +00:00
Linus Flood
427cc10edc Merged in fix/gla-remove-unused-prop (pull request #1427) 
fix: guarantee for late arrival prop removed

* fix: guarantee for late arrival prop removed

* Merge master

* Revert typecheck fix


Approved-by: Michael Zetterberg
 2025-02-27 16:18:42 +00: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
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