diff --git a/lib/config/config.dart b/lib/config/config.dart index 72a6d981..3337dc6d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -357,7 +357,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal var CHANNEL = 3; var GENERAL_ID = 'Cs2020@2016\$2958'; var IP_ADDRESS = '10.20.10.20'; -var VERSION_ID = 20.0; +var VERSION_ID = 20.1; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; @@ -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/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 9e4d711a..1299f1e8 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -811,35 +811,74 @@ 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( - context, - FadePage( - page: LandingPage(), - ), - (r) => false); - // }, - insertIMEI(); - // }) - // .catchError((err) { - // print(err); - // }); + 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); + }); } + // goToHome() async { + // authenticatedUserObject.isLogin = true; + // appointmentRateViewModel.isLogin = true; + // projectViewModel.isLogin = true; + // projectViewModel.user = authenticatedUserObject.user; + // await authenticatedUserObject.getUser(getUser: true); + // + // // 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( + // context, + // FadePage( + // page: LandingPage(), + // ), + // (r) => false); + // // }, + // insertIMEI(); + // // }) + // // .catchError((err) { + // // print(err); + // // }); + // } + loading(flag) { setState(() { isLoading = flag; diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 16491e09..df111ba1 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/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index f9e46c61..d49c65cc 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,11 +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://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 diff --git a/pubspec.yaml b/pubspec.yaml index cf5e9986..695de2b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: hmg_patient_app description: A new Flutter application. -version: 4.6.028+1 -#version: 4.6.0982+40500982 +#version: 4.6.030+1 +version: 4.6.0984+40500984 environment: # sdk: ">=3.0.0 <3.13.0"