diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index eb645300..f5923f29 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -2057,5 +2057,6 @@ "liveCareTermsConditions46": "13-3\tإذا تبين أن أي بند أو جزء من أي بند من هذه الشروط والأحكام باطل أو غير قابل للإنفاذ أو غير صالح، فسيتم فصله عن هذه الشروط والأحكام، تاركاً باقي الشروط سارية المفعول بكامل الأثر والنفاذ، بشرط ألا يغير فصل ذلك البند من الطبيعة الأساسية لهذه الشروط والأحكام.", "liveCareTermsHeading16": "14.\tالشكاوى", "liveCareTermsConditions47": "خدمات الرعاية الصحية عن بُعد الخاصة بنا سوف تكون لتخصصات طبية محددة أو لمواعيد المتابعة أو إعادة صرف الدواء. ", - "liveCareTermsConditions48": "إذا كانت لديك أي شكاوى أو مخاوف بشأن التطبيق و/أو موقع الويب أو خدماتنا أو كيفية تعاملنا مع معلوماتك الشخصية، فيرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011" + "liveCareTermsConditions48": "إذا كانت لديك أي شكاوى أو مخاوف بشأن التطبيق و/أو موقع الويب أو خدماتنا أو كيفية تعاملنا مع معلوماتك الشخصية، فيرجى التواصل معنا على: EServices.HMG@drsulaimanalhabib.com أو الاتصال على الرقم: 9553 525 011", + "liveCareInsurancePolicyText": "تنبيه: الاجراءات ما بعد الاستشارة (مثل التحاليل أو الأدوية) غير مشمولة بتغطية التأمين, ويتحمل المريض تكلفتها." } diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index 69521189..02a3aeaa 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -2047,7 +2047,8 @@ "liveCareTermsConditions46": "13.3 If any clause or part of any clause of these Terms & Conditions is found to be void, unenforceable or invalid, then it will be severed from these Terms & Conditions, leaving the remainder in full force and effect, provided that the severance has not altered the basic nature of these Terms & Conditions. ", "liveCareTermsHeading16": "14. COMPLAINTS", "liveCareTermsConditions47": "Our Telehealth Services will be for specific medical specialties or follow-up or medication refill appointments.", - "liveCareTermsConditions48": "If you have any complaints or concerns about the Application and or the Website, Our Services, or how we handle your personal information please contact us on: EServices.HMG@drsulaimanalhabib.com or call 011 525 9553" + "liveCareTermsConditions48": "If you have any complaints or concerns about the Application and or the Website, Our Services, or how we handle your personal information please contact us on: EServices.HMG@drsulaimanalhabib.com or call 011 525 9553", + "liveCareInsurancePolicyText": "Note: Procedure following the consultation (such as Lab tests or medication) are not covered by insurance and will be charged directly to the patient." } diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart index 784c2f44..9680e089 100644 --- a/lib/core/api/api_client.dart +++ b/lib/core/api/api_client.dart @@ -210,7 +210,7 @@ class ApiClientImp implements ApiClient { body['TokenID'] = "@dm!n"; } - // body['TokenID'] = "@dm!n"; + body['TokenID'] = "@dm!n"; // body['PatientID'] = 226077; // body['PatientID'] = 53320; // body['PatientTypeID'] = 1; diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index 40f04b1e..9b6613fd 100644 --- a/lib/core/api_consts.dart +++ b/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 diff --git a/lib/features/immediate_livecare/immediate_livecare_repo.dart b/lib/features/immediate_livecare/immediate_livecare_repo.dart index e07d6293..12016568 100644 --- a/lib/features/immediate_livecare/immediate_livecare_repo.dart +++ b/lib/features/immediate_livecare/immediate_livecare_repo.dart @@ -21,7 +21,7 @@ abstract class ImmediateLiveCareRepo { {Function(dynamic)? onSuccess, Function(String)? onError}); Future>> addNewCallRequestForImmediateLiveCare( - int age, int gender, int serviceID, String clientRequestID, int callTypeID, bool isPharma, String deviceToken, String voipToken, + int age, int gender, int serviceID, String clientRequestID, int callTypeID, bool isPharma, String deviceToken, String voipToken, String language, {Function(dynamic)? onSuccess, Function(String)? onError}); Future>>> getPatientLiveCareHistory({Function(dynamic)? onSuccess, Function(String)? onError}); @@ -123,7 +123,7 @@ class ImmediateLiveCareRepoImp implements ImmediateLiveCareRepo { @override Future> addNewCallRequestForImmediateLiveCare( - int age, int gender, int serviceID, String clientRequestID, int callTypeID, bool isPharma, String deviceToken, String voipToken, + int age, int gender, int serviceID, String clientRequestID, int callTypeID, bool isPharma, String deviceToken, String voipToken, String language, {Function(dynamic p1)? onSuccess, Function(String p1)? onError}) async { Map mapDevice = { "IsPharmacy": isPharma, @@ -136,7 +136,8 @@ class ImmediateLiveCareRepoImp implements ImmediateLiveCareRepo { "Age": age, "Gender": gender, "IsVoip": Platform.isIOS ? true : false, - "CallTypeID": callTypeID + "CallTypeID": callTypeID, + "Language": language }; try { diff --git a/lib/features/immediate_livecare/immediate_livecare_view_model.dart b/lib/features/immediate_livecare/immediate_livecare_view_model.dart index a51c2319..126cf2cf 100644 --- a/lib/features/immediate_livecare/immediate_livecare_view_model.dart +++ b/lib/features/immediate_livecare/immediate_livecare_view_model.dart @@ -243,7 +243,13 @@ class ImmediateLiveCareViewModel extends ChangeNotifier { Future addNewCallRequestForImmediateLiveCare(String transID, {Function(dynamic)? onSuccess, Function(String)? onError}) async { final result = await immediateLiveCareRepo.addNewCallRequestForImmediateLiveCare(_appState.getAuthenticatedUser()!.age!, _appState.getAuthenticatedUser()!.gender!, - immediateLiveCareSelectedClinic.serviceID!, transID, liveCareSelectedCallType, false, _appState.deviceToken, await Utils.getStringFromPrefs(CacheConst.voipToken)); + immediateLiveCareSelectedClinic.serviceID!, + transID, + liveCareSelectedCallType, + false, + _appState.deviceToken, + await Utils.getStringFromPrefs(CacheConst.voipToken), + selectedConsultationLanguage == 1 ? "AR" : "EN"); result.fold( (failure) async { diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 496aebc9..68678a7d 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -2038,5 +2038,6 @@ abstract class LocaleKeys { static const liveCareTermsHeading16 = 'liveCareTermsHeading16'; static const liveCareTermsConditions47 = 'liveCareTermsConditions47'; static const liveCareTermsConditions48 = 'liveCareTermsConditions48'; + static const liveCareInsurancePolicyText = 'liveCareInsurancePolicyText'; } diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart index b44d2b51..130983a5 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart @@ -50,7 +50,10 @@ class _ImmediateLiveCarePaymentDetailsState extends State().liveCareImmediateAppointmentFeesList.isInsured == false) { + showCommonBottomSheetWithoutHeight(context, + child: Container( + padding: EdgeInsets.only( + left: 24.h, + top: 24.h, + right: 24.h, + bottom: 12.h, + ), + child: Utils.getWarningWidget( + loadingText: LocaleKeys.liveCareInsurancePolicyText.tr(), + isShowActionButtons: true, + confirmText: LocaleKeys.acknowledged.tr(context: context), + onCancelTap: () { + Navigator.of(context).pop(); + Navigator.of(context).pop(); + }, + onConfirmTap: () async { + Navigator.of(context).pop(); + }), + ), + callBackFunc: () async {}, + isCloseButtonVisible: false, + isFullScreen: false, + isDismissible: false); + } + } + @override void dispose() { - _videoController.dispose(); + // _videoController.dispose(); super.dispose(); } @@ -184,7 +216,7 @@ class _ImmediateLiveCarePaymentDetailsState extends State