diff --git a/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart b/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart index 9cfe88ea..884c2e0c 100644 --- a/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart +++ b/lib/models/Clinics/EROnlineCheckInPaymentDetailsResponse.dart @@ -11,8 +11,8 @@ class EROnlineCheckInPaymentDetailsResponse { String? message; String? patientCardID; num? patientShare; - double? patientShareWithTax; - double? patientTaxAmount; + num? patientShareWithTax; + num? patientTaxAmount; int? policyId; String? policyName; String? procedureId; diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart index 3f1c3c49..b3da67e1 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart @@ -441,6 +441,7 @@ class _EROnlineCheckInHomePageState extends State with ancillaryOrdersService.checkPatientERClinicBalanceAmount(10).then((response) { print(response["BalanceAmount"]); isPatientArrived = response['BalanceAmount'] > 0; + // isPatientArrived = false; GifLoaderDialogUtils.hideDialog(context); // erOnlineCheckInPaymentDetailsResponse = EROnlineCheckInPaymentDetailsResponse.fromJson(response["ResponsePatientShare"]); setState(() {}); diff --git a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart index bffdb91b..08cc78f4 100644 --- a/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart +++ b/lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart @@ -472,9 +472,7 @@ class _EROnlineCheckInPaymentDetailsState extends State LandingPage()), (Route r) => false); } else { autoGenerateInvoiceER(paymentRes); } diff --git a/lib/pages/insurance/insurance_update_screen.dart b/lib/pages/insurance/insurance_update_screen.dart index 191170ef..4c4d5686 100644 --- a/lib/pages/insurance/insurance_update_screen.dart +++ b/lib/pages/insurance/insurance_update_screen.dart @@ -167,7 +167,7 @@ class _InsuranceUpdateState extends State with SingleTickerProv Container( margin: EdgeInsets.only(top: 6.5, left: 2.0), child: Text( - model.insuranceUpdate[index].statusDescription!, + model.insuranceUpdate[index].statusDescription ?? "", style: TextStyle( fontSize: 10, fontWeight: FontWeight.w600, diff --git a/lib/pages/rateAppointment/rate_appointment_clinic.dart b/lib/pages/rateAppointment/rate_appointment_clinic.dart index 3f61f3e9..44484373 100644 --- a/lib/pages/rateAppointment/rate_appointment_clinic.dart +++ b/lib/pages/rateAppointment/rate_appointment_clinic.dart @@ -95,7 +95,7 @@ class _RateAppointmentClinicState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - 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)), projectViewModel.isArabic), ], diff --git a/lib/services/payfort_services/payfort_service.dart b/lib/services/payfort_services/payfort_service.dart index 4cc203e2..a1bbccd8 100644 --- a/lib/services/payfort_services/payfort_service.dart +++ b/lib/services/payfort_services/payfort_service.dart @@ -143,7 +143,7 @@ class PayfortService extends BaseService { String? customerName, String? customerEmail, String? orderDescription, - double? orderAmount, + num? orderAmount, String? merchantIdentifier, String? applePayAccessCode, String? applePayShaRequestPhrase, diff --git a/lib/services/payfort_services/payfort_view_model.dart b/lib/services/payfort_services/payfort_view_model.dart index 17f739db..29a79f14 100644 --- a/lib/services/payfort_services/payfort_view_model.dart +++ b/lib/services/payfort_services/payfort_view_model.dart @@ -45,7 +45,7 @@ class PayfortViewModel extends ChangeNotifier { String? customerEmail, String? orderDescription, String? merchantReference, - double? orderAmount, + num? orderAmount, PayfortProjectDetailsRespModel? payfortProjectDetailsRespModel, SucceededCallback? onSuccess, FailedCallback? onFailed,