master
haroon amjad 3 months ago
parent 3745c197c8
commit 5fdbf66c5e

@ -601,7 +601,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.6.027; MARKETING_VERSION = 4.6.028;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -753,7 +753,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.6.027; MARKETING_VERSION = 4.6.028;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -797,7 +797,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 4.6.027; MARKETING_VERSION = 4.6.028;
PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone"; PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

@ -714,10 +714,10 @@ var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
var GET_SERVICES_PRICE_LIST = 'Services/OUTPs.svc/REST/GetServicesPriceList'; var GET_SERVICES_PRICE_LIST = 'Services/OUTPs.svc/REST/GetServicesPriceList';
var payFortEnvironment = FortEnvironment.production; // var payFortEnvironment = FortEnvironment.production;
var applePayMerchantId = "merchant.com.hmgwebservices"; // var applePayMerchantId = "merchant.com.hmgwebservices";
// var payFortEnvironment = FortEnvironment.test; var payFortEnvironment = FortEnvironment.test;
// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; var applePayMerchantId = "merchant.com.hmgwebservices.uat";
class AppGlobal { class AppGlobal {
static var context; static var context;

@ -1366,7 +1366,7 @@ const Map localizedValues = {
"livecare-option-1": {"en": "Get consultation immediately", "ar": "الحصول على الاستشارة فورا"}, "livecare-option-1": {"en": "Get consultation immediately", "ar": "الحصول على الاستشارة فورا"},
"livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"}, "livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"},
"livecare-option-3": {"en": "Book Appointment", "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": "أدخل رمز التحقق هنا"}, "sms_code": {"en": "Enter SMS Code here", "ar": "أدخل رمز التحقق هنا"},
"code_failure": {"en": "Didnt received the code", "ar": "لم أستلم رمز التحقق"}, "code_failure": {"en": "Didnt received the code", "ar": "لم أستلم رمز التحقق"},
"resend": {"en": "Resend", "ar": "إعادة إرسال"}, "resend": {"en": "Resend", "ar": "إعادة إرسال"},

@ -189,7 +189,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232 // body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 4768663; //4609100 // body['PatientID'] = 4773715; //4609100
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574

@ -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/translations_delegate_base.dart';
import 'package:hmg_patient_app/uitl/utils_new.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/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:hmg_patient_app/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -696,7 +697,17 @@ class _SearchByClinicState extends State<SearchByClinic> {
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); 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);
}
}); });
} }

@ -811,33 +811,33 @@ class _ConfirmLogin extends State<ConfirmLogin> {
// GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
getToDoCount(); getToDoCount();
checkIfIsInPatient(); checkIfIsInPatient();
appointmentRateViewModel // appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => { // .then((value) => {
GifLoaderDialogUtils.hideDialog(AppGlobal.context), // GifLoaderDialogUtils.hideDialog(AppGlobal.context),
if (appointmentRateViewModel.isHaveAppointmentNotRate) // if (appointmentRateViewModel.isHaveAppointmentNotRate)
{ // {
Navigator.pushAndRemoveUntil( // Navigator.pushAndRemoveUntil(
context, // context,
FadePage( // FadePage(
page: RateAppointmentDoctor(), // page: RateAppointmentDoctor(),
), // ),
(r) => false) // (r) => false)
} // }
else // else
{ // {
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,
FadePage( FadePage(
page: LandingPage(), page: LandingPage(),
), ),
(r) => false) (r) => false);
}, // },
insertIMEI() insertIMEI();
}) // })
.catchError((err) { // .catchError((err) {
print(err); // print(err);
}); // });
} }
loading(flag) { loading(flag) {

@ -387,33 +387,33 @@ class _Login extends State<Login> {
// (r) => false); // (r) => false);
getToDoCount(); getToDoCount();
checkIfIsInPatient(); checkIfIsInPatient();
appointmentRateViewModel // appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => { // .then((value) => {
GifLoaderDialogUtils.hideDialog(context), // GifLoaderDialogUtils.hideDialog(context),
if (appointmentRateViewModel.isHaveAppointmentNotRate) // if (appointmentRateViewModel.isHaveAppointmentNotRate)
{ // {
Navigator.pushAndRemoveUntil( // Navigator.pushAndRemoveUntil(
context, // context,
FadePage( // FadePage(
page: RateAppointmentDoctor(), // page: RateAppointmentDoctor(),
), // ),
(r) => false) // (r) => false)
} // }
else // else
{ // {
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,
FadePage( FadePage(
page: LandingPage(), page: LandingPage(),
), ),
(r) => false) (r) => false);
} // }
}) // })
.catchError((err) { // .catchError((err) {
print(err); // print(err);
GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
}); // });
}); });
} }

@ -777,34 +777,34 @@ class _UserLoginAgreementPageState extends State<UserLoginAgreementPage> {
// GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
getToDoCount(); getToDoCount();
checkIfIsInPatient(); checkIfIsInPatient();
widget.appointmentRateViewModel // widget.appointmentRateViewModel
.getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2) // .getIsLastAppointmentRatedList(projectViewModel.isArabic ? 1 : 2)
.then((value) => { // .then((value) => {
GifLoaderDialogUtils.hideDialog(context), // GifLoaderDialogUtils.hideDialog(context),
if (widget.appointmentRateViewModel.isHaveAppointmentNotRate) // if (widget.appointmentRateViewModel.isHaveAppointmentNotRate)
{ // {
Navigator.pushAndRemoveUntil( // Navigator.pushAndRemoveUntil(
context, // context,
FadePage( // FadePage(
page: RateAppointmentDoctor(), // page: RateAppointmentDoctor(),
), // ),
(r) => false) // (r) => false)
} // }
else // else
{ // {
GifLoaderDialogUtils.hideDialog(context), // GifLoaderDialogUtils.hideDialog(context),
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,
FadePage( FadePage(
page: LandingPage(), page: LandingPage(),
), ),
(r) => false) (r) => false);
}, // },
insertIMEI() insertIMEI();
}) // })
.catchError((err) { // .catchError((err) {
print(err); // print(err);
}); // });
} }
insertIMEI() { insertIMEI() {

@ -789,35 +789,44 @@ class _AppDrawerState extends State<AppDrawer> {
checkIfIsInPatient(context); checkIfIsInPatient(context);
appointmentRateViewModel Navigator.pushAndRemoveUntil(
.getIsLastAppointmentRatedList(languageID) context,
.then((value) => { FadePage(
getToDoCount(), page: LandingPage(),
//Utils.hideProgressDialog(), ),
if (appointmentRateViewModel.isHaveAppointmentNotRate) (r) => false);
{
Navigator.pushAndRemoveUntil( // Commented as per the CR 18819
context,
FadePage( // appointmentRateViewModel
page: RateAppointmentDoctor(), // .getIsLastAppointmentRatedList(languageID)
), // .then((value) => {
(r) => false) // getToDoCount(),
} // //Utils.hideProgressDialog(),
else // if (appointmentRateViewModel.isHaveAppointmentNotRate)
{ // {
Navigator.pushAndRemoveUntil( // Navigator.pushAndRemoveUntil(
context, // context,
FadePage( // FadePage(
page: LandingPage(), // page: RateAppointmentDoctor(),
), // ),
(r) => false) // (r) => false)
} // }
}) // else
.catchError((err) { // {
print(err); // Navigator.pushAndRemoveUntil(
//Utils.hideProgressDialog(); // context,
// GifLoaderDialogUtils.hideDialog(context); // FadePage(
}); // page: LandingPage(),
// ),
// (r) => false)
// }
// })
// .catchError((err) {
// print(err);
// //Utils.hideProgressDialog();
// // GifLoaderDialogUtils.hideDialog(context);
// });
} }
openAppReviewDialog() async { openAppReviewDialog() async {

@ -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://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 // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS

Loading…
Cancel
Save