Updates & fixes

merge-update-with-lab-changes
haroon amjad 1 year ago
parent 82de56266e
commit 7188919172

@ -255,7 +255,8 @@ class _InPatientPendingAdvancePaymentState extends State<InPatientPendingAdvance
service service
.getInPatientPaymentLink( .getInPatientPaymentLink(
projectViewModel.inPatientProjectID, projectViewModel.inPatientProjectID,
projectViewModel.getAdmissionInfoResponseModel.admissionNo!, // projectViewModel.getAdmissionInfoResponseModel.admissionNo!,
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionRequestNo! : projectViewModel.getAdmissionRequestInfoResponseModel.admissionRequestNo!,
orderID, orderID,
projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!, projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!,
projectViewModel.user.emailAddress!, projectViewModel.user.emailAddress!,

@ -375,6 +375,7 @@ class _InPatientServicesHomeState extends State<InPatientServicesHome> {
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.projectID! : projectViewModel.getAdmissionRequestInfoResponseModel.projectId!, projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.projectID! : projectViewModel.getAdmissionRequestInfoResponseModel.projectId!,
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionNo! : 0, projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionNo! : 0,
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionRequestNo! : projectViewModel.getAdmissionRequestInfoResponseModel.admissionRequestNo!, projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionRequestNo! : projectViewModel.getAdmissionRequestInfoResponseModel.admissionRequestNo!,
projectViewModel.isArabic ? 1 : 2,
context) context)
.then((res) { .then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -697,37 +697,37 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} }
checkIfUserAgreedBefore(CheckActivationCode result) { checkIfUserAgreedBefore(CheckActivationCode result) {
this.authService.checkIfUserAgreed().then((result) { // this.authService.checkIfUserAgreed().then((result) {
if (result['IsPatientAlreadyAgreed']) { // if (result['IsPatientAlreadyAgreed']) {
goToHome(); // goToHome();
} else { // } else {
this.authService.getUserAgreementContent().then((result) { // this.authService.getUserAgreementContent().then((result) {
GifLoaderDialogUtils.hideDialog(AppGlobal.context); // GifLoaderDialogUtils.hideDialog(AppGlobal.context);
Navigator.pushAndRemoveUntil( // Navigator.pushAndRemoveUntil(
context, // context,
FadePage( // FadePage(
page: UserLoginAgreementPage( // page: UserLoginAgreementPage(
userAgreementText: result['UserAgreementContent'], // userAgreementText: result['UserAgreementContent'],
authenticatedUserObject: authenticatedUserObject, // authenticatedUserObject: authenticatedUserObject,
appointmentRateViewModel: appointmentRateViewModel, // appointmentRateViewModel: appointmentRateViewModel,
selectedOption: selectedOption, // selectedOption: selectedOption,
), // ),
), // ),
(r) => false); // (r) => false);
}).catchError((err) { // }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
print(err); // print(err);
}); // });
} // }
}).catchError((err) { // }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
print(err); // print(err);
}); // });
// if (result.isNeedUserAgreement == true) { // if (result.isNeedUserAgreement == true) {
//move to agreement page. //move to agreement page.
// } else { // } else {
// goToHome(); goToHome();
// } // }
} }

@ -186,6 +186,7 @@ class PaymentService extends StatelessWidget {
projectViewModel.inPatientProjectID, projectViewModel.inPatientProjectID,
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionNo! : 0, projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionNo! : 0,
projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionRequestNo! : projectViewModel.getAdmissionRequestInfoResponseModel.admissionRequestNo!, projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.admissionRequestNo! : projectViewModel.getAdmissionRequestInfoResponseModel.admissionRequestNo!,
projectViewModel.isArabic ? 1 : 2,
context) context)
.then((res) { .then((res) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -292,9 +292,9 @@ class ClinicListService extends BaseService {
return Future.value(localRes); return Future.value(localRes);
} }
Future<Map> getInPatientAdvancePaymentRequests(int projectID, int admissionNo, int admissionReqNo, context) async { Future<Map> getInPatientAdvancePaymentRequests(int projectID, int admissionNo, int admissionReqNo, int languageID, context) async {
Map<String, dynamic> request; Map<String, dynamic> request;
request = {"ProjectID": projectID, "AdmissionReqNo": admissionReqNo, "AdmissionNo": admissionNo}; request = {"ProjectID": projectID, "AdmissionReqNo": admissionReqNo, "AdmissionNo": admissionNo, "LanguageID": languageID};
dynamic localRes; dynamic localRes;

Loading…
Cancel
Save