From 8ffd7485d6f0c64c195bd0737497be2fa1e10712 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 20 May 2026 11:53:26 +0300 Subject: [PATCH] updates --- lib/core/api_consts.dart | 2 +- .../models/paytabs_transaction_response_model.dart | 12 ++++++------ lib/features/paytabs/paytabs_view_model.dart | 10 +++++++--- .../appointments/appointment_payment_page.dart | 1 + .../livecare/immediate_livecare_payment_page.dart | 1 + .../waiting_appointment_payment_page.dart | 1 + .../er_online_checkin_payment_page.dart | 1 + .../habib_wallet/wallet_payment_confirm_page.dart | 1 + .../todo_section/ancillary_order_payment_page.dart | 1 + 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index bf4ebbed..fa64812f 100644 --- a/lib/core/api_consts.dart +++ b/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 diff --git a/lib/features/paytabs/models/paytabs_transaction_response_model.dart b/lib/features/paytabs/models/paytabs_transaction_response_model.dart index 57d23349..85760132 100644 --- a/lib/features/paytabs/models/paytabs_transaction_response_model.dart +++ b/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; - int? profileId; + dynamic merchantId; + 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; - int? expiryYear; + dynamic expiryMonth; + dynamic expiryYear; String? paymentDescription; String? paymentMethod; diff --git a/lib/features/paytabs/paytabs_view_model.dart b/lib/features/paytabs/paytabs_view_model.dart index f6cfb003..0c610e6f 100644 --- a/lib/features/paytabs/paytabs_view_model.dart +++ b/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(); } diff --git a/lib/presentation/appointments/appointment_payment_page.dart b/lib/presentation/appointments/appointment_payment_page.dart index d909b73a..bae7514c 100644 --- a/lib/presentation/appointments/appointment_payment_page.dart +++ b/lib/presentation/appointments/appointment_payment_page.dart @@ -795,6 +795,7 @@ class _AppointmentPaymentPageState extends State { //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", diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart index 57e17608..e2bb0c17 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart @@ -632,6 +632,7 @@ class _ImmediateLiveCarePaymentPageState extends State //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", diff --git a/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart b/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart index 64d2828b..58840c66 100644 --- a/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart +++ b/lib/presentation/habib_wallet/wallet_payment_confirm_page.dart @@ -389,6 +389,7 @@ class _WalletPaymentConfirmPageState extends State { //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 { diff --git a/lib/presentation/todo_section/ancillary_order_payment_page.dart b/lib/presentation/todo_section/ancillary_order_payment_page.dart index 24ed9fc5..e48adeeb 100644 --- a/lib/presentation/todo_section/ancillary_order_payment_page.dart +++ b/lib/presentation/todo_section/ancillary_order_payment_page.dart @@ -632,6 +632,7 @@ class _AncillaryOrderPaymentPageState extends State { } // Only proceed with Apple Pay if insert was successful if(appState.isPaytabsEnabled) { + selectedPaymentMethod = "VISA"; LoaderBottomSheet.hideLoader(); paytabsViewModel.setPaymentConfiguration( "Ancillary Orders Payment",