diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index fc489d8e..1bf2bd9c 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1881,6 +1881,6 @@ const Map localizedValues = { "pharmaLiveCareScanQR1": {"en": "Scan the QR Code in the booth to make the connection", "ar": "امسح رمز الاستجابة السريعة في المقصورة لإجراء الاتصال"}, "pharmaLiveCareMakePayment": {"en": "Make Payment Online", "ar": "قم بالدفع عبر الإنترنت"}, "pharmaLiveCareMakePayment1": {"en": "Make the payment through the mobile app", "ar": "قم بالدفع من خلال تطبيق الهاتف المحمول"}, - "pharmaLiveCareJoinConsultation": {"en": "Join the virtual consultation from booth", "ar": "انضم إلى الاستشارة الافتراضية من الكشك"}, - "pharmaLiveCareJoinConsultation1": {"en": "Wait for the doctor in the pharma booth to join you", "ar": "انتظر حتى ينضم إليك الطبيب في كابينة لايف كير الصيدلية"}, + "pharmaLiveCareJoinConsultation": {"en": "Join the virtual consultation from booth", "ar": "انضم إلى الاستشارة الافتراضية من الكبينة"}, + "pharmaLiveCareJoinConsultation1": {"en": "Wait for the doctor in the pharma booth to join you", "ar": "انتظر حتى ينضم إليك الطبيب في كبينة لايف كير الصيدلية"}, }; \ No newline at end of file diff --git a/lib/pages/livecare/live_care_payment_page.dart b/lib/pages/livecare/live_care_payment_page.dart index 2f998818..c21a293c 100644 --- a/lib/pages/livecare/live_care_payment_page.dart +++ b/lib/pages/livecare/live_care_payment_page.dart @@ -50,6 +50,10 @@ class _LiveCarePatmentPageState extends State { showNewAppBarTitle: true, showNewAppBar: true, description: TranslationBase.of(context).erConsultation, + onTap: () { + Navigator.pop(context); + Navigator.pop(context); + }, body: Container( width: double.infinity, height: double.infinity, @@ -326,6 +330,12 @@ class _LiveCarePatmentPageState extends State { ); } + @override + void dispose() { + cancelAPI(); + super.dispose(); + } + Future askVideoCallPermission() async { if (Platform.isIOS) { if (!(await Permission.camera.request().isGranted) || !(await Permission.microphone.request().isGranted) || !(await Permission.location.request().isGranted)) { @@ -339,7 +349,10 @@ class _LiveCarePatmentPageState extends State { title: TranslationBase.of(context).covidConsentHeader, message: TranslationBase.of(context).liveCarePermissions, onTap: () async { - if (!(await Permission.notification.request().isGranted) || !(await Permission.camera.request().isGranted) || !(await Permission.microphone.request().isGranted) || !(await Permission.location.request().isGranted)) { + if (!(await Permission.notification.request().isGranted) || + !(await Permission.camera.request().isGranted) || + !(await Permission.microphone.request().isGranted) || + !(await Permission.location.request().isGranted)) { return false; } }, diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 987955c7..359368c0 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/models/LiveCare/LiveCareClinicsListResponse import 'package:diplomaticquarterapp/models/LiveCare/LiveCareScheduleClinicsListResponse.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/ToDoList/payment_method_select.dart'; +import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_scheduling/schedule_clinic_card.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_type_select.dart'; @@ -195,7 +196,15 @@ class _clinic_listState extends State { } showLiveCarePaymentDialog(GetERAppointmentFeesList getERAppointmentFeesList, int waitingTime) { - navigateTo(context, LiveCarePatmentPage(getERAppointmentFeesList: getERAppointmentFeesList, waitingTime: waitingTime, clinicName: selectedClinicName, isPharmaLiveCare: widget.isPharmacyLiveCare, pharmaLiveCareClientID: widget.pharmacyLiveCareQRCode)).then( + navigateTo( + context, + LiveCarePatmentPage( + getERAppointmentFeesList: getERAppointmentFeesList, + waitingTime: waitingTime, + clinicName: selectedClinicName, + isPharmaLiveCare: widget.isPharmacyLiveCare, + pharmaLiveCareClientID: widget.pharmacyLiveCareQRCode)) + .then( (value) { if (value) { if (getERAppointmentFeesList.total == "0" || getERAppointmentFeesList.total == "0.0") { @@ -464,6 +473,11 @@ class _clinic_listState extends State { AppToast.showErrorToast(message: res['Response_Message']); projectViewModel.analytics.liveCare.livecare_immediate_consultation_payment_failed( appointment_type: 'livecare', payment_type: 'appointment', payment_method: selectedPaymentMethod, txn_amount: this.amount, txn_currency: currency, error_message: res['Response_Message']); + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute(builder: (context) => LandingPage()), + (Route route) => false, + ); } }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); diff --git a/pubspec.yaml b/pubspec.yaml index d472d9cc..58dc042c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.5.014+4050014 +version: 4.5.015+4050015 environment: sdk: ">=2.7.0 <3.0.0"