diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d7a782db..0faecb4f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -601,7 +601,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.6.027; + MARKETING_VERSION = 4.6.028; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -753,7 +753,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.6.027; + MARKETING_VERSION = 4.6.028; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -797,7 +797,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 4.6.027; + MARKETING_VERSION = 4.6.028; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/config/config.dart b/lib/config/config.dart index 82254482..72a6d981 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -714,10 +714,10 @@ var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; var GET_SERVICES_PRICE_LIST = 'Services/OUTPs.svc/REST/GetServicesPriceList'; -var payFortEnvironment = FortEnvironment.production; -var applePayMerchantId = "merchant.com.hmgwebservices"; -// var payFortEnvironment = FortEnvironment.test; -// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +// var payFortEnvironment = FortEnvironment.production; +// var applePayMerchantId = "merchant.com.hmgwebservices"; +var payFortEnvironment = FortEnvironment.test; +var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 78da65ac..9dbcfa56 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1366,7 +1366,7 @@ const Map localizedValues = { "livecare-option-1": {"en": "Get consultation immediately", "ar": "الحصول على الاستشارة فورا"}, "livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"}, "livecare-option-3": {"en": "Book Appointment", "ar": "حجز موعد"}, - "livecare-option-4": {"en": "Schedule video call", "ar": "اتصال فيديو مجدول"}, + "livecare-option-4": {"en": "Schedule Virtual Appointment", "ar": "جدولة موعد افتراضي"}, "sms_code": {"en": "Enter SMS Code here", "ar": "أدخل رمز التحقق هنا"}, "code_failure": {"en": "Didn’t received the code", "ar": "لم أستلم رمز التحقق"}, "resend": {"en": "Resend", "ar": "إعادة إرسال"}, diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 4f2731a8..30d5958a 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -189,7 +189,7 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; //0560717232 - // body['PatientID'] = 4768663; //4609100 + // body['PatientID'] = 4773715; //4609100 // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index e7357ef4..98444643 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -25,6 +25,7 @@ import 'package:hmg_patient_app/uitl/location_util.dart'; import 'package:hmg_patient_app/uitl/translations_delegate_base.dart'; import 'package:hmg_patient_app/uitl/utils_new.dart'; import 'package:hmg_patient_app/widgets/card/rounded_container.dart'; +import 'package:hmg_patient_app/widgets/dialogs/alert_dialog.dart'; import 'package:hmg_patient_app/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -696,7 +697,17 @@ class _SearchByClinicState extends State { }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); - AppToast.showErrorToast(message: err, localContext: context); + if(clinicID == 23) { + AlertDialogBox( + context: context, + confirmMessage: err.toString(), + okText: TranslationBase.of(context).ok, + okFunction: () { + AlertDialogBox.closeAlertDialog(context); + }).showAlertDialog(context); + } else { + AppToast.showErrorToast(message: err, localContext: context); + } }); } diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ffa18025..9e4d711a 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -811,33 +811,33 @@ class _ConfirmLogin extends State { // GifLoaderDialogUtils.hideDialog(context); getToDoCount(); checkIfIsInPatient(); - appointmentRateViewModel - .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) - .then((value) => { - GifLoaderDialogUtils.hideDialog(AppGlobal.context), - if (appointmentRateViewModel.isHaveAppointmentNotRate) - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: RateAppointmentDoctor(), - ), - (r) => false) - } - else - { - Navigator.pushAndRemoveUntil( + // appointmentRateViewModel + // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) + // .then((value) => { + // GifLoaderDialogUtils.hideDialog(AppGlobal.context), + // if (appointmentRateViewModel.isHaveAppointmentNotRate) + // { + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: RateAppointmentDoctor(), + // ), + // (r) => false) + // } + // else + // { + Navigator.pushAndRemoveUntil( context, FadePage( page: LandingPage(), ), - (r) => false) - }, - insertIMEI() - }) - .catchError((err) { - print(err); - }); + (r) => false); + // }, + insertIMEI(); + // }) + // .catchError((err) { + // print(err); + // }); } loading(flag) { diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index df111ba1..16491e09 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -387,33 +387,33 @@ class _Login extends State { // (r) => false); getToDoCount(); checkIfIsInPatient(); - appointmentRateViewModel - .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) - .then((value) => { - GifLoaderDialogUtils.hideDialog(context), - if (appointmentRateViewModel.isHaveAppointmentNotRate) - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: RateAppointmentDoctor(), - ), - (r) => false) - } - else - { - Navigator.pushAndRemoveUntil( + // appointmentRateViewModel + // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) + // .then((value) => { + // GifLoaderDialogUtils.hideDialog(context), + // if (appointmentRateViewModel.isHaveAppointmentNotRate) + // { + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: RateAppointmentDoctor(), + // ), + // (r) => false) + // } + // else + // { + Navigator.pushAndRemoveUntil( context, FadePage( page: LandingPage(), ), - (r) => false) - } - }) - .catchError((err) { - print(err); - GifLoaderDialogUtils.hideDialog(context); - }); + (r) => false); + // } + // }) + // .catchError((err) { + // print(err); + // GifLoaderDialogUtils.hideDialog(context); + // }); }); } diff --git a/lib/pages/login/user-login-agreement-page.dart b/lib/pages/login/user-login-agreement-page.dart index 35331569..a7bbafc5 100644 --- a/lib/pages/login/user-login-agreement-page.dart +++ b/lib/pages/login/user-login-agreement-page.dart @@ -777,34 +777,34 @@ class _UserLoginAgreementPageState extends State { // GifLoaderDialogUtils.hideDialog(context); getToDoCount(); checkIfIsInPatient(); - widget.appointmentRateViewModel - .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) - .then((value) => { - GifLoaderDialogUtils.hideDialog(context), - if (widget.appointmentRateViewModel.isHaveAppointmentNotRate) - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: RateAppointmentDoctor(), - ), - (r) => false) - } - else - { - GifLoaderDialogUtils.hideDialog(context), - Navigator.pushAndRemoveUntil( + // widget.appointmentRateViewModel + // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) + // .then((value) => { + // GifLoaderDialogUtils.hideDialog(context), + // if (widget.appointmentRateViewModel.isHaveAppointmentNotRate) + // { + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: RateAppointmentDoctor(), + // ), + // (r) => false) + // } + // else + // { + // GifLoaderDialogUtils.hideDialog(context), + Navigator.pushAndRemoveUntil( context, FadePage( page: LandingPage(), ), - (r) => false) - }, - insertIMEI() - }) - .catchError((err) { - print(err); - }); + (r) => false); + // }, + insertIMEI(); + // }) + // .catchError((err) { + // print(err); + // }); } insertIMEI() { diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 543747cf..af59e66b 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -789,35 +789,44 @@ class _AppDrawerState extends State { checkIfIsInPatient(context); - appointmentRateViewModel - .getIsLastAppointmentRatedList(languageID) - .then((value) => { - getToDoCount(), - //Utils.hideProgressDialog(), - if (appointmentRateViewModel.isHaveAppointmentNotRate) - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: RateAppointmentDoctor(), - ), - (r) => false) - } - else - { - Navigator.pushAndRemoveUntil( - context, - FadePage( - page: LandingPage(), - ), - (r) => false) - } - }) - .catchError((err) { - print(err); - //Utils.hideProgressDialog(); - // GifLoaderDialogUtils.hideDialog(context); - }); + Navigator.pushAndRemoveUntil( + context, + FadePage( + page: LandingPage(), + ), + (r) => false); + + // Commented as per the CR 18819 + + // appointmentRateViewModel + // .getIsLastAppointmentRatedList(languageID) + // .then((value) => { + // getToDoCount(), + // //Utils.hideProgressDialog(), + // if (appointmentRateViewModel.isHaveAppointmentNotRate) + // { + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: RateAppointmentDoctor(), + // ), + // (r) => false) + // } + // else + // { + // Navigator.pushAndRemoveUntil( + // context, + // FadePage( + // page: LandingPage(), + // ), + // (r) => false) + // } + // }) + // .catchError((err) { + // print(err); + // //Utils.hideProgressDialog(); + // // GifLoaderDialogUtils.hideDialog(context); + // }); } openAppReviewDialog() async { diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 4059edf7..f9e46c61 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -40,9 +40,9 @@ class MyInAppBrowser extends InAppBrowser { // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + static String SERVICE_URL = 'https://uat.hmgwebservices.com/HMGPayment/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