ER Online Check-In fixes

merge-update-with-lab-changes
haroon amjad 2 years ago
parent 4dc0a3f6c2
commit f6b89e1ae6

@ -11,8 +11,8 @@ class EROnlineCheckInPaymentDetailsResponse {
String? message; String? message;
String? patientCardID; String? patientCardID;
num? patientShare; num? patientShare;
double? patientShareWithTax; num? patientShareWithTax;
double? patientTaxAmount; num? patientTaxAmount;
int? policyId; int? policyId;
String? policyName; String? policyName;
String? procedureId; String? procedureId;

@ -441,6 +441,7 @@ class _EROnlineCheckInHomePageState extends State<EROnlineCheckInHomePage> with
ancillaryOrdersService.checkPatientERClinicBalanceAmount(10).then((response) { ancillaryOrdersService.checkPatientERClinicBalanceAmount(10).then((response) {
print(response["BalanceAmount"]); print(response["BalanceAmount"]);
isPatientArrived = response['BalanceAmount'] > 0; isPatientArrived = response['BalanceAmount'] > 0;
// isPatientArrived = false;
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
// erOnlineCheckInPaymentDetailsResponse = EROnlineCheckInPaymentDetailsResponse.fromJson(response["ResponsePatientShare"]); // erOnlineCheckInPaymentDetailsResponse = EROnlineCheckInPaymentDetailsResponse.fromJson(response["ResponsePatientShare"]);
setState(() {}); setState(() {});

@ -472,9 +472,7 @@ class _EROnlineCheckInPaymentDetailsState extends State<EROnlineCheckInPaymentDe
String paymentReference = payment_res['Fort_id'].toString(); String paymentReference = payment_res['Fort_id'].toString();
service.ER_createAdvancePayment(appo, widget.projectID.toString(), payment_res['Amount'], payment_res['Fort_id'], payment_res['PaymentMethod'], context).then((res) { service.ER_createAdvancePayment(appo, widget.projectID.toString(), payment_res['Amount'], payment_res['Fort_id'], payment_res['PaymentMethod'], context).then((res) {
addAdvancedNumberRequest( addAdvancedNumberRequest(
Utils.isVidaPlusProject(projectViewModel, widget.projectID) Utils.isVidaPlusProject(projectViewModel, widget.projectID) ? res['ER_AdvancePaymentResponse']['AdvanceNumber_VP'].toString() : res['ER_AdvancePaymentResponse']['AdvanceNumber'].toString(),
? res['OnlineCheckInAppointments'][0]['AdvanceNumber_VP'].toString()
: res['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(),
paymentReference, paymentReference,
0, 0,
appo, appo,
@ -515,9 +513,10 @@ class _EROnlineCheckInPaymentDetailsState extends State<EROnlineCheckInPaymentDe
if (widget.isERBookAppointment) { if (widget.isERBookAppointment) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
AppToast.showSuccessToast(message: "Your appointment has been booked successfully. Please perform Check-In once you arrive at the hospital."); AppToast.showSuccessToast(message: "Your appointment has been booked successfully. Please perform Check-In once you arrive at the hospital.");
Navigator.pop(context); // Navigator.pop(context);
Navigator.pop(context); // Navigator.pop(context);
Navigator.pop(context); // Navigator.pop(context);
Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route<dynamic> r) => false);
} else { } else {
autoGenerateInvoiceER(paymentRes); autoGenerateInvoiceER(paymentRes);
} }

@ -167,7 +167,7 @@ class _InsuranceUpdateState extends State<InsuranceUpdate> with SingleTickerProv
Container( Container(
margin: EdgeInsets.only(top: 6.5, left: 2.0), margin: EdgeInsets.only(top: 6.5, left: 2.0),
child: Text( child: Text(
model.insuranceUpdate[index].statusDescription!, model.insuranceUpdate[index].statusDescription ?? "",
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -95,7 +95,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
MyRichText(TranslationBase.of(context).clinic + ":", model.appointmentDetails.projectName, projectViewModel.isArabic), MyRichText(TranslationBase.of(context).clinic + ":", model.appointmentDetails.projectName ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).date + ":", DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(model.appointmentDetails.appointmentDate)), MyRichText(TranslationBase.of(context).date + ":", DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(model.appointmentDetails.appointmentDate)),
projectViewModel.isArabic), projectViewModel.isArabic),
], ],

@ -143,7 +143,7 @@ class PayfortService extends BaseService {
String? customerName, String? customerName,
String? customerEmail, String? customerEmail,
String? orderDescription, String? orderDescription,
double? orderAmount, num? orderAmount,
String? merchantIdentifier, String? merchantIdentifier,
String? applePayAccessCode, String? applePayAccessCode,
String? applePayShaRequestPhrase, String? applePayShaRequestPhrase,

@ -45,7 +45,7 @@ class PayfortViewModel extends ChangeNotifier {
String? customerEmail, String? customerEmail,
String? orderDescription, String? orderDescription,
String? merchantReference, String? merchantReference,
double? orderAmount, num? orderAmount,
PayfortProjectDetailsRespModel? payfortProjectDetailsRespModel, PayfortProjectDetailsRespModel? payfortProjectDetailsRespModel,
SucceededCallback? onSuccess, SucceededCallback? onSuccess,
FailedCallback? onFailed, FailedCallback? onFailed,

Loading…
Cancel
Save