6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit a922aa16
Changed files
.../pregistration/cubit/preregistration_cubit.dart | 27 +++++++++++++++------- .../pregistration/prereg_request_model.dart | 6 ++--- 2 files changed, 22 insertions(+), 11 deletions(-)
Diff
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 950e8dcf..d44d7a2f 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
@@ -46,7 +46,7 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
final commentTextController = TextEditingController();
CountryCode? countryCode;
-
+
String? phoneNumber;
final List<String> favoriteCountries = ['DK', 'SE', 'NO', 'FI'];
@@ -88,7 +88,7 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
booking.confirmationNumber,
booking.hotelCode,
);
-
+
safeEmit(
state.copyWith(
isLoading: false,
@@ -223,10 +223,17 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
try {
// Build the PreregRequestModel with all required fields
final String? sendIdType = isFavoriteCountry ? null : selectedDocumentType.code;
- final String? sendRoomType = state.selectedRoomUpgrade.isNotEmpty ? state.selectedRoomUpgrade : null;
- final List<AddOnListDto>? sendAddOnList = numOfExtras > 0 ? selectedAddOnUpgrades
- .map((e) => AddOnListDto(itemCode: e.id, quantity: e.quantity))
- .toList() : null;
+ final String? sendRoomType = state.selectedRoomUpgrade.isNotEmpty
+ ? state.selectedRoomUpgrade
+ : null;
+ final List<AddOnListDto>? sendAddOnList = numOfExtras > 0
+ ? selectedAddOnUpgrades
+ .map((e) => AddOnListDto(itemCode: e.id, quantity: e.quantity))
+ .toList()
+ : null;
+ final String? sendArrivalTime = state.servingTime.toString().isNotEmpty
+ ? state.servingTime?.toString()
+ : null;
final preregRequest = PreregRequestDto(
firstName: state.user!.firstName,
@@ -243,7 +250,7 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
idType: sendIdType,
idNumber: documentNumberTextController.text,
idCountry: selectedNationality,
- servingTime: state.servingTime?.toString() ?? '',
+ arrivalTime: sendArrivalTime,
comment: commentTextController.text,
hotelCode: booking.hotelCode,
roomType: sendRoomType,
@@ -469,7 +476,11 @@ class PreregistrationCubit extends BaseCubit<PreregistrationState> {
final updatedAddOnUpgrades = state.addOnUpgrades.toList();
final index = updatedAddOnUpgrades.indexWhere((e) => e.id == updatedUpgrade.id);
updatedAddOnUpgrades[index] = updatedUpgrade;
- safeEmit(state.copyWith(addOnUpgrades: updatedAddOnUpgrades,));
+ safeEmit(
+ state.copyWith(
+ addOnUpgrades: updatedAddOnUpgrades,
+ ),
+ );
}
}
diff --git a/comwell_key_app/lib/presentation/screens/pregistration/prereg_request_model.dart b/comwell_key_app/lib/presentation/screens/pregistration/prereg_request_model.dart
index 60bf9a16..2ecbcfdb 100644
--- a/comwell_key_app/lib/presentation/screens/pregistration/prereg_request_model.dart
+++ b/comwell_key_app/lib/presentation/screens/pregistration/prereg_request_model.dart
@@ -39,7 +39,7 @@ class PreregRequestDto {
final String country;
final String nationality;
final String confirmationNumber;
- final String servingTime;
+ final String? arrivalTime;
final String? idType;
final String? idNumber;
final String? idCountry;
@@ -62,7 +62,7 @@ class PreregRequestDto {
this.idType,
this.idNumber,
this.idCountry,
- required this.servingTime,
+ this.arrivalTime,
required this.comment,
required this.hotelCode,
this.roomType,
@@ -85,7 +85,7 @@ class PreregRequestDto {
if (idType != null) 'idType': idType,
if (idNumber != null) 'idNumber': idNumber,
'idCountry': idCountry,
- 'arrivalTime': servingTime,
+ 'arrivalTime': arrivalTime,
'comment': comment,
'hotelCode': hotelCode,
if (roomType != null) 'roomType': roomType,