diff --git a/lib/config/config.dart b/lib/config/config.dart index 1d28ade7..1cbc4ee3 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -355,7 +355,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 = 16.7; +var VERSION_ID = 16.8; var SETUP_ID = '91877'; var LANGUAGE = 2; // var PATIENT_OUT_SA = 0; diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart index 6bc73b21..307eceb6 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart @@ -324,7 +324,7 @@ class _EROnlineCheckInHomePageState extends State with }); } else { //NFCNotSupported - AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported); + AppToast.showErrorToast(message: TranslationBase.of(context).NFCNotSupported, localContext: context); } }, color: CustomColors.green, diff --git a/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart b/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart index 14bf116f..690f1371 100644 --- a/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart +++ b/lib/pages/InPatientServices/components/inpatient_pending_advance_payment.dart @@ -13,6 +13,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:provider/provider.dart'; import 'package:share_plus/share_plus.dart'; +import 'package:url_launcher/url_launcher.dart'; class InPatientPendingAdvancePayment extends StatefulWidget { InPatientAdvanceResponseModel inPatientAdvanceResponseModel; @@ -254,17 +255,17 @@ class _InPatientPendingAdvancePaymentState extends State { void openBirthNotificationsPage(BuildContext context) { ClinicListService service = new ClinicListService(); GifLoaderDialogUtils.showMyDialog(context); - service.getBirthNotification(projectViewModel.user.patientID!, projectViewModel.isArabic ? 1 : 2, context).then((res) { + service + .getBirthNotification( + projectViewModel.user.patientID!, + projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.projectID! : projectViewModel.getAdmissionRequestInfoResponseModel.projectId!, + projectViewModel.isArabic ? 1 : 2, + context) + .then((res) { GifLoaderDialogUtils.hideDialog(context); if (res["MessageStatus"] == 1) { Navigator.push(context, FadePage(page: BirthNotification())); } else { - AppToast.showErrorToast(message: res["endUserMessage"]); + AppToast.showErrorToast(message: res["endUserMessage"], localContext: context); } }).catchError((err) { print(err); @@ -376,7 +382,7 @@ class _InPatientServicesHomeState extends State { .then((res) { GifLoaderDialogUtils.hideDialog(context); if (res["MessageStatus"] == 1) { - if (res['responseInpatient'] != null && res['responseInpatient']['responseInpatientAdvanceInfo'].length != 0) { + if (res['responseInpatient'] != null && res['responseInpatient']['responseInpatientAdvanceInfo'] != null && res['responseInpatient']['responseInpatientAdvanceInfo'].length != 0) { inPatientAdvanceResponseModel = InPatientAdvanceResponseModel.fromJson(res["responseInpatient"]); Navigator.push(context, FadePage(page: InPatientAdvancePayment(isHasData: inPatientAdvanceResponseModel.responseInpatientAdvanceInfo != null, inPatientAdvanceResponseModel: inPatientAdvanceResponseModel))); diff --git a/lib/services/clinic_services/get_clinic_service.dart b/lib/services/clinic_services/get_clinic_service.dart index 4aa10e51..af2828cc 100644 --- a/lib/services/clinic_services/get_clinic_service.dart +++ b/lib/services/clinic_services/get_clinic_service.dart @@ -306,9 +306,9 @@ class ClinicListService extends BaseService { return Future.value(localRes); } - Future getBirthNotification(num motherMRN, int languageID, context) async { + Future getBirthNotification(num motherMRN, int projectID, int languageID, context) async { Map request; - request = {"mothermrn": motherMRN, "LanguageID": languageID}; + request = {"mothermrn": motherMRN, "LanguageID": languageID, "ProjectID": projectID}; dynamic localRes; diff --git a/pubspec.yaml b/pubspec.yaml index 16e395b3..c1b12fcb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.5.069+4050069 +version: 4.5.070+4050070 environment: sdk: ">=3.0.0 <3.13.0"