6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 6aad4193
Changed files
.../bloc/booking_details_cubit.dart | 5 +- .../pregistration/cubit/preregistration_cubit.dart | 8 +- .../pregistration/preregistration_flow.dart | 147 +++++++++------------ 3 files changed, 68 insertions(+), 92 deletions(-)
Diff
diff --git a/comwell_key_app/lib/presentation/screens/booking_details/bloc/booking_details_cubit.dart b/comwell_key_app/lib/presentation/screens/booking_details/bloc/booking_details_cubit.dart
index bb08aff3..dd0831dc 100644
--- a/comwell_key_app/lib/presentation/screens/booking_details/bloc/booking_details_cubit.dart
+++ b/comwell_key_app/lib/presentation/screens/booking_details/bloc/booking_details_cubit.dart
@@ -44,12 +44,15 @@ class BookingDetailsCubit extends BaseCubit<BookingDetailsState> {
await getUser();
_startTimer();
await checkIfHouseKeepingOrdered();
- await checkMobileKeys();
+
await getBookingDetails(
booking.confirmationNumber,
hotelCode: booking.hotelCode,
fetchRemote: true,
);
+ if (booking.reservationStatus == ReservationStatus.newreservation) {
+ await getUpSales(fetchRemote: true);
+ }
await updateRemainingTime();
} catch (e) {
if (kDebugMode) print("err=$e");
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 385e8ea8..dcdfd7e1 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
@@ -59,10 +59,6 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
bool _isAnimating = false;
PreregistrationCubit({required this.booking}) : super(const PreregistrationState()) {
- _tracking.trackScreenView(
- "Pre-registration - Betalingskort",
- "/pre-registration/betalingskort",
- );
init();
}
@@ -99,8 +95,8 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
phoneNumber: phoneNumber,
),
);
- } on Exception catch (e) {
- debugPrint("error fetching preregistration: $e");
+ } catch (e, st) {
+ logError(e, st);
emit(state.copyWith(isLoading: false));
}
}
diff --git a/comwell_key_app/lib/presentation/screens/pregistration/preregistration_flow.dart b/comwell_key_app/lib/presentation/screens/pregistration/preregistration_flow.dart
index b0bdd98b..ccb8d416 100644
--- a/comwell_key_app/lib/presentation/screens/pregistration/preregistration_flow.dart
+++ b/comwell_key_app/lib/presentation/screens/pregistration/preregistration_flow.dart
@@ -4,13 +4,9 @@ import 'package:comwell_key_app/presentation/screens/pregistration/cubit/preregi
import 'package:comwell_key_app/presentation/screens/pregistration/cubit/preregistration_cubit.dart';
import 'package:comwell_key_app/presentation/screens/pregistration/utils/utils.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
-import 'package:comwell_key_app/utils/locator.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
-import 'package:payment_plugin/domain/repositories/adyen_repository.dart';
-import 'package:payment_plugin/presentation/app/bloc/payment_cards_cubit.dart';
-import 'package:payment_plugin/presentation/app/bloc/payment_cards_state.dart';
import 'package:comwell_key_app/common/components/shimmer_loader/prereg_flow_shimmer_loader.dart';
class PreregistrationFlow extends StatefulWidget {
@@ -23,91 +19,72 @@ class PreregistrationFlow extends StatefulWidget {
class _PreregistrationFlowState extends State<PreregistrationFlow> {
@override
Widget build(BuildContext context) {
- return BlocProvider<PaymentCardsCubit>(
- create: (context) => PaymentCardsCubit(
- adyenRepository: locator<AdyenRepository>(),
- onPaymentMethodSelected: (paymentMethod) {
- context.read<PreregistrationCubit>().onPaymentMethodSelected(paymentMethod);
- },
- onPaymentMethodValidationError: () {
- context.read<PreregistrationCubit>().onPaymentMethodValidationError();
- },
- initialSelectedPaymentMethod: context
- .read<PreregistrationCubit>()
- .state
- .selectedPaymentMethod,
- ),
- child: BlocBuilder<PaymentCardsCubit, PaymentCardsState>(
- builder: (context, state) {
- return BlocBuilder<PreregistrationCubit, PreregistrationState>(
- builder: (context, state) {
- final cubit = context.read<PreregistrationCubit>();
- return Scaffold(
- backgroundColor: Theme.of(context).colorScheme.surface,
- appBar: ComwellAppBar(
- shouldShowProfileButton: false,
- shouldShowBackButton: true,
- onBackPressed: () {
- if (cubit.currentPage == PreregistrationPage.profile) {
- context.pop();
- } else {
- cubit.onBackClicked();
- }
- },
- ),
- body: Builder(
- builder: (context) {
- if (state.isLoading) {
- return const Center(child: PreregFlowShimmerLoader());
- }
-
- return PageView(
- key: const PageStorageKey("prereg_flow"),
- physics: const NeverScrollableScrollPhysics(),
- controller: cubit.pageController,
- children: PreregistrationPage.getPages(ValueKey(state)).toList(),
- );
- },
- ),
- bottomNavigationBar: Builder(
- builder: (context) {
- if (state.isLoading) return const SizedBox();
- return Column(
- // BOTTOM NAVIGATION
- mainAxisSize: MainAxisSize.min,
- children: [
- const Divider(
- color: Colors.black12,
- height: 0,
- ),
- Row(
- children: [
- Expanded(
- child: Padding(
- padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 40.0),
- child: ElevatedButton(
- onPressed: () {
- cubit.onContinueClicked(context);
- },
- style: ElevatedButton.styleFrom(foregroundColor: colorBackground),
- child: Padding(
- padding: const EdgeInsets.symmetric(vertical: 16.0),
- child: Text(cubit.buttonText(context)),
- ),
- ),
- ),
+ return BlocBuilder<PreregistrationCubit, PreregistrationState>(
+ builder: (context, state) {
+ final cubit = context.read<PreregistrationCubit>();
+ return Scaffold(
+ backgroundColor: Theme.of(context).colorScheme.surface,
+ appBar: ComwellAppBar(
+ shouldShowProfileButton: false,
+ shouldShowBackButton: true,
+ onBackPressed: () {
+ if (cubit.currentPage == PreregistrationPage.profile) {
+ context.pop();
+ } else {
+ cubit.onBackClicked();
+ }
+ },
+ ),
+ body: Builder(
+ builder: (context) {
+ if (state.isLoading) {
+ return const Center(child: PreregFlowShimmerLoader());
+ }
+
+ return PageView(
+ key: const PageStorageKey("prereg_flow"),
+ physics: const NeverScrollableScrollPhysics(),
+ controller: cubit.pageController,
+ children: PreregistrationPage.getPages(ValueKey(state)).toList(),
+ );
+ },
+ ),
+ bottomNavigationBar: Builder(
+ builder: (context) {
+ if (state.isLoading) return const SizedBox();
+ return Column(
+ // BOTTOM NAVIGATION
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Divider(
+ color: Colors.black12,
+ height: 0,
+ ),
+ Row(
+ children: [
+ Expanded(
+ child: Padding(
+ padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 40.0),
+ child: ElevatedButton(
+ onPressed: () {
+ cubit.onContinueClicked(context);
+ },
+ style: ElevatedButton.styleFrom(foregroundColor: colorBackground),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 16.0),
+ child: Text(cubit.buttonText(context)),
),
- ],
+ ),
),
- ],
- );
- },
- ),
+ ),
+ ],
+ ),
+ ],
);
},
- );
- },
- ),
+ ),
+ );
+ },
);
}
}