Amazon payfort hosted payment page integration completed

lib/core/api/api_client.dart

@@ -211,7 +211,7 @@ class ApiClientImp implements ApiClient {
         } 
 
         body['TokenID'] = "@dm!n";
-        body['PatientID'] = 4774598;
+        // body['PatientID'] = 4774598;
         // body['PatientID'] = 89754444;
         // body['PatientTypeID'] = 1;
         // body['PatientOutSA'] = 0;
@@ -260,7 +260,7 @@ class ApiClientImp implements ApiClient {
         body: requestBody,
         headers: headers,
       );
-      log("response: ${response.body.toString()}");
+      // log("response: ${response.body.toString()}");
     } on SocketException catch (e) {
       final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr();
       onFailure(message, -1, failureType: ConnectivityFailure(message));

lib/presentation/appointments/appointment_details_page.dart

@@ -577,7 +577,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                                                         iconColor: AppColors.transparent,
                                                         fit: BoxFit.cover,
                                                         width: double.infinity,
-                                                      ),
+                                                          height: 180.h),
                                                     ),
                                                   ),
                                                   Positioned(

lib/presentation/appointments/appointment_payment_page.dart

@@ -115,8 +115,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h)
+                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 80.h, height: 30.h, fit: BoxFit.contain).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
-                                    .toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
                                 SizedBox(height: 16.h),
                                 LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
                               ],
@@ -328,7 +327,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                                   children: [
                                     Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h),
                                     SizedBox(width: 8.h),
-                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h),
+                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain),
                                   ],
                                 ).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
                                 SizedBox(height: 16.h),

lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart

@@ -86,8 +86,8 @@ class ImmediateLiveCarePaymentDetails extends StatelessWidget {
                                       AppCustomChipWidget(
                                         richText: Row(
                                           children: [
-                                            "${appState.getAuthenticatedUser()!.age} ".toText10(color: AppColors.blackColor, isEnglishOnly: true),
+                                            "${appState.getAuthenticatedUser()!.age} ".toText10(color: AppColors.blackColor, isBold: true),
-                                            LocaleKeys.yearsOld.tr(context: context).toText10(color: AppColors.blackColor),
+                                            LocaleKeys.yearsOld.tr(context: context).toText10(color: AppColors.blackColor, isBold: true),
                                           ],
                                         ),
                                       ),

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -106,7 +106,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h),
+                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h, fit: BoxFit.contain),
                                 SizedBox(height: 16.h),
                                 LocaleKeys.mada.tr(context: context).toText16(isBold: true),
                               ],
@@ -248,7 +248,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                                   children: [
                                     Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h),
                                     SizedBox(width: 8.h),
-                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h),
+                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain),
                                   ],
                                 ),
                                 SizedBox(height: 16.h),

lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart

@@ -116,7 +116,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                             Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: [
-                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h),
+                                Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h, fit: BoxFit.contain),
                                 SizedBox(height: 16.h),
                                 LocaleKeys.mada.tr(context: context).toText16(isBold: true),
                               ],
@@ -135,7 +135,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                             ),
                           ],
                         ).paddingSymmetrical(16.h, 16.h),
-                      ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                      ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "MADA";
                         if (appState.isPaytabsEnabled) {
                           paytabsViewModel.setPaymentConfiguration(
@@ -179,7 +179,66 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                             );
                           });
                         } else {
-                          openPaymentURL("mada");
+                          if (appState.isPayfortHostedPageEnabled) {
+                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.fetchingPaymentInformation.tr(context: context));
+
+                            transID = Utils.getAppointmentTransID(
+                              bookAppointmentsViewModel.selectedDoctor.projectID!,
+                              bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                              bookAppointmentsViewModel.selectedDoctor.doctorID!,
+                            );
+
+                            await payfortViewModel.getPayfortConfigurations(
+                                serviceId: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum(), projectId: bookAppointmentsViewModel.selectedDoctor.projectID!, integrationId: 1);
+
+                            payfortViewModel.initiatePaymentWithCard(
+                              transactionID: transID,
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              onSucceeded: (paymentResult) async {
+                                print("Payment Success Data: ${paymentResult.toString()}");
+                                LoaderBottomSheet.hideLoader();
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
+                                await bookAppointmentsViewModel.insertSpecificAppointmentForWalkIn(onSuccess: (val) async {
+                                  String appointmentNo = val.data['AppointmentNo'].toString();
+                                  await myAppointmentsViewModel.createAdvancePayment(
+                                      paymentMethodName: selectedPaymentMethod,
+                                      projectID: bookAppointmentsViewModel.waitingAppointmentProjectID,
+                                      clinicID: bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                                      appointmentNo: appointmentNo,
+                                      payedAmount: payfortViewModel.payfortCheckPaymentStatusResponseModel!.amount!,
+                                      paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!,
+                                      patientID: appState.getAuthenticatedUser()!.patientId.toString(),
+                                      patientType: appState.getAuthenticatedUser()!.patientType!,
+                                      onSuccess: (value) async {
+                                        print(value);
+                                        await myAppointmentsViewModel.addAdvanceNumberRequest(
+                                            advanceNumber: Utils.isVidaPlusProject(bookAppointmentsViewModel.waitingAppointmentProjectID)
+                                                ? value.data['OnlineCheckInAppointments'][0]['AdvanceNumber_VP'].toString()
+                                                : value.data['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(),
+                                            paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!,
+                                            appointmentNo: appointmentNo,
+                                            onSuccess: (value) async {
+                                              LoaderBottomSheet.hideLoader();
+                                              sendCheckInRequest(bookAppointmentsViewModel.waitingAppointmentNFCCode, appointmentNo, context);
+                                            });
+                                      });
+                                });
+                              },
+                              onFailed: (err) {
+                                print("Payment Failed Data: ${err.toString()}");
+                                showCommonBottomSheetWithoutHeight(
+                                  context,
+                                  child: Utils.getErrorWidget(loadingText: LocaleKeys.paymentFailedPleaseTryAgain.tr(context: context)),
+                                  callBackFunc: () {},
+                                  isFullScreen: false,
+                                  isCloseButtonVisible: true,
+                                );
+                              },
+                            );
+                          } else {
+                            openPaymentURL("mada");
+                          }
                         }
                       }),
                       SizedBox(height: 16.h),
@@ -199,7 +258,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                                   children: [
                                     Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h),
                                     SizedBox(width: 8.h),
-                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h),
+                                    Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain),
                                   ],
                                 ),
                                 SizedBox(height: 16.h),
@@ -220,7 +279,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                             ),
                           ],
                         ).paddingSymmetrical(16.h, 16.h),
-                      ).paddingSymmetrical(24.h, 0.h).onPress(() {
+                      ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "VISA";
                         if (appState.isPaytabsEnabled) {
                           paytabsViewModel.setPaymentConfiguration(
@@ -264,7 +323,66 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                             );
                           });
                         } else {
-                          openPaymentURL("visa");
+                          if (appState.isPayfortHostedPageEnabled) {
+                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.fetchingPaymentInformation.tr(context: context));
+
+                            transID = Utils.getAppointmentTransID(
+                              bookAppointmentsViewModel.selectedDoctor.projectID!,
+                              bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                              bookAppointmentsViewModel.selectedDoctor.doctorID!,
+                            );
+
+                            await payfortViewModel.getPayfortConfigurations(
+                                serviceId: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum(), projectId: bookAppointmentsViewModel.selectedDoctor.projectID!, integrationId: 1);
+
+                            payfortViewModel.initiatePaymentWithCard(
+                              transactionID: transID,
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              onSucceeded: (paymentResult) async {
+                                print("Payment Success Data: ${paymentResult.toString()}");
+                                LoaderBottomSheet.hideLoader();
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
+                                await bookAppointmentsViewModel.insertSpecificAppointmentForWalkIn(onSuccess: (val) async {
+                                  String appointmentNo = val.data['AppointmentNo'].toString();
+                                  await myAppointmentsViewModel.createAdvancePayment(
+                                      paymentMethodName: selectedPaymentMethod,
+                                      projectID: bookAppointmentsViewModel.waitingAppointmentProjectID,
+                                      clinicID: bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                                      appointmentNo: appointmentNo,
+                                      payedAmount: payfortViewModel.payfortCheckPaymentStatusResponseModel!.amount!,
+                                      paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!,
+                                      patientID: appState.getAuthenticatedUser()!.patientId.toString(),
+                                      patientType: appState.getAuthenticatedUser()!.patientType!,
+                                      onSuccess: (value) async {
+                                        print(value);
+                                        await myAppointmentsViewModel.addAdvanceNumberRequest(
+                                            advanceNumber: Utils.isVidaPlusProject(bookAppointmentsViewModel.waitingAppointmentProjectID)
+                                                ? value.data['OnlineCheckInAppointments'][0]['AdvanceNumber_VP'].toString()
+                                                : value.data['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(),
+                                            paymentReference: payfortViewModel.payfortCheckPaymentStatusResponseModel!.fortId!,
+                                            appointmentNo: appointmentNo,
+                                            onSuccess: (value) async {
+                                              LoaderBottomSheet.hideLoader();
+                                              sendCheckInRequest(bookAppointmentsViewModel.waitingAppointmentNFCCode, appointmentNo, context);
+                                            });
+                                      });
+                                });
+                              },
+                              onFailed: (err) {
+                                print("Payment Failed Data: ${err.toString()}");
+                                showCommonBottomSheetWithoutHeight(
+                                  context,
+                                  child: Utils.getErrorWidget(loadingText: LocaleKeys.paymentFailedPleaseTryAgain.tr(context: context)),
+                                  callBackFunc: () {},
+                                  isFullScreen: false,
+                                  isCloseButtonVisible: true,
+                                );
+                              },
+                            );
+                          } else {
+                            openPaymentURL("visa");
+                          }
                         }
                       }),
                       SizedBox(height: 16.h),

lib/presentation/habib_wallet/wallet_payment_confirm_page.dart

@@ -90,7 +90,7 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                           Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h).toShimmer2(isShow: false),
+                              Utils.buildImgWithAssets(icon: AppAssets.mada, width: 72.h, height: 25.h, fit: BoxFit.contain).toShimmer2(isShow: false),
                               SizedBox(height: 16.h),
                               LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: false),
                             ],
@@ -263,7 +263,7 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                                 children: [
                                   Utils.buildImgWithAssets(icon: AppAssets.visa, width: 40.h, height: 40.h),
                                   SizedBox(width: 8.h),
-                                  Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h),
+                                  Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain),
                                 ],
                               ).toShimmer2(isShow: false),
                               SizedBox(height: 16.h),

lib/presentation/todo_section/ancillary_order_payment_page.dart

@@ -109,7 +109,7 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
                               Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Utils.buildImgWithAssets(icon: AppAssets.mada, width: 50.h, height: 50.h),
+                                  Utils.buildImgWithAssets(icon: AppAssets.mada, width: 80.h, height: 30.h, fit: BoxFit.contain),
                                   SizedBox(height: 16.h),
                                   LocaleKeys.mada.tr(context: context).toText16(isBold: true).toShimmer2(isShow: todoVM.isProcessingPayment),
                                 ],
@@ -222,7 +222,7 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
                                     children: [
                                       Utils.buildImgWithAssets(icon: AppAssets.visa, width: 50.h, height: 50.h),
                                       SizedBox(width: 8.h),
-                                      Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h),
+                                      Utils.buildImgWithAssets(icon: AppAssets.mastercard, width: 40.h, height: 40.h, fit: BoxFit.contain),
                                     ],
                                   ).toShimmer2(isShow: todoVM.isProcessingPayment),
                                   SizedBox(height: 16.h),

lib/widgets/image_picker.dart

@@ -79,7 +79,7 @@ class ImageOptions {
           }
         },
         onFilesTap: () async {
-          FilePickerResult? result = await FilePicker.pickFiles(
+          FilePickerResult? result = await FilePicker.platform.pickFiles(
             type: FileType.custom,
             allowedExtensions: [
               'jpg',