diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7b48db28..de2d325c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -50,6 +50,8 @@ android:showOnLockScreen="true" android:screenOrientation="sensorPortrait" android:allowBackup="false" + android:extractNativeLibs="true" + tools:replace="android:extractNativeLibs" android:label="Dr. Alhabib"> diff --git a/lib/config/config.dart b/lib/config/config.dart index 4acc7fe4..ec5d650c 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -668,10 +668,10 @@ var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification' //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -// var payFortEnvironment = FortEnvironment.production; -// var applePayMerchantId = "merchant.com.hmgwebservices"; -var payFortEnvironment = FortEnvironment.test; -var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +var payFortEnvironment = FortEnvironment.production; +var applePayMerchantId = "merchant.com.hmgwebservices"; +// var payFortEnvironment = FortEnvironment.test; +// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart index 8aab4694..a2940ce8 100644 --- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart +++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart @@ -395,6 +395,7 @@ class _DocAvailableAppointmentsState extends State wit GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { if (res['PatientER_DoctorFreeSlots'].length != 0) { + DocAvailableAppointments.initialSlotDuration = res['InitialSlotDuration']; DocAvailableAppointments.areAppointmentsAvailable = true; freeSlotsResponse = res['PatientER_DoctorFreeSlots']; _getJSONSlots().then((value) => { diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart index c33ef215..55715445 100644 --- a/lib/pages/livecare/incoming_call.dart +++ b/lib/pages/livecare/incoming_call.dart @@ -217,14 +217,14 @@ class _IncomingCallState extends State with SingleTickerProviderSt player.stop(); changeCallStatusAPI(4); - if (widget.incomingCallData!.background == "0") { + if (widget.incomingCallData!.background == "0") { // Zoom Call Page // Navigator.of(context).pop(); Navigator.pushReplacementNamed( context, "zoom_call_page", arguments: CallArguments(widget.incomingCallData!.sessionId!, "123", "Patient", "40", "0", false), ); - } else { + } else { // OpenTok Call Page await Navigator.of(context).pushReplacement( MaterialPageRoute( // fullscreenDialog: true, diff --git a/lib/uitl/CalendarUtils.dart b/lib/uitl/CalendarUtils.dart index be78a0c1..57ec961a 100644 --- a/lib/uitl/CalendarUtils.dart +++ b/lib/uitl/CalendarUtils.dart @@ -110,8 +110,8 @@ class CalendarUtils { // print("writableCalendars-name: " + writableCalendars.name); // print("writableCalendars-Id: " + writableCalendars.id); - print("writableCalendarsToString: " + writableCalendars.toString()); - print("writableCalendarsToString: " + writableCalendars!.id!); + // print("writableCalendarsToString: " + writableCalendars.toString()); + // print("writableCalendarsToString: " + writableCalendars!.id!); Event event = Event( writableCalendars!.id, start: scheduleDateTimeUTZ, diff --git a/pubspec.yaml b/pubspec.yaml index fce8d6b0..58f48afc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: diplomaticquarterapp description: A new Flutter application. -version: 4.5.054+4050054 +version: 4.5.055+4050055 environment: sdk: ">=3.0.0 <3.13.0"