From c774109abc0cc137435e5a4aefe94867f838e70d Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 7 Oct 2026 14:34:15 +0300 Subject: [PATCH 1/2] Update to stores, VersionID 21.6 --- lib/core/api_consts.dart | 4 +--- lib/features/occasion_theme/occasion_config_model.dart | 5 ++--- lib/widgets/in_app_browser/InAppBrowser.dart | 2 ++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index 3cac224b..72a97884 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -316,10 +316,8 @@ class ApiConsts { static String googleCloudStorageENTranslationFileBaseURL = "https://storage.googleapis.com/hmg-patientapp-translations"; // ************ static values for Api **************** - // static final double appVersionID = 21.9; - static final double appVersionID = 21.5; + static final double appVersionID = 21.6; - // static final double appVersionID = 50.7; static final int appChannelId = 3; static final String appIpAddress = "10.20.10.20"; static final String appGeneralId = "Cs2020@2016\$2958"; diff --git a/lib/features/occasion_theme/occasion_config_model.dart b/lib/features/occasion_theme/occasion_config_model.dart index 354ca5f3..26ddf733 100644 --- a/lib/features/occasion_theme/occasion_config_model.dart +++ b/lib/features/occasion_theme/occasion_config_model.dart @@ -68,11 +68,10 @@ class OccasionConfigModel { factory OccasionConfigModel.fromJson(Map json) { return OccasionConfigModel( key: (json['key'] as String?) ?? 'none', - // enabled: (json['enabled'] as bool?) ?? false, + enabled: (json['enabled'] as bool?) ?? false, + // enabled: true, startDate: _parseDate(json['start_date']), endDate: _parseDate(json['end_date']), - enabled: true, - // TODO: FOR TESTING ONLY — REMOVE BEFORE RELEASE. The "enabled" field is not yet supported in remote config, so we always treat it as true for now. primaryColorHex: json['primary_color'] as String?, backgroundOpacityImage: json['background_opacity_image'] as String?, backgroundImageOpacity: (json['background_image_opacity'] as num?)?.toDouble() ?? 1.0, diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 5eaa313c..1d3b6fa4 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -314,6 +314,8 @@ class MyInAppBrowser extends InAppBrowser { if (isLiveCareAppo) { form = form.replaceFirst('IS_SCHEDULE_VALUE', "true"); + } else { + form = form.replaceFirst('IS_SCHEDULE_VALUE', "false"); } var bytes = utf8.encode(form); From e5a73de3577b93615d112e9e25faa8c95f3ea0b2 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 7 Oct 2026 15:32:53 +0300 Subject: [PATCH 2/2] updates --- lib/features/common/models/family_file_request.dart | 2 +- lib/presentation/appointments/appointment_payment_page.dart | 4 ++-- .../livecare/immediate_livecare_payment_page.dart | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/features/common/models/family_file_request.dart b/lib/features/common/models/family_file_request.dart index 047b9af0..e3802bd5 100644 --- a/lib/features/common/models/family_file_request.dart +++ b/lib/features/common/models/family_file_request.dart @@ -47,7 +47,7 @@ class FamilyFileRequest { "SharedPatientIdentificationID": sharedPatientIdentificationId, "SearchType": searchType, "SharedPatientMobileNumber": sharedPatientMobileNumber, - "zipCode": zipCode, + "ZipCode": zipCode, "isRegister": isRegister, "PatientStatus": patientStatus, "isDentalAllowedBackend": isDentalAllowedBackend, diff --git a/lib/presentation/appointments/appointment_payment_page.dart b/lib/presentation/appointments/appointment_payment_page.dart index bef2df93..992f512e 100644 --- a/lib/presentation/appointments/appointment_payment_page.dart +++ b/lib/presentation/appointments/appointment_payment_page.dart @@ -858,7 +858,7 @@ class _AppointmentPaymentPageState extends State { print("onBrowserLoadStart"); print(url); - if (selectedPaymentMethod == "tamara") { + if (selectedPaymentMethod.toLowerCase() == "tamara") { if (Platform.isAndroid) { Uri uri = new Uri.dataFromString(url); tamaraPaymentStatus = uri.queryParameters['status']!; @@ -897,7 +897,7 @@ class _AppointmentPaymentPageState extends State { void checkPaymentStatus() async { LoaderBottomSheet.showLoader(loadingText: LocaleKeys.checkingPaymentStatusPleaseWait.tr(context: context)); - if (selectedPaymentMethod == "TAMARA") { + if (selectedPaymentMethod.toLowerCase() == "tamara") { await payfortViewModel.checkTamaraPaymentStatus( transactionID: transID, onSuccess: (apiResponse) async { 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 b205063c..b9df0744 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_page.dart @@ -781,7 +781,7 @@ class _ImmediateLiveCarePaymentPageState extends State