updates

lib/core/api_consts.dart

@@ -4,7 +4,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/features/paytabs/models/paytabs_transaction_response_model.dart

@@ -1,5 +1,5 @@
 class PaytabsTransactionResponseModel {
-  int? tranTotal;
+  dynamic tranTotal;
   String? transactionReference;
   String? cartCurrency;
   String? cartDescription;
@@ -13,10 +13,10 @@ class PaytabsTransactionResponseModel {
   bool? isAuthorized;
   String? trace;
   dynamic cartAmount;
-  int? merchantId;
+  dynamic merchantId;
-  int? profileId;
+  dynamic profileId;
   bool? isProcessed;
-  int? serviceId;
+  dynamic serviceId;
   PaymentInfo? paymentInfo;
   bool? isSuccess;
 
@@ -98,8 +98,8 @@ class PaytabsTransactionResponseModel {
 class PaymentInfo {
   String? cardScheme;
   String? cardType;
-  int? expiryMonth;
+  dynamic expiryMonth;
-  int? expiryYear;
+  dynamic expiryYear;
   String? paymentDescription;
   String? paymentMethod;
 

lib/features/paytabs/paytabs_view_model.dart

@@ -3,6 +3,7 @@ import 'package:flutter_paytabs_bridge/BaseBillingShippingInfo.dart';
 import 'package:flutter_paytabs_bridge/IOSThemeConfiguration.dart';
 import 'package:flutter_paytabs_bridge/PaymentSdkConfigurationDetails.dart';
 import 'package:flutter_paytabs_bridge/PaymentSdkLocale.dart';
+import 'package:flutter_paytabs_bridge/PaymentSdkTokenFormat.dart';
 import 'package:flutter_paytabs_bridge/PaymentSdkTokeniseType.dart';
 import 'package:flutter_paytabs_bridge/PaymentSdkTransactionType.dart';
 import 'package:flutter_paytabs_bridge/flutter_paytabs_bridge.dart';
@@ -49,7 +50,8 @@ class PayTabsViewModel extends ChangeNotifier {
             appState.getAuthenticatedUser()!.mobileNumber ?? "0000000000", "Riyadh", "SA", "Riyadh", "Riyadh", "12626"),
         alternativePaymentMethods: [],
         linkBillingNameWithCardHolderName: true,
-        simplifyApplePayValidation: true);
+      simplifyApplePayValidation: true,
+    );
 
     paymentConfiguration.iOSThemeConfigurations = IOSThemeConfigurations(
       // logoImage: "assets/images/png/hmg_logo.png",
@@ -71,9 +73,11 @@ class PayTabsViewModel extends ChangeNotifier {
       placeholderColorDark: "2E3039",
       buttonColor: "ED1C2B",
       buttonColorDark: "ED1C2B",
-      // buttonFont: "Poppins",
+        inputsCornerRadius: 12
-    );
+        // buttonFont: "Poppins",
+        );
     paymentConfiguration.tokeniseType = PaymentSdkTokeniseType.MERCHANT_MANDATORY;
+    paymentConfiguration.tokenFormat = PaymentSdkTokenFormat.Hex32Format;
 
     notifyListeners();
   }

lib/presentation/appointments/appointment_payment_page.dart

@@ -795,6 +795,7 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
     //TODO: Need to pass dynamic params to the Apple Pay instead of static values
     await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) {
       if (appState.isPaytabsEnabled) {
+        selectedPaymentMethod = "VISA";
         LoaderBottomSheet.hideLoader();
         paytabsViewModel.setPaymentConfiguration(
           "Appointment Payment",

lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart

@@ -632,6 +632,7 @@ class _ImmediateLiveCarePaymentPageState extends State<ImmediateLiveCarePaymentP
     //TODO: Need to pass dynamic params to the Apple Pay instead of static values
     await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) {
       if (appState.isPaytabsEnabled) {
+        selectedPaymentMethod = "VISA";
         LoaderBottomSheet.hideLoader();
         paytabsViewModel.setPaymentConfiguration("Advance Payment", num.parse((immediateLiveCareViewModel.liveCareImmediateAppointmentFeesList.total ?? "0.0")));
         paytabsViewModel.startApplePayPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {

lib/presentation/book_appointment/waiting_appointment/waiting_appointment_payment_page.dart

@@ -680,6 +680,7 @@ class _WaitingAppointmentPaymentPageState extends State<WaitingAppointmentPaymen
     //TODO: Need to pass dynamic params to the Apple Pay instead of static values
     await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) {
       if (appState.isPaytabsEnabled) {
+        selectedPaymentMethod = "VISA";
         LoaderBottomSheet.hideLoader();
         paytabsViewModel.setPaymentConfiguration(
           "Appointment Payment",

lib/presentation/emergency_services/er_online_checkin/er_online_checkin_payment_page.dart

@@ -492,6 +492,7 @@ class _ErOnlineCheckinPaymentPageState extends State<ErOnlineCheckinPaymentPage>
     //TODO: Need to pass dynamic params to the Apple Pay instead of static values
     await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) {
       if (appState.isPaytabsEnabled) {
+        selectedPaymentMethod = "VISA";
         LoaderBottomSheet.hideLoader();
         paytabsViewModel.setPaymentConfiguration(
           "ER Online Check-In Payment",

lib/presentation/habib_wallet/wallet_payment_confirm_page.dart

@@ -389,6 +389,7 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
     //TODO: Need to pass dynamic params to the Apple Pay instead of static values
     await payfortViewModel.applePayRequestInsert(applePayInsertRequest: applePayInsertRequest).then((value) {
       if(appState.isPaytabsEnabled) {
+        selectedPaymentMethod = "VISA";
         LoaderBottomSheet.hideLoader();
         paytabsViewModel.setPaymentConfiguration("Advance Payment", habibWalletVM.walletRechargeAmount);
         paytabsViewModel.startApplePayPayment(onSuccess: (PaytabsTransactionResponseModel transactionData) async {

lib/presentation/todo_section/ancillary_order_payment_page.dart

@@ -632,6 +632,7 @@ class _AncillaryOrderPaymentPageState extends State<AncillaryOrderPaymentPage> {
     }
     // Only proceed with Apple Pay if insert was successful
     if(appState.isPaytabsEnabled) {
+      selectedPaymentMethod = "VISA";
       LoaderBottomSheet.hideLoader();
       paytabsViewModel.setPaymentConfiguration(
         "Ancillary Orders Payment",