From 2e9f6bcb51d0e7cba1796c7692188e4ca382d528 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 27 Apr 2025 11:04:21 +0300 Subject: [PATCH 1/6] WD: show nearest doctor item different for search clinic --- .../components/SearchByClinic.dart | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 981bcf04..7e8f345f 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da import 'package:diplomaticquarterapp/models/Clinics/ClinicListResponse.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/LaserBooking.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/dialog/clinic_list_dialog.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/search_result/SearchResultWithTab.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; @@ -657,6 +658,37 @@ class _SearchByClinicState extends State { v, )); }); + if (nearestAppo) { + doctorsList.forEach((element) { + List doctorByHospital = + _patientDoctorAppointmentListHospital + .where((elementClinic) => + elementClinic.filterName == + element.getProjectCompleteName()) + .toList(); + + if (doctorByHospital.length != 0) { + _patientDoctorAppointmentListHospital[ + _patientDoctorAppointmentListHospital + .indexOf(doctorByHospital[0])] + .patientDoctorAppointmentList! + .add(element); + } else { + _patientDoctorAppointmentListHospital + .add(PatientDoctorAppointmentList( + filterName: element.getProjectCompleteName(), + distanceInKMs: element.projectDistanceInKiloMeters.toString(), + projectTopName: element.projectTopName, + projectBottomName: element.projectBottomName, + patientDoctorAppointment: element, + isHMC: element.isHMC, + )); + } + }); + navigateToSearchResultsForNearestAppointment( + context, doctorsList, _patientDoctorAppointmentListHospital); + return; + } regionHospitalList = await DoctorMapper.getMappedDoctor(doctorsList, isArabic: isArabic); @@ -701,6 +733,23 @@ class _SearchByClinicState extends State { }); } + navigateToSearchResultsForNearestAppointment( + context, + List docList, + List patientDoctorAppointmentListHospital) { + Navigator.push( + context, + FadePage( + page: SearchResults( + isLiveCareAppointment: false, + isDoctorNameSearch: true, + doctorsList: docList, + patientDoctorAppointmentListHospital: + patientDoctorAppointmentListHospital, + isDoctorSearchResult: true, + ))); + } + Future navigateToLaserClinic(BuildContext context) async { Navigator.push( context, From bbf18baadeca3abc74c1faca29769e766d0caa47 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 27 Apr 2025 11:06:04 +0300 Subject: [PATCH 2/6] WD: 0 count hmg or hmc will not be displayed --- .../search_result/ResultByFacility.dart | 70 +++++++++------- .../search_result/ResultByRegion.dart | 81 +++++++++++-------- 2 files changed, 89 insertions(+), 62 deletions(-) diff --git a/lib/pages/BookAppointment/search_result/ResultByFacility.dart b/lib/pages/BookAppointment/search_result/ResultByFacility.dart index d9dd0a52..f1f7ba88 100644 --- a/lib/pages/BookAppointment/search_result/ResultByFacility.dart +++ b/lib/pages/BookAppointment/search_result/ResultByFacility.dart @@ -22,38 +22,48 @@ class ResultByFacility extends StatelessWidget { Widget build(BuildContext context) { return Column( children: [ - InkWell( - onTap: () { - if (patientDoctorAppointmentListHospital - .registeredDoctorMap?[selectedRegion]?.hmgSize == - 0) return; - onFacilitySelected(false); - }, - child: HospitalTitle( - iconUrl: 'assets/images/svg/HMG.svg', - title: TranslationBase.of(context).hmgHospital, - isHMC: false, - itemCount: - "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmgSize ?? 0}", - nearest: patientDoctorAppointmentListHospital - .registeredDoctorMap?[selectedRegion]?.hmgDistance), + Visibility( + visible: patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmgSize != + 0, + child: InkWell( + onTap: () { + if (patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmgSize == + 0) return; + onFacilitySelected(false); + }, + child: HospitalTitle( + iconUrl: 'assets/images/svg/HMG.svg', + title: TranslationBase.of(context).hmgHospital, + isHMC: false, + itemCount: + "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmgSize ?? 0}", + nearest: patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmgDistance), + ), ), SizedBox(height: 16,), - InkWell( - onTap: () { - if (patientDoctorAppointmentListHospital - .registeredDoctorMap?[selectedRegion]?.hmcSize == - 0) return; - onFacilitySelected(true); - }, - child: HospitalTitle( - iconUrl: 'assets/images/svg/HMC.svg', - title: TranslationBase.of(context).hmcHospital, - isHMC: true, - itemCount: - "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmcSize ?? 0}", - nearest: patientDoctorAppointmentListHospital - .registeredDoctorMap?[selectedRegion]?.hmcDistance), + Visibility( + visible: patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmcSize != + 0, + child: InkWell( + onTap: () { + if (patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmcSize == + 0) return; + onFacilitySelected(true); + }, + child: HospitalTitle( + iconUrl: 'assets/images/svg/HMC.svg', + title: TranslationBase.of(context).hmcHospital, + isHMC: true, + itemCount: + "${patientDoctorAppointmentListHospital.registeredDoctorMap?[selectedRegion]?.hmcSize ?? 0}", + nearest: patientDoctorAppointmentListHospital + .registeredDoctorMap?[selectedRegion]?.hmcDistance), + ), ) ]); } diff --git a/lib/pages/BookAppointment/search_result/ResultByRegion.dart b/lib/pages/BookAppointment/search_result/ResultByRegion.dart index 920ae513..a56656f1 100644 --- a/lib/pages/BookAppointment/search_result/ResultByRegion.dart +++ b/lib/pages/BookAppointment/search_result/ResultByRegion.dart @@ -100,40 +100,57 @@ class RegionTitle extends StatelessWidget { ), Row( children: [ - SvgPicture.asset( - 'assets/images/svg/HMG.svg', - width: 10, - height: 10, + Visibility( + visible: hmgCount != "0", + child: Row( + children: [ + SvgPicture.asset( + 'assets/images/svg/HMG.svg', + width: 10, + height: 10, + ), + SizedBox( + width: 8, + ), + Text( + "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)}", + style: TextStyle( + fontSize: 14, + color: Color(0xFFD02127), + fontWeight: FontWeight.w600), + ), + SizedBox( + width: 8, + ), + ], + ), ), - SizedBox( - width: 8, + Visibility( + visible: hmcCount != "0" && hmgCount != "0", + child: Text(" ,")), + Visibility( + visible: hmcCount != "0", + child: Row( + children: [ + SvgPicture.asset( + 'assets/images/svg/HMC.svg', + width: 10, + height: 10, + ), + SizedBox( + width: 8, + ), + Text( + "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}", + style: TextStyle( + fontSize: 14, + color: Color(0xFF40ACC9), + fontWeight: FontWeight.w600), + ), + ], + ), ), - Text( - "${TranslationBase.of(context).HospitalString(num.parse(hmgCount)).replaceAll("@", hmgCount)} ,", - style: TextStyle( - fontSize: 14, - color: Color(0xFFD02127), - fontWeight: FontWeight.w600), - ), - SizedBox( - width: 8, - ), - SvgPicture.asset( - 'assets/images/svg/HMC.svg', - width: 10, - height: 10, - ), - SizedBox( - width: 8, - ), - Text( - "${TranslationBase.of(context).MedicalCenterString(num.parse(hmcCount)).replaceAll("@", hmcCount)}", - style: TextStyle( - fontSize: 14, - color: Color(0xFF40ACC9), - fontWeight: FontWeight.w600), - ), - ], + ], ), ], ), From 4cde49cb511f125f0c9815fa10317ffaac448a30 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 20 Apr 2025 10:09:53 +0300 Subject: [PATCH 3/6] er checkin changes --- Certs/Apple Pay UAT/Apple Pay UAT.zip | Bin 0 -> 7281 bytes ...erchantIdentityCertProd.certSigningRequest | 15 ++++ ...ymentProcessingCertProd.certSigningRequest | 8 ++ Certs/Apple Pay UAT/Password.rtf | 8 ++ ...eveloper-merchantid-domain-association.txt | 74 ++++++++++++++++++ Certs/Apple Pay UAT/apple_pay.cer | Bin 0 -> 1179 bytes Certs/Apple Pay UAT/merchant_id.cer | Bin 0 -> 1596 bytes ...EROnlineCheckInPaymentDetailsResponse.dart | 16 +++- .../EROnlineCheckInPaymentDetails.dart | 35 ++++++++- 9 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 Certs/Apple Pay UAT/Apple Pay UAT.zip create mode 100644 Certs/Apple Pay UAT/ApplePayMerchantIdentityCertProd.certSigningRequest create mode 100644 Certs/Apple Pay UAT/ApplePayPaymentProcessingCertProd.certSigningRequest create mode 100644 Certs/Apple Pay UAT/Password.rtf create mode 100644 Certs/Apple Pay UAT/apple-developer-merchantid-domain-association.txt create mode 100644 Certs/Apple Pay UAT/apple_pay.cer create mode 100644 Certs/Apple Pay UAT/merchant_id.cer diff --git a/Certs/Apple Pay UAT/Apple Pay UAT.zip b/Certs/Apple Pay UAT/Apple Pay UAT.zip new file mode 100644 index 0000000000000000000000000000000000000000..fa08b99aa16f37ed0099c46df63d5caec236b93d GIT binary patch literal 7281 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 literal 0 HcmV?d00001 diff --git a/Certs/Apple Pay UAT/ApplePayMerchantIdentityCertProd.certSigningRequest b/Certs/Apple Pay UAT/ApplePayMerchantIdentityCertProd.certSigningRequest new file mode 100644 index 00000000..ce03b2e3 --- /dev/null +++ b/Certs/Apple Pay UAT/ApplePayMerchantIdentityCertProd.certSigningRequest @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICajCCAVICAQAwJTEjMCEGCSqGSIb3DQEJARYUSGFyb29uNjEzOEBnbWFpbC5j +b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4E8y9zluekbsXX6+i +HLa0GrZE+r8rJsmcNyhiONDkpCTQuuidRb4PH+DWPpxwtndKpgzPemCXavaAPY8I +vSf5/aLTzClLvuX4OqNsb9Y8v8jlt7uYud6hPYK+VKZmIyynqeHldur0+RQScVY7 +Z4MbgxWYAXd0K49o1Vj8KcYP1G37XIaUwOf+Ib3az4abnrsou7w9PSHnKREPU1A8 +syBR56/Zcm3I9e+4nLyk2kjhkp6zR8KKW3s0teqHkW+V2nqd6eU+ZwOOmP3FVuwl +X+kfVabTc42Nb7toDaIvxEI+LlrNCUTCptE5uvY+vId0bwjcL88Ti9zshPETgLd8 +F7mHAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAMTsBtXA79BL7aJoe87iHwCaR +lyOoeG5vUVJhQxhkb7pXD6TT00H3DEn43MCD+Nu9KNq3ZAARTsbnoB1MzYQ+Qs0w +uIx3K+sKKqzo3tKY78cjpKYW68qSY8QHPH8z0PJ/a18Mz1VGjhV9sanRc57fkf8Y +SfzG+jKB+y9AeC4R5PAVkv/EScZKVyb8+hFNZRMBOfnME7QRWm51MlnzfgavB/Sr +SSb9KrKzA65UKM9fv0JhNftiFVwsMDA42RuwSE7rVqzoejb47sFNnEBprt4Jel+5 +FJt/C//NKspMlW2cdRbPek7adaBuZCvEO+b0TDnvMQXnJTO5K0LCzGb5MRuGUg== +-----END CERTIFICATE REQUEST----- diff --git a/Certs/Apple Pay UAT/ApplePayPaymentProcessingCertProd.certSigningRequest b/Certs/Apple Pay UAT/ApplePayPaymentProcessingCertProd.certSigningRequest new file mode 100644 index 00000000..168f3bc9 --- /dev/null +++ b/Certs/Apple Pay UAT/ApplePayPaymentProcessingCertProd.certSigningRequest @@ -0,0 +1,8 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIH6MIGfAgEAMD0xIzAhBgkqhkiG9w0BCQEWFEhhcm9vbjYxMzhAZ21haWwuY29t +MQkwBwYDVQQDDAAxCzAJBgNVBAYTAkFFMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEiHGgNfm6LyD0k41YUNxGibQT5t2T9+QTVb6v5YrfCYslJIurcpeia8pzl/HJ +p1f4qxCR04cEYE3tcunyzkJd26AAMAwGCCqGSM49BAMCBQADSAAwRQIhAJWZqbmD +e9jyqPHW578V6xsf5Axgf64GBBFMpZ8+ZukDAiAYu0BbgeiU4RwCrezA71iH95yZ +ge9MoPuNHejpDKGeQQ== +-----END CERTIFICATE REQUEST----- diff --git a/Certs/Apple Pay UAT/Password.rtf b/Certs/Apple Pay UAT/Password.rtf new file mode 100644 index 00000000..aec586f3 --- /dev/null +++ b/Certs/Apple Pay UAT/Password.rtf @@ -0,0 +1,8 @@ +{\rtf1\ansi\ansicpg1252\cocoartf2758 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\margl1440\margr1440\vieww11520\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0 + +\f0\fs24 \cf0 HMG@54321} \ No newline at end of file diff --git a/Certs/Apple Pay UAT/apple-developer-merchantid-domain-association.txt b/Certs/Apple Pay UAT/apple-developer-merchantid-domain-association.txt new file mode 100644 index 00000000..da84c377 --- /dev/null +++ b/Certs/Apple Pay UAT/apple-developer-merchantid-domain-association.txt @@ -0,0 +1,74 @@ +MIIQaQYJKoZIhvcNAQcCoIIQWjCCEFYCAQExCzAJBgUrDgMCGgUAMHgGCSqGSIb3DQEHAaBrBGl7 +InRlYW1JZCI6IjNBMzU5RTg2WkYiLCJkb21haW4iOiJ1YXQuaG1nd2Vic2VydmljZXMuY29tIiwi +ZGF0ZUNyZWF0ZWQiOiIyMDI1LTA0LTA5LDA4OjUzOjAzIiwidmVyc2lvbiI6MX2ggg0_MIIENDCC +AxygAwIBAgIIPVn4N-rR2J8wDQYJKoZIhvcNAQELBQAwczEtMCsGA1UEAwwkQXBwbGUgaVBob25l +IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 +eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwHhcNMjQxMjE2MTkyMTAxWhcNMjkx +MjExMTgxMzU5WjBZMTUwMwYDVQQDDCxBcHBsZSBpUGhvbmUgT1MgUHJvdmlzaW9uaW5nIFByb2Zp +bGUgU2lnbmluZzETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQDQkzGr-FMe360eL2T3yU3Xlr5fSz15ZFxD7inDQNL6LxygtrwR +c-_wIrDf3vn5zlXj9UIBtSNlQRI793xGfYkTRZVE7JaVYmaXkAMA2eCuxdmxnCAtluCF7W9r01LT +gzzUASMl6eXG1BHYeaoIwt0VWPXvipNLDUvuDbaHk3UREFXLDHgH2zdwRjuX-sTreCng9Ox442Ha +QFeAB7uInKXHSW3IJtOVH00hoo1oc4Me5llahZZVVLCVLiXcdw1hh4GNiaQDezwAdyyJalnTZETZ +dKVbirFSYV9uBDDU8-IQNAyVjEvhe9YrhYPyJzmNcAgj4hSI_5P0LW1MJuKLN4YtAgMBAAGjgeUw +geIwDAYDVR0TAQH_BAIwADAfBgNVHSMEGDAWgBRv8ZUYYlzgyPHF7WwYyeDTZFKYIDBABggrBgEF +BQcBAQQ0MDIwMAYIKwYBBQUHMAGGJGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3NwMDMtYWlwY2Ew +NzAvBgNVHR8EKDAmMCSgIqAghh5odHRwOi8vY3JsLmFwcGxlLmNvbS9haXBjYS5jcmwwHQYDVR0O +BBYEFLy1xem9_MvQntyUsB74IZRc_wkuMA4GA1UdDwEB_wQEAwIHgDAPBgkqhkiG92NkBjoEAgUA +MA0GCSqGSIb3DQEBCwUAA4IBAQAyNMLpd6pf4MbKovN3WeeKZ7jxUfP7sPaXv7ERo-GhPLsjkukS +k6JxHbzxmnFvpDxvNpK24EeCopPj57iPu98lRGICz8289_uNiglweGXCGU0ly3JiIeSpaPkQmi56 +Dyi-pgMG0VVhH698-JTUcQ7i0yVUi86t1WgHW70te8diRXm5qYdM-Bg7gK4QS3HYeCvmCq-a59lN +zOpbt6OXVWvsDaB4x8Cwz8vcEEwwkhNxlNav4OzJ6cmbziUy7hENIRcki_GVLiJiRkV_4NvXFlTB +uT7T2oq5Zfa0tCN_eF3ZcnZkY6cIVcfZt5TbI7_zk6fUBERDDcriVrIrlCikPXKHMIIERDCCAyyg +AwIBAgIIXGPK5Eo3U8kwDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFw +cGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQD +Ew1BcHBsZSBSb290IENBMB4XDTE3MDUxMDIxMjczMFoXDTMwMTIzMTAwMDAwMFowczEtMCsGA1UE +AwwkQXBwbGUgaVBob25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJRWoBDz6DBIbH_L_cXvAege4XMHNjJi7ePXokzZM- +TzlHunW-88DS8Vmiqx_-CoY82S2aB_IOa7kpkRpfIgqL8XJYBa5MS0TFeaeAPLCI4IwMJ4RdGeWH +GTbL48V2t7D0QXJR9AVcg0uibaZRuPEm33terWUMxrKYUYy7fRtMwU7ICMfS7WQLtN0bjU9AfRuP +SJaSW_PQmH7ZvKQZDplhu0FdAcxbd3p9JNDc01P_w9zFlCy2Wk2OGCM5vdnGUj7R8vQliqEqh_3Y +DEYpUf_tF2yJJWuHv4ppFJ93n8MVt2iziEW9hOYGAkFkD60qKLgVyeCsp4q6cgQ0sniM-LKFAgMB +AAGjgewwgekwDwYDVR0TAQH_BAUwAwEB_zAfBgNVHSMEGDAWgBQr0GlHlHYJ_vRrjS5ApvdHTX8I +XjBEBggrBgEFBQcBAQQ4MDYwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3Nw +MDMtYXBwbGVyb290Y2EwLgYDVR0fBCcwJTAjoCGgH4YdaHR0cDovL2NybC5hcHBsZS5jb20vcm9v +dC5jcmwwHQYDVR0OBBYEFG_xlRhiXODI8cXtbBjJ4NNkUpggMA4GA1UdDwEB_wQEAwIBBjAQBgoq +hkiG92NkBgISBAIFADANBgkqhkiG9w0BAQsFAAOCAQEAOs-smI2-kiAhCa2V87FcIfo2LVcgRHRz +ZJIIs5as922X-ls0OCfPEkbTPBHwB8mZkLHR6BEJpeOla2xjCD-eJfrVmZxM5uXOjrJNaOyLq6Oi +T4oRFT7cFCscxkS2b2fFW0-VKS2HXD_cgx53T-3aVKct5xOBwWPEVAsbSwpqKCII1DeSfH9nKF-v +PT-3rFkdODRkWu4zShlCRCnEyhhr4cFTLS30TcIV9jMyGHjxJm-KTeuUTKPo_w-zA4tl2usu2GVQ +n9yfit8xqIRU3FJSQdKyEx0xRkeIXz7uw_KMIwSV66yKPoJsBp8u44tDmmJbNA30mc8s7rpyhhkj +pfyOtTCCBLswggOjoAMCAQICAQIwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCVVMxEzARBgNV +BAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYw +FAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTA2MDQyNTIxNDAzNloXDTM1MDIwOTIxNDAzNlowYjEL +MAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA5JGpCR-R2x5HUOsF7V55hC3rNqJXTFXsixmJ3vlLbPUHqyIwAugYPvhQ +CdN_QaiY-dHKZpwkaxHQo7vkGyrDH5WeegykR4tb1BY3M8vED03OFGnRyRly9V0O1X9fm_IlA7pV +j01dDfFkNSMVSxVZHbOU9_acns9QusFYUGePCLQg98usLCBvcLY_ATCMt0PPD5098ytJKBrI_s61 +uQ7ZXhzWyz21Oq30Dw4AkguxIRYudNU8DdtiFqujcZJHU1XBry9Bs_j743DN5qNMRX4fTGtQlkGJ +xHRiCxCDQYczioGxMFjsWgQyjGizjx3eZXP_Z15lvEnYdp8zFGWhd5TJLQIDAQABo4IBejCCAXYw +DgYDVR0PAQH_BAQDAgEGMA8GA1UdEwEB_wQFMAMBAf8wHQYDVR0OBBYEFCvQaUeUdgn-9GuNLkCm +90dNfwheMB8GA1UdIwQYMBaAFCvQaUeUdgn-9GuNLkCm90dNfwheMIIBEQYDVR0gBIIBCDCCAQQw +ggEABgkqhkiG92NkBQEwgfIwKgYIKwYBBQUHAgEWHmh0dHBzOi8vd3d3LmFwcGxlLmNvbS9hcHBs +ZWNhLzCBwwYIKwYBBQUHAgIwgbYagbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFu +eSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy +ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2Vy +dGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjANBgkqhkiG9w0BAQUFAAOCAQEAXDaZTC14 +t-2Mm9zzd5vydtJ3ME_BH4WDhRuZPUc38qmbQI4s1LGQEti-9HOb7tJkD8t5TzTYoj75eP9ryAfs +fTmDi1Mg0zjEsb-aTwpr_yv8WacFCXwXQFYRHnTTt4sjO0ej1W8k4uvRt3DfD0XhJ8rxbXjt57UX +F6jcfiI1yiXV2Q_Wa9SiJCMR96Gsj3OBYMYbWwkvkrL4REjwYDieFfU9JmcgijNq9w2Cz97roy_5 +U2pbZMBjM3f3OgcsVuvaDyEO2rpzGU-12TZ_wYdV2aeZuTJC-9jVcZ5-oVK3G72TQiQSKscPHbZN +nF5jyEuAF1CqitXa5PzQCQc3sHV1ITGCAoUwggKBAgEBMH8wczEtMCsGA1UEAwwkQXBwbGUgaVBo +b25lIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhv +cml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMCCD1Z-Dfq0difMAkGBSsOAwIa +BQCggdwwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMjUwNDA5MDg1 +MzAzWjAjBgkqhkiG9w0BCQQxFgQUAFaGI1aIk0pvFl6XU5VvRpeio9QwKQYJKoZIhvcNAQk0MRww +GjAJBgUrDgMCGgUAoQ0GCSqGSIb3DQEBAQUAMFIGCSqGSIb3DQEJDzFFMEMwCgYIKoZIhvcNAwcw +DgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0G +CSqGSIb3DQEBAQUABIIBAHdhBvowTL1e7Q-KFo3GAoa_c3I5iQH79ks6sZ9U4zu3xhpjrReRlA5d +ORAcMvUnUT0sjDj2ISsLKzUnDXNlcPE8fqfkMI_7LYlWvnNalVtrJmL6CUheBuTKMQ_Z_lZLLI4o +J46YUzCU9M4vpcgO6EpOQTNrqLx2sOs-V_my1p-Hig7UqdHNviX4gL4xjg7yUXNoevZ9ixPLXI4C +aPmg5q2NCECPxS7g36hJ_gHtRC6awR8qvK3-mSZPPfMzh0sHih76h2RWcv13UHSNygn3SF0MLhsS +5m9tf6r1sJOCAr2_ri-65d2GN1vhGXfoXQ0KFy9N2Cao3IsRs5unBb6pk5c diff --git a/Certs/Apple Pay UAT/apple_pay.cer b/Certs/Apple Pay UAT/apple_pay.cer new file mode 100644 index 0000000000000000000000000000000000000000..e7103aceaa2af83ce535a5e043053d4e4129f00d GIT binary patch literal 1179 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 AYybcN literal 0 HcmV?d00001 diff --git a/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart b/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart index 884c2e0c..1d6694ad 100644 --- a/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart +++ b/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart @@ -20,7 +20,9 @@ class EROnlineCheckInPaymentDetailsResponse { dynamic setupID; int? statusCode; String? subPolicyNo; - + bool? isCash; + bool? isEligible; + bool? isInsured; EROnlineCheckInPaymentDetailsResponse( {this.cashPrice, this.cashPriceTax, @@ -42,7 +44,11 @@ class EROnlineCheckInPaymentDetailsResponse { this.procedureName, this.setupID, this.statusCode, - this.subPolicyNo}); + this.subPolicyNo, + this.isCash, + this.isEligible, + this.isInsured + }); EROnlineCheckInPaymentDetailsResponse.fromJson(Map json) { cashPrice = json['CashPrice']; @@ -66,6 +72,9 @@ class EROnlineCheckInPaymentDetailsResponse { setupID = json['SetupID']; statusCode = json['StatusCode']; subPolicyNo = json['SubPolicyNo']; + isCash = json['IsCash']; + isEligible = json['IsEligible']; + isInsured = json['IsInsured']; } Map toJson() { @@ -91,6 +100,9 @@ class EROnlineCheckInPaymentDetailsResponse { data['SetupID'] = this.setupID; data['StatusCode'] = this.statusCode; data['SubPolicyNo'] = this.subPolicyNo; + data['IsCash'] = this.isCash; + data['IsEligible'] = this.isEligible; + data['IsInsured'] = this.isInsured; return data; } } diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart index 1eeb5d9f..560d6d9b 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart @@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.da import 'package:diplomaticquarterapp/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart'; import 'package:diplomaticquarterapp/models/LiveCare/ApplePayInsertRequest.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/payment_method_select.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; @@ -26,6 +27,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/widgets/dragable_sheet.dart'; import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; @@ -279,8 +281,10 @@ class _EROnlineCheckInPaymentDetailsState extends State LandingPage()), + (Route route) => false, + ); + Navigator.push(context, FadePage(page: InsuranceUpdate())); + }, + color: Color(0xffEAA118), + textColor: Colors.white, + ), + ], + ) : SizedBox() ], - ), + )]), ) : Container(), ); From a2dd8f2e35f53262c9c2ab74dd504f4d2e655ec9 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 20 Apr 2025 17:06:14 +0300 Subject: [PATCH 4/6] no message --- lib/services/payfort_services/payfort_service.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/services/payfort_services/payfort_service.dart b/lib/services/payfort_services/payfort_service.dart index 5dedd006..9b2c4597 100644 --- a/lib/services/payfort_services/payfort_service.dart +++ b/lib/services/payfort_services/payfort_service.dart @@ -168,6 +168,7 @@ class PayfortService extends BaseService { /// Step 4: Processing Payment [Don't multiply with 100] /// Amount value send always round ex. [100] not [100.00, 100.21] FortRequest request = FortRequest( + command: FortCommand.purchase, amount: orderAmount!, customerName: customerName!, customerEmail: customerEmail!, From 7a821a4604cc0452443d4440cfda9dc6bdb58435 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Apr 2025 11:22:15 +0300 Subject: [PATCH 5/6] updates --- lib/config/config.dart | 4 ++-- lib/widgets/charts/show_chart.dart | 21 +++++++++++++------- lib/widgets/in_app_browser/InAppBrowser.dart | 4 ++-- pubspec.yaml | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 4ce586a1..dd21498e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -22,12 +22,12 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; -// var BASE_URL = 'https://webservices.hmg.com/'; +var BASE_URL = 'https://webservices.hmg.com/'; // var BASE_URL = 'http://10.50.100.198:4422/'; diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart index 3128734f..e07dfeee 100644 --- a/lib/widgets/charts/show_chart.dart +++ b/lib/widgets/charts/show_chart.dart @@ -111,6 +111,7 @@ class ShowChart extends StatelessWidget { bottomTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, + getTitlesWidget: (value, title) { TextStyle style = TextStyle( color: Colors.black, @@ -119,37 +120,43 @@ class ShowChart extends StatelessWidget { if (isWeeklyOrMonthly) { return Text( - '${timeSeries![value.toInt()].time.day}/ ${timeSeries![value.toInt()].time.month}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } else { if (timeSeries!.length < 15) { if (timeSeries!.length > value.toInt()) { return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } else - return SizedBox(); + return Text( + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', + style: style, + ); } else { if (value.toInt() == 0) return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); if (value.toInt() == timeSeries!.length - 1) return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); if (xAxixs.contains(value.toInt())) { return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } } - return SizedBox(); + return Text( + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', + style: style, + ); } }, diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index ee68f743..6f61ac8a 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS diff --git a/pubspec.yaml b/pubspec.yaml index 7456565c..0a88aa7d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -173,9 +173,9 @@ dependencies: auto_size_text: ^3.0.0 equatable: ^2.0.3 wave: ^0.2.0 - sms_otp_auto_verify: ^2.2.0 + sms_otp_auto_verify: ^2.1.0 # flutter_ios_voip_kit: ^0.1.0 - google_api_availability: ^5.0.0 + google_api_availability: ^4.0.0 open_filex: ^4.3.2 path_provider: ^2.0.8 amazon_payfort: ^1.1.3 From b3080792555f6d895b809f2f9c0be80e54c7ca3e Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 27 Apr 2025 11:53:52 +0300 Subject: [PATCH 6/6] updates & fixes --- .../BookAppointment/search_result/ResultByRegion.dart | 5 +---- lib/pages/login/confirm-login.dart | 9 +++++---- lib/pages/login/user-login-agreement-page.dart | 5 +++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/pages/BookAppointment/search_result/ResultByRegion.dart b/lib/pages/BookAppointment/search_result/ResultByRegion.dart index a56656f1..6eaa83d2 100644 --- a/lib/pages/BookAppointment/search_result/ResultByRegion.dart +++ b/lib/pages/BookAppointment/search_result/ResultByRegion.dart @@ -119,15 +119,12 @@ class RegionTitle extends StatelessWidget { color: Color(0xFFD02127), fontWeight: FontWeight.w600), ), - SizedBox( - width: 8, - ), ], ), ), Visibility( visible: hmcCount != "0" && hmgCount != "0", - child: Text(" ,")), + child: Text(", ")), Visibility( visible: hmcCount != "0", child: Row( diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ee4208f4..5dfa3c49 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -711,9 +711,9 @@ class _ConfirmLogin extends State { checkIfUserAgreedBefore(CheckActivationCode result) { if (projectViewModel.havePrivilege(109)) { this.authService.checkIfUserAgreed().then((result) { - if (result['IsPatientAlreadyAgreed']) { - goToHome(); - } else { + // if (result['IsPatientAlreadyAgreed']) { + // goToHome(); + // } else { this.authService.getUserAgreementContent().then((result) { GifLoaderDialogUtils.hideDialog(AppGlobal.context); Navigator.pushAndRemoveUntil( @@ -724,6 +724,7 @@ class _ConfirmLogin extends State { authenticatedUserObject: authenticatedUserObject, appointmentRateViewModel: appointmentRateViewModel, selectedOption: selectedOption, + isArabic: projectViewModel.isArabic, ), ), (r) => false); @@ -731,7 +732,7 @@ class _ConfirmLogin extends State { GifLoaderDialogUtils.hideDialog(context); print(err); }); - } + // } }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); diff --git a/lib/pages/login/user-login-agreement-page.dart b/lib/pages/login/user-login-agreement-page.dart index c21fa273..cdf72035 100644 --- a/lib/pages/login/user-login-agreement-page.dart +++ b/lib/pages/login/user-login-agreement-page.dart @@ -30,8 +30,9 @@ class UserLoginAgreementPage extends StatefulWidget { final AuthenticatedUserObject authenticatedUserObject; final AppointmentRateViewModel appointmentRateViewModel; final int selectedOption; + final isArabic; - UserLoginAgreementPage({required this.userAgreementText, required this.authenticatedUserObject, required this.appointmentRateViewModel, required this.selectedOption}); + UserLoginAgreementPage({required this.userAgreementText, required this.authenticatedUserObject, required this.appointmentRateViewModel, required this.selectedOption, required this.isArabic}); @override State createState() => _UserLoginAgreementPageState(); @@ -72,7 +73,7 @@ class _UserLoginAgreementPageState extends State { }, ), ) - ..loadRequest(Uri.parse("https://hmg.com/en/Pages/Privacy.aspx")); + ..loadRequest(Uri.parse(widget.isArabic ? "https://hmg.com/ar/Pages/Privacy.aspx" : "https://hmg.com/en/Pages/Privacy.aspx")); } @override