From 44d59ed01aa040f903e8842b363c27b9f74f6939 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 5 Sep 2021 11:23:21 +0300 Subject: [PATCH] updates & fixes --- lib/core/model/labs/lab_result.dart | 10 +- lib/pages/livecare/livecare_home.dart | 7 +- lib/pages/livecare/widgets/clinic_card.dart | 2 +- lib/pages/livecare/widgets/clinic_list.dart | 269 +++++++----------- lib/pages/login/confirm-login.dart | 5 - lib/pages/login/login.dart | 5 - .../medical/LabResult/LabResultWidget.dart | 1 - lib/widgets/in_app_browser/InAppBrowser.dart | 20 +- 8 files changed, 125 insertions(+), 194 deletions(-) diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart index 739adf01..4949a3de 100644 --- a/lib/core/model/labs/lab_result.dart +++ b/lib/core/model/labs/lab_result.dart @@ -9,12 +9,12 @@ class LabResultList { class LabResult { String description; - Null femaleInterpretativeData; + dynamic femaleInterpretativeData; int gender; bool isCertificateAllowed; int lineItemNo; - Null maleInterpretativeData; - Null notes; + dynamic maleInterpretativeData; + dynamic notes; int orderLineItemNo; int orderNo; String packageID; @@ -27,11 +27,11 @@ class LabResult { String sampleCollectedOn; String sampleReceivedOn; String setupID; - Null superVerifiedOn; + dynamic superVerifiedOn; String testCode; String uOM; String verifiedOn; - Null verifiedOnDateTime; + dynamic verifiedOnDateTime; LabResult( {this.description, diff --git a/lib/pages/livecare/livecare_home.dart b/lib/pages/livecare/livecare_home.dart index d74dd6c8..2cadd239 100644 --- a/lib/pages/livecare/livecare_home.dart +++ b/lib/pages/livecare/livecare_home.dart @@ -1,3 +1,6 @@ +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/PatientERVirtualHistoryResponse.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/LiveCarePendingRequest.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/clinic_list.dart'; @@ -28,6 +31,8 @@ class _LiveCareHomeState extends State ErRequestHistoryList pendingERRequestHistoryList; + AuthenticatedUserObject authenticatedUserObject = locator(); + @override void initState() { _tabController = new TabController(length: 2, vsync: this); @@ -40,7 +45,7 @@ class _LiveCareHomeState extends State imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/er-consultation_en/ar/0.png')); WidgetsBinding.instance.addPostFrameCallback((_) { - if (!isDataLoaded) getLiveCareHistory(); + if (!isDataLoaded && authenticatedUserObject.isLogin) getLiveCareHistory(); }); super.initState(); diff --git a/lib/pages/livecare/widgets/clinic_card.dart b/lib/pages/livecare/widgets/clinic_card.dart index 0d9f056c..7276b961 100644 --- a/lib/pages/livecare/widgets/clinic_card.dart +++ b/lib/pages/livecare/widgets/clinic_card.dart @@ -39,7 +39,7 @@ class _State extends State { children: [ Card( margin: EdgeInsets.fromLTRB(15.0, 10.0, 8.0, 8.0), - color: widget.isSelected ? Colors.blue : widget.isOnline == 1 ? Colors.white : Colors.grey, + color: widget.isSelected ? Colors.blue : widget.patientERGetClinicsList.isOnline == 1 ? Colors.white : Colors.grey, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 0b4150aa..3bf83ac0 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -39,6 +39,9 @@ class _clinic_listState extends State { int currentSelectedIndex = 0; LiveCareClinicsListResponse liveCareClinicsListResponse; + List liveCareOnlineClinicsListResponse; + List liveCareOfflineClinicsListResponse; + LiveCareScheduleClinicsListResponse liveCareScheduleClinicsListResponse; bool isDataLoaded = false; @@ -62,8 +65,11 @@ class _clinic_listState extends State { @override void initState() { liveCareClinicsListResponse = new LiveCareClinicsListResponse(); - liveCareScheduleClinicsListResponse = - new LiveCareScheduleClinicsListResponse(); + + liveCareOnlineClinicsListResponse = new List(); + liveCareOfflineClinicsListResponse = new List(); + + liveCareScheduleClinicsListResponse = new LiveCareScheduleClinicsListResponse(); WidgetsBinding.instance.addPostFrameCallback((_) { if (!isLiveCareTypeSelected) { @@ -77,18 +83,14 @@ class _clinic_listState extends State { @override Widget build(BuildContext context) { - return SingleChildScrollView( - child: currentSelectedLiveCareType == "immediate" - ? getLiveCareImmediateClinicList() - : getLiveCareScheduleClinicList()); + return SingleChildScrollView(child: currentSelectedLiveCareType == "immediate" ? getLiveCareImmediateClinicList() : getLiveCareScheduleClinicList()); } void startLiveCare() { bool isError = false; LiveCareService service = new LiveCareService(); GifLoaderDialogUtils.showMyDialog(context); - ERAppointmentFeesResponse erAppointmentFeesResponse = - new ERAppointmentFeesResponse(); + ERAppointmentFeesResponse erAppointmentFeesResponse = new ERAppointmentFeesResponse(); service.getERAppointmentFees(selectedClinicID, context).then((res) { GifLoaderDialogUtils.hideDialog(context); if (res['HasAppointment'] == true) { @@ -98,9 +100,7 @@ class _clinic_listState extends State { erAppointmentFeesResponse = ERAppointmentFeesResponse.fromJson(res); isError = false; } - if (!isError) - getERAppointmentTime( - erAppointmentFeesResponse.getERAppointmentFeesList); + if (!isError) getERAppointmentTime(erAppointmentFeesResponse.getERAppointmentFeesList); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); @@ -158,8 +158,7 @@ class _clinic_listState extends State { service.getERAppointmentTime(selectedClinicID, context).then((res) { GifLoaderDialogUtils.hideDialog(context); print(res); - showLiveCarePaymentDialog( - getERAppointmentFeesList, res['WatingtimeInteger']); + showLiveCarePaymentDialog(getERAppointmentFeesList, res['WatingtimeInteger']); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); @@ -167,22 +166,16 @@ class _clinic_listState extends State { }); } - showLiveCarePaymentDialog( - GetERAppointmentFeesList getERAppointmentFeesList, int waitingTime) { + showLiveCarePaymentDialog(GetERAppointmentFeesList getERAppointmentFeesList, int waitingTime) { showGeneralDialog( barrierColor: Colors.black.withOpacity(0.5), transitionBuilder: (context, a1, a2, widget) { - final curvedValue = - Curves.easeInOutBack.transform(a1.value) - 1.0; + final curvedValue = Curves.easeInOutBack.transform(a1.value) - 1.0; return Transform( - transform: - Matrix4.translationValues(0.0, curvedValue * 200, 0.0), + transform: Matrix4.translationValues(0.0, curvedValue * 200, 0.0), child: Opacity( opacity: a1.value, - child: LiveCarePaymentDialog( - getERAppointmentFeesList: getERAppointmentFeesList, - waitingTime: waitingTime, - clinicName: selectedClinicName), + child: LiveCarePaymentDialog(getERAppointmentFeesList: getERAppointmentFeesList, waitingTime: waitingTime, clinicName: selectedClinicName), ), ); }, @@ -193,8 +186,7 @@ class _clinic_listState extends State { pageBuilder: (context, animation1, animation2) {}) .then((value) { if (value) { - if (getERAppointmentFeesList.total == "0" || - getERAppointmentFeesList.total == "0.0") { + if (getERAppointmentFeesList.total == "0" || getERAppointmentFeesList.total == "0.0") { showLiveCareInfoDialog(getERAppointmentFeesList); } else { navigateToPaymentMethod(getERAppointmentFeesList, context); @@ -203,11 +195,9 @@ class _clinic_listState extends State { }); } - showLiveCareInfoDialog( - GetERAppointmentFeesList getERAppointmentFeesList) async { + showLiveCareInfoDialog(GetERAppointmentFeesList getERAppointmentFeesList) async { if (await this.sharedPref.getObject(USER_PROFILE) != null) { - var data = AuthenticatedUser.fromJson( - await this.sharedPref.getObject(USER_PROFILE)); + var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); setState(() { authUser = data; }); @@ -216,11 +206,9 @@ class _clinic_listState extends State { showGeneralDialog( barrierColor: Colors.black.withOpacity(0.5), transitionBuilder: (context, a1, a2, widget) { - final curvedValue = - Curves.easeInOutBack.transform(a1.value) - 1.0; + final curvedValue = Curves.easeInOutBack.transform(a1.value) - 1.0; return Transform( - transform: - Matrix4.translationValues(0.0, curvedValue * 200, 0.0), + transform: Matrix4.translationValues(0.0, curvedValue * 200, 0.0), child: Opacity( opacity: a1.value, child: LiveCareInfoDialog(), @@ -234,11 +222,8 @@ class _clinic_listState extends State { pageBuilder: (context, animation1, animation2) {}) .then((value) { if (value) { - if (getERAppointmentFeesList.total == "0" || - getERAppointmentFeesList.total == "0.0") { - addNewCallForPatientER(authUser.patientID.toString() + - "" + - DateTime.now().millisecondsSinceEpoch.toString()); + if (getERAppointmentFeesList.total == "0" || getERAppointmentFeesList.total == "0.0") { + addNewCallForPatientER(authUser.patientID.toString() + "" + DateTime.now().millisecondsSinceEpoch.toString()); } else { navigateToPaymentMethod(getERAppointmentFeesList, context); } @@ -246,16 +231,14 @@ class _clinic_listState extends State { }); } - Future navigateToPaymentMethod( - GetERAppointmentFeesList getERAppointmentFeesList, context) async { + Future navigateToPaymentMethod(GetERAppointmentFeesList getERAppointmentFeesList, context) async { AppoitmentAllHistoryResultList appo = new AppoitmentAllHistoryResultList(); appo.clinicID = selectedClinicID; appo.appointmentNo = DateTime.now().millisecondsSinceEpoch; if (await this.sharedPref.getObject(USER_PROFILE) != null) { - var data = AuthenticatedUser.fromJson( - await this.sharedPref.getObject(USER_PROFILE)); + var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); setState(() { authUser = data; }); @@ -264,32 +247,16 @@ class _clinic_listState extends State { Navigator.push(context, FadePage(page: PaymentMethod())).then((value) { print(value); if (value != null) { - openPayment(value, authUser, - double.parse(getERAppointmentFeesList.total), appo); + openPayment(value, authUser, double.parse(getERAppointmentFeesList.total), appo); } }); } - openPayment(String paymentMethod, AuthenticatedUser authenticatedUser, - double amount, AppoitmentAllHistoryResultList appo) { - browser = new MyInAppBrowser( - onExitCallback: onBrowserExit, - appo: appo, - onLoadStartCallback: onBrowserLoadStart); - - browser.openPaymentBrowser( - amount, - "LiveCare Payment", - Utils.getAppointmentTransID(12, appo.clinicID, appo.appointmentNo), - "12", - authenticatedUser.emailAddress, - paymentMethod, - authenticatedUser.patientType, - authenticatedUser.firstName, - authenticatedUser.patientID, - authenticatedUser, - browser, - false); + openPayment(String paymentMethod, AuthenticatedUser authenticatedUser, double amount, AppoitmentAllHistoryResultList appo) { + browser = new MyInAppBrowser(onExitCallback: onBrowserExit, appo: appo, onLoadStartCallback: onBrowserLoadStart); + + browser.openPaymentBrowser(amount, "LiveCare Payment", Utils.getAppointmentTransID(12, appo.clinicID, appo.appointmentNo), "12", authenticatedUser.emailAddress, paymentMethod, + authenticatedUser.patientType, authenticatedUser.firstName, authenticatedUser.patientID, authenticatedUser, browser, false); } onBrowserLoadStart(String url) { @@ -321,19 +288,13 @@ class _clinic_listState extends State { checkPaymentStatus(AppoitmentAllHistoryResultList appo) { DoctorsListService service = new DoctorsListService(); GifLoaderDialogUtils.showMyDialog(context); - service - .checkPaymentStatus( - Utils.getAppointmentTransID( - appo.projectID, appo.clinicID, appo.appointmentNo), - context) - .then((res) { + service.checkPaymentStatus(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), context).then((res) { GifLoaderDialogUtils.hideDialog(context); print("Printing Payment Status Reponse!!!!"); print(res); String paymentInfo = res['Response_Message']; if (paymentInfo == 'Success') { - addNewCallForPatientER(Utils.getAppointmentTransID( - appo.projectID, appo.clinicID, appo.appointmentNo)); + addNewCallForPatientER(Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo)); } else { AppToast.showErrorToast(message: res['Response_Message']); } @@ -347,12 +308,9 @@ class _clinic_listState extends State { addNewCallForPatientER(String clientRequestID) { LiveCareService service = new LiveCareService(); GifLoaderDialogUtils.showMyDialog(context); - service - .addNewCallForPatientER(selectedClinicID, clientRequestID, context) - .then((res) { + service.addNewCallForPatientER(selectedClinicID, clientRequestID, context).then((res) { GifLoaderDialogUtils.hideDialog(context); - AppToast.showSuccessToast( - message: "New Call has been added successfully"); + AppToast.showSuccessToast(message: "New Call has been added successfully"); widget.getLiveCareHistory(); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); @@ -374,13 +332,19 @@ class _clinic_listState extends State { print(res['PatientER_GetClinicsList'].length); if (res['MessageStatus'] == 1) { setState(() { - liveCareClinicsListResponse = - LiveCareClinicsListResponse.fromJson(res); - print(liveCareClinicsListResponse.patientERGetClinicsList.length); - selectedClinicID = - liveCareClinicsListResponse.patientERGetClinicsList[0].serviceID; - selectedClinicName = liveCareClinicsListResponse - .patientERGetClinicsList[0].serviceName; + liveCareOnlineClinicsListResponse.clear(); + liveCareClinicsListResponse = LiveCareClinicsListResponse.fromJson(res); + + liveCareClinicsListResponse.patientERGetClinicsList.forEach((clinic) { + if (clinic.isOnline == 1) { + liveCareOnlineClinicsListResponse.add(clinic); + } else { + liveCareOfflineClinicsListResponse.add(clinic); + } + }); + + selectedClinicID = liveCareClinicsListResponse.patientERGetClinicsList[0].serviceID; + selectedClinicName = liveCareClinicsListResponse.patientERGetClinicsList[0].serviceName; isDataLoaded = true; }); } else { @@ -403,14 +367,10 @@ class _clinic_listState extends State { print(res['ClinicsHaveScheduleList'].length); if (res['MessageStatus'] == 1) { setState(() { - liveCareScheduleClinicsListResponse = - LiveCareScheduleClinicsListResponse.fromJson(res); - print(liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList.length); - selectedClinicID = liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList[0].serviceID; - selectedClinicName = liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList[0].clinicDesc; + liveCareScheduleClinicsListResponse = LiveCareScheduleClinicsListResponse.fromJson(res); + print(liveCareScheduleClinicsListResponse.clinicsHaveScheduleList.length); + selectedClinicID = liveCareScheduleClinicsListResponse.clinicsHaveScheduleList[0].serviceID; + selectedClinicName = liveCareScheduleClinicsListResponse.clinicsHaveScheduleList[0].clinicDesc; isDataLoaded = true; }); } else { @@ -483,25 +443,15 @@ class _clinic_listState extends State { shrinkWrap: true, physics: ScrollPhysics(), padding: EdgeInsets.all(0.0), - itemCount: liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList.length, + itemCount: liveCareScheduleClinicsListResponse.clinicsHaveScheduleList.length, itemBuilder: (context, index) { return InkWell( onTap: () { - updateSelectedScheduleIndex( - liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList[index]); + updateSelectedScheduleIndex(liveCareScheduleClinicsListResponse.clinicsHaveScheduleList[index]); }, child: ScheduleClinicCard( - isSelected: selectedClinicID == - liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList[index] - .serviceID - ? true - : false, - clinicsHaveScheduleList: - liveCareScheduleClinicsListResponse - .clinicsHaveScheduleList[index], + isSelected: selectedClinicID == liveCareScheduleClinicsListResponse.clinicsHaveScheduleList[index].serviceID ? true : false, + clinicsHaveScheduleList: liveCareScheduleClinicsListResponse.clinicsHaveScheduleList[index], languageID: languageID, ), ); @@ -555,39 +505,51 @@ class _clinic_listState extends State { children: [ Container( margin: EdgeInsets.all(15.0), - child: Text("Online Clinics: ", - style: TextStyle( - fontSize: 20.0, fontWeight: FontWeight.bold)), + child: Text("Online Clinics: ", style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold)), + ), + ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + physics: ScrollPhysics(), + padding: EdgeInsets.all(0.0), + // itemCount: liveCareClinicsListResponse.patientERGetClinicsList.length, + itemCount: liveCareOnlineClinicsListResponse.length, + itemBuilder: (context, index) { + return InkWell( + onTap: () { + updateSelectedIndex(liveCareOnlineClinicsListResponse[index]); + }, + child: ClinicCard( + isSelected: selectedClinicID == liveCareOnlineClinicsListResponse[index].serviceID ? true : false, + patientERGetClinicsList: liveCareOnlineClinicsListResponse[index], + languageID: languageID, + ), + ); + }, + ), + Container( + margin: EdgeInsets.all(15.0), + child: Text("Offline Clinics: ", style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold)), ), ListView.builder( scrollDirection: Axis.vertical, shrinkWrap: true, physics: ScrollPhysics(), padding: EdgeInsets.all(0.0), - itemCount: liveCareClinicsListResponse - .patientERGetClinicsList.length, + // itemCount: liveCareClinicsListResponse.patientERGetClinicsList.length, + itemCount: liveCareOfflineClinicsListResponse.length, itemBuilder: (context, index) { return InkWell( onTap: () { - if (liveCareClinicsListResponse - .patientERGetClinicsList[index].isOnline == - 1) { - updateSelectedIndex(liveCareClinicsListResponse - .patientERGetClinicsList[index]); - } else { - AppToast.showErrorToast( - message: "Clinic is offline"); - } + // if (liveCareClinicsListResponse.patientERGetClinicsList[index].isOnline == 1) { + // updateSelectedIndex(liveCareOnlineClinicsListResponse[index]); + // } else { + // AppToast.showErrorToast(message: "Clinic is offline"); + // } }, child: ClinicCard( - isSelected: selectedClinicID == - liveCareClinicsListResponse - .patientERGetClinicsList[index] - .serviceID - ? true - : false, - patientERGetClinicsList: liveCareClinicsListResponse - .patientERGetClinicsList[index], + isSelected: selectedClinicID == liveCareOfflineClinicsListResponse[index].serviceID ? true : false, + patientERGetClinicsList: liveCareOfflineClinicsListResponse[index], languageID: languageID, ), ); @@ -633,11 +595,8 @@ class _clinic_listState extends State { List doctorsList = []; LiveCareService service = new LiveCareService(); GifLoaderDialogUtils.showMyDialog(context); - List _patientDoctorAppointmentListHospital = - List(); - service - .getLiveCareScheduledDoctorList(context, selectedClinicID) - .then((res) { + List _patientDoctorAppointmentListHospital = List(); + service.getLiveCareScheduledDoctorList(context, selectedClinicID).then((res) { GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { setState(() { @@ -647,34 +606,23 @@ class _clinic_listState extends State { }); doctorsList.forEach((element) { - List doctorByHospital = - _patientDoctorAppointmentListHospital - .where( - (elementClinic) => - elementClinic.filterName == element.projectName, - ) - .toList(); + List doctorByHospital = _patientDoctorAppointmentListHospital + .where( + (elementClinic) => elementClinic.filterName == element.projectName, + ) + .toList(); if (doctorByHospital.length != 0) { - _patientDoctorAppointmentListHospital[ - _patientDoctorAppointmentListHospital - .indexOf(doctorByHospital[0])] - .patientDoctorAppointmentList - .add(element); + _patientDoctorAppointmentListHospital[_patientDoctorAppointmentListHospital.indexOf(doctorByHospital[0])].patientDoctorAppointmentList.add(element); } else { - _patientDoctorAppointmentListHospital.add( - PatientDoctorAppointmentList( - filterName: element.projectName, - distanceInKMs: - element.projectDistanceInKiloMeters.toString(), - patientDoctorAppointment: element)); + _patientDoctorAppointmentListHospital + .add(PatientDoctorAppointmentList(filterName: element.projectName, distanceInKMs: element.projectDistanceInKiloMeters.toString(), patientDoctorAppointment: element)); } }); } else {} }); this.sharedPref.setBool(IS_LIVECARE_APPOINTMENT, true); - navigateToSearchResults( - context, doctorsList, _patientDoctorAppointmentListHospital); + navigateToSearchResults(context, doctorsList, _patientDoctorAppointmentListHospital); } else {} }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); @@ -683,19 +631,8 @@ class _clinic_listState extends State { }); } - Future navigateToSearchResults( - context, - List docList, - List - patientDoctorAppointmentListHospital) async { - Navigator.push( - context, - FadePage( - page: SearchResults( - doctorsList: docList, - isLiveCareAppointment: true, - patientDoctorAppointmentListHospital: - patientDoctorAppointmentListHospital))); + Future navigateToSearchResults(context, List docList, List patientDoctorAppointmentListHospital) async { + Navigator.push(context, FadePage(page: SearchResults(doctorsList: docList, isLiveCareAppointment: true, patientDoctorAppointmentListHospital: patientDoctorAppointmentListHospital))); } updateSelectedIndex(PatientERGetClinicsList patientERGetClinicsList) { diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index bcbcf6cb..35e9ee15 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -611,11 +611,6 @@ class _ConfirmLogin extends State { .setUser(authenticatedUserObject.user); getToDoCount(); - pharmacyModuleViewModel.generatePharmacyToken().then((value) async { - if (pharmacyModuleViewModel.error.isNotEmpty) - await pharmacyModuleViewModel.createUser(); - }); - appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 448238fd..70627f8d 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -278,11 +278,6 @@ class _Login extends State { // result['CRSVerificationStatus']; projectViewModel.user = authenticatedUserObject.user; - // await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { - // if (pharmacyModuleViewModel.error.isNotEmpty) - // await pharmacyModuleViewModel.createUser(); - // }); - appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index eabe583e..3f5b009d 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -149,7 +149,6 @@ class LabResultWidget extends StatelessWidget { isCovidResult = true; covidLabResult = order; } - print(covidLabResult.testCode); }); return isCovidResult; diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index 435e4368..e66b2eae 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -23,23 +23,23 @@ var _InAppBrowserOptions = InAppBrowserClassOptions( class MyInAppBrowser extends InAppBrowser { _PAYMENT_TYPE paymentType; - 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 + // 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String PREAUTH_SERVICE_URL = - 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT + static String SERVICE_URL = + 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String PREAUTH_SERVICE_URL = - // 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store + // 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT - static String PRESCRIPTION_PAYMENT_WITH_ORDERID = - 'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID='; + static String PREAUTH_SERVICE_URL = + 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store // static String PRESCRIPTION_PAYMENT_WITH_ORDERID = - // 'https://mdlaboratories.com/exacartapi/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID='; //Live + // 'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID='; + + static String PRESCRIPTION_PAYMENT_WITH_ORDERID = + 'https://mdlaboratories.com/exacartapi/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID='; //Live // Packages static String PACKAGES_REQUEST_PAYMENT_URL =