Payment request & response insert implemented in paytabs.

lib/core/api_consts.dart

@@ -5,7 +5,7 @@ import 'package:hmg_patient_app_new/core/enums.dart';
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 

lib/core/dependencies.dart

@@ -369,7 +369,11 @@ class AppDependencies {
           errorHandlerService: getIt(),
         ));
 
-    getIt.registerLazySingleton<PayTabsViewModel>(() => PayTabsViewModel(appState: getIt()));
+    getIt.registerLazySingleton<PayTabsViewModel>(() => PayTabsViewModel(
+          appState: getIt(),
+          payfortRepo: getIt(),
+          errorHandlerService: getIt(),
+        ));
 
     getIt.registerLazySingleton<ClarityService>(
       () => ClarityService(appState: getIt.get<AppState>()),

lib/features/paytabs/paytabs_view_model.dart

@@ -11,17 +11,29 @@ import 'package:flutter_paytabs_bridge/PaymentSdkTransactionType.dart';
 import 'package:flutter_paytabs_bridge/flutter_paytabs_bridge.dart';
 import 'package:hmg_patient_app_new/core/api_consts.dart';
 import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/cache_consts.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
 import 'package:hmg_patient_app_new/core/paytabs_config.dart';
+import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/features/paytabs/models/paytabs_transaction_response_model.dart';
+import 'package:hmg_patient_app_new/features/payfort/models/payfort_request_insert_model.dart';
+import 'package:hmg_patient_app_new/features/payfort/models/payfort_response_insert_model.dart';
+import 'package:hmg_patient_app_new/features/payfort/payfort_repo.dart';
+import 'package:hmg_patient_app_new/services/error_handler_service.dart';
+import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
 
 class PayTabsViewModel extends ChangeNotifier {
   late PaymentSdkConfigurationDetails paymentConfiguration;
   final AppState appState;
+  final PayfortRepo payfortRepo;
+  final ErrorHandlerService errorHandlerService;
   late PaytabsTransactionResponseModel paytabsTransactionResponseModel;
 
   PayTabsViewModel({
     required this.appState,
+    required this.payfortRepo,
+    required this.errorHandlerService,
   });
 
   setPaymentConfiguration(String paymentDescription, num amount, {bool isAddCard = false}) {
@@ -152,6 +164,42 @@ class PayTabsViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
+  Future<void> paytabsRequestInsert({required PayfortRequestInsertModel payfortRequestInsertModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await payfortRepo.payfortRequestInsert(payfortRequestInsertModel: payfortRequestInsertModel);
+
+    result.fold(
+      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (apiResponse) {
+        if (apiResponse.messageStatus == 2) {
+          // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
+        } else if (apiResponse.messageStatus == 1) {
+          notifyListeners();
+          if (onSuccess != null) {
+            onSuccess(apiResponse);
+          }
+        }
+      },
+    );
+  }
+
+  Future<void> paytabsResponseInsert({required PayfortResponseInsertModel payfortResponseInsertModel, Function(dynamic)? onSuccess, Function(String)? onError}) async {
+    final result = await payfortRepo.payfortResponseInsert(payfortResponseInsertModel: payfortResponseInsertModel);
+
+    result.fold(
+      (failure) async => await errorHandlerService.handleError(failure: failure),
+      (apiResponse) {
+        if (apiResponse.messageStatus == 2) {
+          // dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
+        } else if (apiResponse.messageStatus == 1) {
+          notifyListeners();
+          if (onSuccess != null) {
+            onSuccess(apiResponse);
+          }
+        }
+      },
+    );
+  }
+
   startApplePayPayment({Function(PaytabsTransactionResponseModel)? onSuccess, Function(String)? onError}) async {
     bool _callbackFired = false; // prevent duplicate callback invocations
 
@@ -189,41 +237,132 @@ class PayTabsViewModel extends ChangeNotifier {
     });
   }
 
-  startCardPayment({Function(PaytabsTransactionResponseModel)? onSuccess, Function(String)? onError}) {
+  startCardPayment({
+    required String paymentOption,
+    required String liveServiceID,
+    required String isScheduleLiveCare,
+    required String appointmentDate,
+    required String appointmentNo,
+    required String doctorID,
+    required String transactionID,
+    required String amount,
+    required String fileNumber,
+    required String orderDescription,
+    required String serviceID,
+    required String projectID,
+    Function(PaytabsTransactionResponseModel)? onSuccess,
+    Function(String)? onError,
+  }) async {
     bool _callbackFired = false; // prevent duplicate callback invocations
 
-    FlutterPaytabsBridge.startCardPayment(paymentConfiguration, (event) {
+    try {
-      if (_callbackFired) return; // ignore any subsequent callback calls
+      LoaderBottomSheet.showLoader();
 
-      final transactionDetails = event["data"] as Map<Object?, Object?>?;
+      // Create PayfortRequestInsertModel (same as Payfort implementation)
-      if (event["status"] == "success") {
+      PayfortRequestInsertModel payfortRequestInsertModel = PayfortRequestInsertModel();
-        _callbackFired = true;
+
-        // Cast Map<Object?, Object?> to Map<String, dynamic>
+      payfortRequestInsertModel.commandType = "SALE";
-        final data = Map<String, dynamic>.from(event["data"] as Map);
+      payfortRequestInsertModel.amount = num.parse(amount);
-        paytabsTransactionResponseModel = PaytabsTransactionResponseModel.fromJson(data);
+      payfortRequestInsertModel.customerEmail = getIt.get<AppState>().getAuthenticatedUser()!.emailAddress;
-        if (paytabsTransactionResponseModel.isSuccess!) {
+      payfortRequestInsertModel.orderDescription = orderDescription;
-          onSuccess!(paytabsTransactionResponseModel);
+      payfortRequestInsertModel.serviceID = serviceID;
-        } else {
+      payfortRequestInsertModel.paymentOption = paymentOption;
-          // Transaction was processed but failed
+      payfortRequestInsertModel.clientRequestID = transactionID;
-          final reason =
+      payfortRequestInsertModel.projectID = projectID;
-              transactionDetails?["payResponseReturn"] ?? transactionDetails?["responseMessage"] ?? transactionDetails?["message"] ?? "Unknown error";
+      payfortRequestInsertModel.fileNumber = getIt.get<AppState>().getAuthenticatedUser()!.patientId.toString();
-          final responseCode = transactionDetails?["responseCode"] ?? "";
+      payfortRequestInsertModel.customerName = "${getIt.get<AppState>().getAuthenticatedUser()!.firstName} ${getIt.get<AppState>().getAuthenticatedUser()!.lastName}";
-          final errorMessage =
+      payfortRequestInsertModel.currency = getIt.get<AppState>().getAuthenticatedUser()!.outSa! == 0 ? "SAR" : "AED";
-              responseCode.toString().isNotEmpty ? "Transaction failed (Code: $responseCode): $reason" : "Transaction failed: $reason";
+      payfortRequestInsertModel.liveServiceID = liveServiceID;
-          onError!(errorMessage);
+      payfortRequestInsertModel.latitude = getIt.get<AppState>().userLat.toString();
+      payfortRequestInsertModel.longitude = getIt.get<AppState>().userLong.toString();
+      payfortRequestInsertModel.merchantReference = transactionID;
+      payfortRequestInsertModel.deviceToken = await Utils.getStringFromPrefs(CacheConst.pushToken);
+      payfortRequestInsertModel.language = getIt.get<AppState>().isArabic() ? "ar" : "en";
+      payfortRequestInsertModel.integrationId = "2"; // PayTabs integration ID
+      payfortRequestInsertModel.isSchedule = isScheduleLiveCare;
+      payfortRequestInsertModel.appointmentDate = appointmentDate;
+      payfortRequestInsertModel.appointmentNo = appointmentNo;
+      payfortRequestInsertModel.doctorID = doctorID;
+
+      // Call request insert API before payment
+      await paytabsRequestInsert(payfortRequestInsertModel: payfortRequestInsertModel);
+
+      LoaderBottomSheet.hideLoader();
+
+      // Start PayTabs payment
+      FlutterPaytabsBridge.startCardPayment(paymentConfiguration, (event) async {
+        if (_callbackFired) return; // ignore any subsequent callback calls
+
+        final transactionDetails = event["data"] as Map<Object?, Object?>?;
+        if (event["status"] == "success") {
+          _callbackFired = true;
+
+          LoaderBottomSheet.showLoader();
+
+          // Cast Map<Object?, Object?> to Map<String, dynamic>
+          final data = Map<String, dynamic>.from(event["data"] as Map);
+          paytabsTransactionResponseModel = PaytabsTransactionResponseModel.fromJson(data);
+
+          // Create PayfortResponseInsertModel (same as Payfort implementation)
+          PayfortResponseInsertModel payfortResponseInsertModel = PayfortResponseInsertModel();
+
+          payfortResponseInsertModel.fortId = paytabsTransactionResponseModel.transactionReference ?? "";
+          payfortResponseInsertModel.commandType = paytabsTransactionResponseModel.transactionType ?? "SALE";
+          // payfortResponseInsertModel.amount = paytabsTransactionResponseModel.tranTotal ?? 0;
+          payfortResponseInsertModel.amount = num.parse(amount);
+          payfortResponseInsertModel.sadadOLP = "";
+          payfortResponseInsertModel.paymentOption = paytabsTransactionResponseModel.paymentInfo?.paymentMethod ?? "";
+          payfortResponseInsertModel.customerIP = "";
+          payfortResponseInsertModel.eCI = "";
+          payfortResponseInsertModel.responseMessage = paytabsTransactionResponseModel.payResponseReturn ?? "";
+          payfortResponseInsertModel.cardNumber = paytabsTransactionResponseModel.paymentInfo!.paymentDescription;
+          payfortResponseInsertModel.cardBin = "";
+          payfortResponseInsertModel.installmentsNumber = 0;
+          payfortResponseInsertModel.status = paytabsTransactionResponseModel.isSuccess! ? "success" : "failed";
+          payfortResponseInsertModel.merchantRef = transactionID;
+          payfortResponseInsertModel.isRefund = false;
+          payfortResponseInsertModel.remmeberMe = true;
+          payfortResponseInsertModel.reconciliationReference = "";
+
+          // Call response insert API after payment
+          await paytabsResponseInsert(payfortResponseInsertModel: payfortResponseInsertModel);
+
+          LoaderBottomSheet.hideLoader();
+
+          if (paytabsTransactionResponseModel.isSuccess!) {
+            if (onSuccess != null) {
+              onSuccess(paytabsTransactionResponseModel);
+            }
+          } else {
+            // Transaction was processed but failed
+            final reason = transactionDetails?["payResponseReturn"] ?? transactionDetails?["responseMessage"] ?? transactionDetails?["message"] ?? "Unknown error";
+            final responseCode = transactionDetails?["responseCode"] ?? "";
+            final errorMessage = responseCode.toString().isNotEmpty ? "Transaction failed (Code: $responseCode): $reason" : "Transaction failed: $reason";
+            if (onError != null) {
+              onError(errorMessage);
+            }
+          }
+        } else if (event["status"] == "error") {
+          _callbackFired = true;
+          final errorMessage = event["message"] ?? "An error occurred";
+          debugPrint("Error occurred in transaction: $errorMessage");
+          debugPrint("Full error event: $event");
+          if (onError != null) {
+            onError(errorMessage);
+          }
+        } else if (event["status"] == "event") {
+          // Intermediate SDK events – do NOT mark _callbackFired, just log
+          final eventMessage = event["message"] ?? "Event occurred";
+          debugPrint("Event occurred: $eventMessage");
         }
-      } else if (event["status"] == "error") {
+      });
-        _callbackFired = true;
+    } catch (error) {
-        final errorMessage = event["message"] ?? "An error occurred";
+      debugPrint("PayTabs Payment Error: $error");
-        debugPrint("Error occurred in transaction: $errorMessage");
+      LoaderBottomSheet.hideLoader();
-        debugPrint("Full error event: $event");
+      if (onError != null) {
-        onError!(errorMessage);
+        onError("Payment initialization failed: $error");
-      } else if (event["status"] == "event") {
-        // Intermediate SDK events – do NOT mark _callbackFired, just log
-        final eventMessage = event["message"] ?? "Event occurred";
-        debugPrint("Event occurred: $eventMessage");
       }
-    });
+    }
   }
 
   startAlternatePayment({Function(PaytabsTransactionResponseModel)? onSuccess, Function(String)? onError}) {

lib/presentation/appointments/appointment_payment_page.dart

@@ -139,12 +139,30 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "MADA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            widget.patientAppointmentHistoryResponseModel.projectID,
+                            widget.patientAppointmentHistoryResponseModel.clinicID,
+                            widget.patientAppointmentHistoryResponseModel.appointmentNo,
+                          );
                           paytabsViewModel.setPaymentConfiguration(
                             "Appointment Payment",
                             num.parse(myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString()),
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
-                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: "0",
+                              isScheduleLiveCare: widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false",
+                              appointmentDate: widget.patientAppointmentHistoryResponseModel.appointmentDate!,
+                              appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+                              doctorID: widget.patientAppointmentHistoryResponseModel.doctorID.toString(),
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "Appointment Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: widget.patientAppointmentHistoryResponseModel.projectID.toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
                             await myAppointmentsViewModel.createAdvancePayment(
                                 paymentMethodName: selectedPaymentMethod,
                                 projectID: widget.patientAppointmentHistoryResponseModel.projectID,
@@ -362,12 +380,30 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "VISA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            widget.patientAppointmentHistoryResponseModel.projectID,
+                            widget.patientAppointmentHistoryResponseModel.clinicID,
+                            widget.patientAppointmentHistoryResponseModel.appointmentNo,
+                          );
                           paytabsViewModel.setPaymentConfiguration(
                             "Appointment Payment",
                             num.parse(myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString()),
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
-                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: "0",
+                              isScheduleLiveCare: widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false",
+                              appointmentDate: widget.patientAppointmentHistoryResponseModel.appointmentDate!,
+                              appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
+                              doctorID: widget.patientAppointmentHistoryResponseModel.doctorID.toString(),
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "Appointment Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: widget.patientAppointmentHistoryResponseModel.projectID.toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context));
                             await myAppointmentsViewModel.createAdvancePayment(
                                 paymentMethodName: selectedPaymentMethod,
                                 projectID: widget.patientAppointmentHistoryResponseModel.projectID,

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -130,11 +130,29 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "MADA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID!,
+                            ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12,
+                            DateTime.now().millisecondsSinceEpoch,
+                          );
                           paytabsViewModel.setPaymentConfiguration(
                             "LiveCare Payment",
                             num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0"),
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID.toString(),
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: "0",
+                              doctorID: "0",
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "LiveCare Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12).toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
                             LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
                             await immediateLiveCareViewModel.addNewCallRequestForImmediateLiveCare(transactionData.transactionReference!);
                             await immediateLiveCareViewModel.getPatientLiveCareHistory();
@@ -281,11 +299,29 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "VISA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID!,
+                            ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12,
+                            DateTime.now().millisecondsSinceEpoch,
+                          );
                           paytabsViewModel.setPaymentConfiguration(
                             "LiveCare Payment",
                             num.parse(immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0"),
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: immediateLiveCareViewModel.immediateLiveCareSelectedClinic.serviceID.toString(),
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: "0",
+                              doctorID: "0",
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "LiveCare Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: (ApiConsts.appEnvironmentType == AppEnvironmentTypeEnum.uat ? 15 : 12).toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
                             LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr());
                             await immediateLiveCareViewModel.addNewCallRequestForImmediateLiveCare(transactionData.transactionReference!);
                             await immediateLiveCareViewModel.getPatientLiveCareHistory();

lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart

@@ -138,12 +138,30 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "MADA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            bookAppointmentsViewModel.selectedDoctor.projectID!,
+                            bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                            bookAppointmentsViewModel.selectedDoctor.doctorID!,
+                          );
                           paytabsViewModel.setPaymentConfiguration(
                             "Appointment Payment",
                             bookAppointmentsViewModel.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!,
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
-                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: "0",
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: DateTime.now().millisecondsSinceEpoch.toString(),
+                              doctorID: bookAppointmentsViewModel.selectedDoctor.doctorID.toString(),
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "Appointment Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: bookAppointmentsViewModel.selectedDoctor.projectID.toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
                             await bookAppointmentsViewModel.insertSpecificAppointmentForWalkIn(onSuccess: (val) async {
                               String appointmentNo = val.data['AppointmentNo'].toString();
                               await myAppointmentsViewModel.createAdvancePayment(
@@ -289,12 +307,31 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
                       ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                         selectedPaymentMethod = "VISA";
                         if (appState.isPaytabsEnabled) {
+                          transID = Utils.getAppointmentTransID(
+                            bookAppointmentsViewModel.selectedDoctor.projectID!,
+                            bookAppointmentsViewModel.selectedDoctor.clinicID!,
+                            bookAppointmentsViewModel.selectedDoctor.doctorID!,
+                          );
+
                           paytabsViewModel.setPaymentConfiguration(
                             "Appointment Payment",
                             bookAppointmentsViewModel.patientWalkInAppointmentShareResponseModel!.patientShareWithTax!,
                           );
-                          paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                          paytabsViewModel.startCardPayment(
-                            LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
+                              paymentOption: selectedPaymentMethod,
+                              liveServiceID: "0",
+                              isScheduleLiveCare: "false",
+                              appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                              appointmentNo: DateTime.now().millisecondsSinceEpoch.toString(),
+                              doctorID: bookAppointmentsViewModel.selectedDoctor.doctorID.toString(),
+                              transactionID: transID,
+                              amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),
+                              fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                              orderDescription: "Appointment Payment",
+                              serviceID: ServiceTypeEnum.appointmentPayment.getIdFromServiceEnum().toString(),
+                              projectID: bookAppointmentsViewModel.selectedDoctor.projectID.toString(),
+                              onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                                LoaderBottomSheet.showLoader(loadingText: LocaleKeys.bookingWaitingAppointment.tr(context: context));
                             await bookAppointmentsViewModel.insertSpecificAppointmentForWalkIn(onSuccess: (val) async {
                               String appointmentNo = val.data['AppointmentNo'].toString();
                               await myAppointmentsViewModel.createAdvancePayment(

lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart

@@ -124,12 +124,29 @@ class _ErOnlineCheckinPaymentPageState extends State<ErOnlineCheckinPaymentPage>
                     ).paddingSymmetrical(24.h, 0.h).onPress(() {
                       selectedPaymentMethod = "MADA";
                       if (appState.isPaytabsEnabled) {
+                        transID = Utils.getAdvancePaymentTransID(
+                          emergencyServicesViewModel.selectedHospital!.iD,
+                          appState.getAuthenticatedUser()!.patientId!,
+                        );
                         paytabsViewModel.setPaymentConfiguration(
                           "ER Online Check-In Payment",
                           emergencyServicesViewModel.erOnlineCheckInPaymentDetailsResponse.patientShareWithTax!,
                         );
-                        paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                        paytabsViewModel.startCardPayment(
-                          if (emergencyServicesViewModel.isERBookAppointment) {
+                            paymentOption: selectedPaymentMethod,
+                            liveServiceID: "0",
+                            isScheduleLiveCare: "0",
+                            appointmentDate: "",
+                            appointmentNo: "0",
+                            doctorID: "0",
+                            transactionID: transID,
+                            amount: emergencyServicesViewModel.erOnlineCheckInPaymentDetailsResponse.patientShareWithTax!.toString(),
+                            fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                            orderDescription: "ER Online Check-In Payment",
+                            serviceID: ServiceTypeEnum.erOnlineCheckIn.getIdFromServiceEnum().toString(),
+                            projectID: emergencyServicesViewModel.selectedHospital!.iD.toString(),
+                            onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              if (emergencyServicesViewModel.isERBookAppointment) {
                             await emergencyServicesViewModel.ER_CreateAdvancePayment(
                                 paymentMethodName: selectedPaymentMethod,
                                 paymentReference: transactionData.transactionReference!,
@@ -214,12 +231,29 @@ class _ErOnlineCheckinPaymentPageState extends State<ErOnlineCheckinPaymentPage>
                     ).paddingSymmetrical(24.h, 0.h).onPress(() {
                       selectedPaymentMethod = "VISA";
                       if (appState.isPaytabsEnabled) {
+                        transID = Utils.getAdvancePaymentTransID(
+                          emergencyServicesViewModel.selectedHospital!.iD,
+                          appState.getAuthenticatedUser()!.patientId!,
+                        );
                         paytabsViewModel.setPaymentConfiguration(
                           "ER Online Check-In Payment",
                           emergencyServicesViewModel.erOnlineCheckInPaymentDetailsResponse.patientShareWithTax!,
                         );
-                        paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                        paytabsViewModel.startCardPayment(
-                          if (emergencyServicesViewModel.isERBookAppointment) {
+                            paymentOption: selectedPaymentMethod,
+                            liveServiceID: "0",
+                            isScheduleLiveCare: "0",
+                            appointmentDate: "",
+                            appointmentNo: "0",
+                            doctorID: "0",
+                            transactionID: transID,
+                            amount: emergencyServicesViewModel.erOnlineCheckInPaymentDetailsResponse.patientShareWithTax!.toString(),
+                            fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
+                            orderDescription: "ER Online Check-In Payment",
+                            serviceID: ServiceTypeEnum.erOnlineCheckIn.getIdFromServiceEnum().toString(),
+                            projectID: emergencyServicesViewModel.selectedHospital!.iD.toString(),
+                            onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              if (emergencyServicesViewModel.isERBookAppointment) {
                             await emergencyServicesViewModel.ER_CreateAdvancePayment(
                                 paymentMethodName: selectedPaymentMethod,
                                 paymentReference: transactionData.transactionReference!,

lib/presentation/habib_wallet/wallet_payment_confirm_page.dart

@@ -113,9 +113,23 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                     ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                       selectedPaymentMethod = "MADA";
                       if (appState.isPaytabsEnabled) {
+                        transID = Utils.getAdvancePaymentTransID(habibWalletVM.selectedHospital!.iD!, int.parse(habibWalletVM.fileNumber));
                         paytabsViewModel.setPaymentConfiguration("Advance Payment", habibWalletVM.walletRechargeAmount);
-                        paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                        paytabsViewModel.startCardPayment(
-                          LoaderBottomSheet.showLoader();
+                            paymentOption: selectedPaymentMethod,
+                            liveServiceID: "0",
+                            isScheduleLiveCare: "false",
+                            appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                            appointmentNo: "0",
+                            doctorID: "0",
+                            transactionID: transID,
+                            amount: habibWalletVM.walletRechargeAmount.toString(),
+                            fileNumber: habibWalletVM.fileNumber.toString(),
+                            orderDescription: "Advance Payment",
+                            serviceID: ServiceTypeEnum.advancePayment.getIdFromServiceEnum().toString(),
+                            projectID: habibWalletVM.selectedHospital!.iD!.toString(),
+                            onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              LoaderBottomSheet.showLoader();
                           await habibWalletVM.HISCreateAdvancePayment(
                               paymentMethodName: selectedPaymentMethod,
                               paidAmount: habibWalletVM.walletRechargeAmount,
@@ -295,9 +309,23 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                     ).paddingSymmetrical(24.h, 0.h).onPress(() async {
                       selectedPaymentMethod = "VISA";
                       if (appState.isPaytabsEnabled) {
+                        transID = Utils.getAdvancePaymentTransID(habibWalletVM.selectedHospital!.iD!, int.parse(habibWalletVM.fileNumber));
                         paytabsViewModel.setPaymentConfiguration("Advance Payment", habibWalletVM.walletRechargeAmount);
-                        paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                        paytabsViewModel.startCardPayment(
-                          LoaderBottomSheet.showLoader();
+                            paymentOption: selectedPaymentMethod,
+                            liveServiceID: "0",
+                            isScheduleLiveCare: "false",
+                            appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                            appointmentNo: "0",
+                            doctorID: "0",
+                            transactionID: transID,
+                            amount: habibWalletVM.walletRechargeAmount.toString(),
+                            fileNumber: habibWalletVM.fileNumber.toString(),
+                            orderDescription: "Advance Payment",
+                            serviceID: ServiceTypeEnum.advancePayment.getIdFromServiceEnum().toString(),
+                            projectID: habibWalletVM.selectedHospital!.iD!.toString(),
+                            onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              LoaderBottomSheet.showLoader();
                           await habibWalletVM.HISCreateAdvancePayment(
                               paymentMethodName: selectedPaymentMethod,
                               paidAmount: habibWalletVM.walletRechargeAmount,

lib/presentation/todo_section/ancillary_order_payment_page.dart

@@ -132,12 +132,29 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
                           if (!todoVM.isProcessingPayment) {
                             selectedPaymentMethod = "MADA";
                             if (appState.isPaytabsEnabled) {
+                              transID = Utils.getAdvancePaymentTransID(
+                                widget.projectID,
+                                appState.getAuthenticatedUser()!.patientId!,
+                              );
                               paytabsViewModel.setPaymentConfiguration(
                                 "Ancillary Orders Payment",
                                 widget.totalAmount,
                               );
-                              paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              paytabsViewModel.startCardPayment(
-                                final paymentAmount = widget.totalAmount;
+                                  paymentOption: selectedPaymentMethod,
+                                  liveServiceID: "0",
+                                  isScheduleLiveCare: "false",
+                                  appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                                  appointmentNo: "0",
+                                  doctorID: "0",
+                                  transactionID: transID,
+                                  amount: widget.totalAmount.toString(),
+                                  fileNumber: appState.getAuthenticatedUser()!.patientId!.toString(),
+                                  orderDescription: "Ancillary Orders Payment",
+                                  serviceID: ServiceTypeEnum.advancePayment.getIdFromServiceEnum().toString(),
+                                  projectID: widget.projectID.toString(),
+                                  onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                                    final paymentAmount = widget.totalAmount;
                                 final fortId = transactionData.transactionReference;
                                 final paymentMethod = selectedPaymentMethod;
 
@@ -254,11 +271,27 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
                           if (!todoVM.isProcessingPayment) {
                             selectedPaymentMethod = "VISA";
                             if (appState.isPaytabsEnabled) {
+                              transID = Utils.getAdvancePaymentTransID(
+                                widget.projectID,
+                                appState.getAuthenticatedUser()!.patientId!,
+                              );
                               paytabsViewModel.setPaymentConfiguration(
                                 "Ancillary Orders Payment",
                                 widget.totalAmount,
                               );
-                              paytabsViewModel.startCardPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {
+                              paytabsViewModel.startCardPayment(paymentOption: selectedPaymentMethod,
+                                  liveServiceID: "0",
+                                  isScheduleLiveCare: "false",
+                                  appointmentDate: DateUtil.convertDateToString(DateTime.now()),
+                                  appointmentNo: "0",
+                                  doctorID: "0",
+                                  transactionID: transID,
+                                  amount: widget.totalAmount.toString(),
+                                  fileNumber: appState.getAuthenticatedUser()!.patientId!.toString(),
+                                  orderDescription: "Ancillary Orders Payment",
+                                  serviceID: ServiceTypeEnum.advancePayment.getIdFromServiceEnum().toString(),
+                                  projectID: widget.projectID.toString(),
+                                  onSuccess: (PaytabsTransactionResponseModel transactionData) async {
                                 final paymentAmount = widget.totalAmount;
                                 final fortId = transactionData.transactionReference;
                                 final paymentMethod = selectedPaymentMethod;