6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit f0a37f0c
Changed files
.../screens/booking_details/components/check_in_button.dart | 13 ++++++------- .../screens/check_in/pages/check_in_processing_page.dart | 5 +++-- .../screens/pregistration/cubit/preregistration_cubit.dart | 1 + .../screens/pregistration/pages/prereg_address_page.dart | 4 ++-- .../screens/pregistration/pages/prereg_profile_page.dart | 4 ++-- .../profile_settings/components/address_bottom_sheet.dart | 2 +- .../lib/up_sales/components/catalog/service_catalog.dart | 3 +-- comwell_key_app/lib/up_sales/models/room_upgrade_list.dart | 2 +- comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart | 6 +++++- .../lib/up_sales/pages/services_upgrade_page.dart | 7 +++++-- 10 files changed, 27 insertions(+), 20 deletions(-)
Diff
diff --git a/comwell_key_app/lib/presentation/screens/booking_details/components/check_in_button.dart b/comwell_key_app/lib/presentation/screens/booking_details/components/check_in_button.dart
index c8450b52..9a6897bc 100644
--- a/comwell_key_app/lib/presentation/screens/booking_details/components/check_in_button.dart
+++ b/comwell_key_app/lib/presentation/screens/booking_details/components/check_in_button.dart
@@ -13,7 +13,6 @@ class CheckInButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cubit = context.read<BookingDetailsCubit>();
- final hasAddons = cubit.booking.addOnItems?.isNotEmpty ?? false;
return Builder(builder: (context) {
if (!cubit.booking.digitalCard) {
return getPhysicalCardWidget(context);
@@ -23,17 +22,17 @@ class CheckInButton extends StatelessWidget {
}
Widget getDigitalCardWidget(BuildContext context, BookingDetailsCubit cubit) {
- final hasBalance = (cubit.booking.balance ?? 0) > 0;
- final hasAddons = cubit.booking.addOnItems?.isNotEmpty ?? false;
-
return Container(
margin: const EdgeInsets.symmetric(horizontal: 10),
child: ElevatedButton(
onPressed: () async {
if (context.mounted) {
- final result = hasAddons
- ? await context.push(AppRoutes.checkInPayment, extra: cubit.booking)
- : await context.push(AppRoutes.checkIn, extra: [cubit.booking, false]);
+ // Temporary: always skip payment and go directly to the check-in flow.
+ // To re-enable the payment page later, change this line back to:
+ // await context.push(AppRoutes.checkInPayment, extra: cubit.booking)
+ // and restore any conditional logic based on addons/balance.
+ final result =
+ await context.push(AppRoutes.checkIn, extra: [cubit.booking, false]);
if (result == true && !cubit.isClosed) {
cubit.checkInEvent();
}
diff --git a/comwell_key_app/lib/presentation/screens/check_in/pages/check_in_processing_page.dart b/comwell_key_app/lib/presentation/screens/check_in/pages/check_in_processing_page.dart
index ad78c796..0c6dedef 100644
--- a/comwell_key_app/lib/presentation/screens/check_in/pages/check_in_processing_page.dart
+++ b/comwell_key_app/lib/presentation/screens/check_in/pages/check_in_processing_page.dart
@@ -4,6 +4,7 @@ import 'package:comwell_key_app/themes/dark_theme.dart';
import 'package:comwell_key_app/utils/lottie_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
import 'package:lottie/lottie.dart';
class CheckInProcessingPage extends StatefulWidget {
@@ -60,7 +61,7 @@ class _CheckInProcessingPageState extends State<CheckInProcessingPage>
markerEnd: "error",
);
await Future<void>.delayed(const Duration(seconds: 1));
- if (mounted) Navigator.of(context).pop();
+ if (mounted) context.pop();
}
@override
@@ -69,7 +70,7 @@ class _CheckInProcessingPageState extends State<CheckInProcessingPage>
listenWhen: (previous, current) =>
previous.paymentStatus != current.paymentStatus,
listener: (context, state) {
- if (state.paymentStatus == CheckInPaymentStatus.success) {
+ if (state.cardState == CheckInStatus.roomFound) {
playSuccess();
} else if (state.paymentStatus == CheckInPaymentStatus.error) {
playError();
diff --git a/comwell_key_app/lib/presentation/screens/pregistration/cubit/preregistration_cubit.dart b/comwell_key_app/lib/presentation/screens/pregistration/cubit/preregistration_cubit.dart
index 1fdf843c..86784b7e 100644
--- a/comwell_key_app/lib/presentation/screens/pregistration/cubit/preregistration_cubit.dart
+++ b/comwell_key_app/lib/presentation/screens/pregistration/cubit/preregistration_cubit.dart
@@ -164,6 +164,7 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
firstName: firstNameTextController.text,
lastName: lastNameTextController.text,
phoneNumber: phoneNumber,
+ nationality: selectedNationality,
);
emit(state.copyWith(user: updatedUser));
diff --git a/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_address_page.dart b/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_address_page.dart
index 9a2be410..549fc3f1 100644
--- a/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_address_page.dart
+++ b/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_address_page.dart
@@ -83,7 +83,7 @@ class PreregAddressPage extends StatelessWidget {
child: CountryCodePicker(
alignLeft: true,
textOverflow: TextOverflow.visible,
- initialSelection: cubit.selectedNationality,
+ initialSelection: cubit.selectedCountry,
showFlag: false,
favorite: cubit.favoriteCountries,
showDropDownButton: true,
@@ -91,7 +91,7 @@ class PreregAddressPage extends StatelessWidget {
showCountryOnly: true,
showOnlyCountryWhenClosed: true,
onChanged: (CountryCode countryCode) {
- cubit.onNationalitySelected(countryCode);
+ cubit.onSelectedCountrySelected(countryCode.code ?? '');
},
),
),
diff --git a/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_profile_page.dart b/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_profile_page.dart
index dd83d70f..b9fa5ca4 100644
--- a/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_profile_page.dart
+++ b/comwell_key_app/lib/presentation/screens/pregistration/pages/prereg_profile_page.dart
@@ -150,7 +150,7 @@ class PreregProfilePage extends StatelessWidget {
child: CountryCodePicker(
alignLeft: true,
textOverflow: TextOverflow.visible,
- initialSelection: cubit.selectedCountry,
+ initialSelection: cubit.selectedNationality,
showFlag: false,
favorite: cubit.favoriteCountries,
showDropDownButton: true,
@@ -158,7 +158,7 @@ class PreregProfilePage extends StatelessWidget {
showCountryOnly: true,
showOnlyCountryWhenClosed: true,
onChanged: (CountryCode countryCode) {
- cubit.onSelectedCountrySelected(countryCode.code ?? '');
+ cubit.onNationalitySelected(countryCode);
},
),
),
diff --git a/comwell_key_app/lib/presentation/screens/profile_settings/components/address_bottom_sheet.dart b/comwell_key_app/lib/presentation/screens/profile_settings/components/address_bottom_sheet.dart
index ffca60d4..b90de3db 100644
--- a/comwell_key_app/lib/presentation/screens/profile_settings/components/address_bottom_sheet.dart
+++ b/comwell_key_app/lib/presentation/screens/profile_settings/components/address_bottom_sheet.dart
@@ -137,7 +137,7 @@ class _AddressBottomSheetState extends State<AddressBottomSheet> {
alignLeft: true,
textOverflow: TextOverflow.visible,
initialSelection: _selectedCountry,
- showFlag: true,
+ showFlag: false,
favorite: const ['DK', 'SE', 'NO', 'DE'],
showDropDownButton: true,
padding: const EdgeInsets.symmetric(horizontal: 16),
diff --git a/comwell_key_app/lib/up_sales/components/catalog/service_catalog.dart b/comwell_key_app/lib/up_sales/components/catalog/service_catalog.dart
index ffdd679d..f8466dff 100644
--- a/comwell_key_app/lib/up_sales/components/catalog/service_catalog.dart
+++ b/comwell_key_app/lib/up_sales/components/catalog/service_catalog.dart
@@ -17,7 +17,6 @@ class ServiceCatalog extends StatelessWidget {
final Booking booking;
final bool isSinglePurchase;
final BookingDetailsCubit? bookingDetailsCubit;
-
const ServiceCatalog({
super.key,
required this.upSales,
@@ -51,7 +50,7 @@ class ServiceCatalog extends StatelessWidget {
),
);
- if (bookingDetailsCubit != null && isSinglePurchase) {
+ if (bookingDetailsCubit != null && isSinglePurchase && result == false) {
bookingDetailsCubit!.init();
}
diff --git a/comwell_key_app/lib/up_sales/models/room_upgrade_list.dart b/comwell_key_app/lib/up_sales/models/room_upgrade_list.dart
index afe361f0..ea40610f 100644
--- a/comwell_key_app/lib/up_sales/models/room_upgrade_list.dart
+++ b/comwell_key_app/lib/up_sales/models/room_upgrade_list.dart
@@ -8,7 +8,7 @@ class RoomUpgradeList {
final AddOnUpgrade? addOnUpgrade;
final bool isRoomUpgradeSelected;
final bool isSinglePurchase;
-
+
RoomUpgradeList({
required this.booking,
this.roomUpgrade,
diff --git a/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
index cab3c402..e2e4b7ac 100644
--- a/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
@@ -55,7 +55,11 @@ class _AddonUpgradePageState extends State<AddonUpgradePage> {
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.surface,
- appBar: const ComwellAppBar(),
+ appBar: ComwellAppBar(
+ onBackPressed: () {
+ context.pop(true);
+ },
+ ),
extendBodyBehindAppBar: true,
body: Column(
children: [
diff --git a/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
index 250fcd88..3ee83ab7 100644
--- a/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
@@ -13,7 +13,6 @@ import 'package:go_router/go_router.dart';
class ServicesUpgradePage extends StatelessWidget {
final RoomUpgradeList roomUpgradeList;
-
const ServicesUpgradePage({
super.key,
required this.roomUpgradeList,
@@ -32,7 +31,11 @@ class ServicesUpgradePage extends StatelessWidget {
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.surface,
- appBar: const ComwellAppBar(),
+ appBar: ComwellAppBar(
+ onBackPressed: () {
+ context.pop(true);
+ },
+ ),
extendBodyBehindAppBar: true,
body: Column(
children: [