From 9d444ccca3ff53f5977a65441cf6c1928879cc13 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Thu, 14 Nov 2024 12:04:06 +0300 Subject: [PATCH] updates --- ios/Podfile | 2 +- ios/Runner/AppDelegate.swift | 2 +- lib/pages/conference/zoom/call_screen.dart | 2 +- lib/pages/livecare/widgets/clinic_list.dart | 2 +- lib/services/livecare_services/livecare_provider.dart | 5 +++-- lib/services/payfort_services/payfort_service.dart | 6 +++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 5495f0ca..2350b703 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '13.0' +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index d8e5e0f6..a017aeea 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -4,7 +4,7 @@ import GoogleMaps var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { let locationManager = CLLocationManager() var flutterViewController:MainFlutterVC! diff --git a/lib/pages/conference/zoom/call_screen.dart b/lib/pages/conference/zoom/call_screen.dart index 2ba0e49e..f92c42b9 100644 --- a/lib/pages/conference/zoom/call_screen.dart +++ b/lib/pages/conference/zoom/call_screen.dart @@ -472,7 +472,7 @@ class _CallScreenState extends State { ], ), ); - if (errorType == Errors.SessionJoinFailed || errorType == Errors.SessionDisconncting) { + if (errorType == Errors.SessionJoinFailed) { Timer( const Duration(milliseconds: 1000), () => Navigator.pop(context), diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 9b6bac94..f7c60e0e 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -604,7 +604,7 @@ class _clinic_listState extends State { LiveCareService service = new LiveCareService(); int languageID = projectViewModel.isArabic ? 1 : 2; GifLoaderDialogUtils.showMyDialog(context); - service.addNewCallForPatientER(selectedClinicID, clientRequestID, languageID, widget.isPharmacyLiveCare, context).then((res) { + service.addNewCallForPatientER(selectedClinicID, clientRequestID, selectedCallType, languageID, widget.isPharmacyLiveCare, context).then((res) { GifLoaderDialogUtils.hideDialog(context); AppToast.showSuccessToast(message: "New Call has been added successfully"); widget.getLiveCareHistory(); diff --git a/lib/services/livecare_services/livecare_provider.dart b/lib/services/livecare_services/livecare_provider.dart index 7610b969..43547056 100644 --- a/lib/services/livecare_services/livecare_provider.dart +++ b/lib/services/livecare_services/livecare_provider.dart @@ -209,7 +209,7 @@ class LiveCareService extends BaseService { return Future.value(localRes); } - Future addNewCallForPatientER(int serviceID, String clientRequestID, int languageID, bool isPharma, BuildContext context) async { + Future addNewCallForPatientER(int serviceID, String clientRequestID, int callTypeID, int languageID, bool isPharma, BuildContext context) async { Map request; String? deviceToken; @@ -240,7 +240,8 @@ class LiveCareService extends BaseService { "PatientID": authUser.patientID != null ? authUser.patientID : 0, "Gender": authUser.gender != null ? authUser.gender : 0, "LanguageID": languageID, - "IsVoip": Platform.isIOS ? true : false + "IsVoip": Platform.isIOS ? true : false, + "CallTypeID": callTypeID }; dynamic localRes; diff --git a/lib/services/payfort_services/payfort_service.dart b/lib/services/payfort_services/payfort_service.dart index 5dba1b46..64a015cd 100644 --- a/lib/services/payfort_services/payfort_service.dart +++ b/lib/services/payfort_services/payfort_service.dart @@ -54,7 +54,7 @@ class PayfortService extends BaseService { "Pat_Token": result.tokenName, "IsRefund": false, "RemmeberMe": false, - "Reconciliation_Reference": result.reconciliationReference, + // "Reconciliation_Reference": result.reconciliationReference, "LanguageID": 1, "PatientID": patientID }; @@ -161,7 +161,7 @@ class PayfortService extends BaseService { ); if (sdkTokenResponse != null && sdkTokenResponse.sdkToken == null) { - onFailed!(sdkTokenResponse.responseMessage ?? ''); + onFailed!((sdkTokenResponse.responseMessage ?? '') as PayFortFailureResult); return; } @@ -189,7 +189,7 @@ class PayfortService extends BaseService { ), ); } catch (e) { - onFailed!(e.toString()); + onFailed!(e.toString() as PayFortFailureResult); } } }