diff --git a/ios/Podfile b/ios/Podfile
index 264db98d..5495f0ca 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -48,7 +48,7 @@ post_install do |installer|
'PERMISSION_CAMERA=1',
'PERMISSION_MICROPHONE=1',
## dart: PermissionGroup.calendar
- 'PERMISSION_EVENTS=1',
+ 'PERMISSION_EVENTS_FULL_ACCESS=1',
## dart: PermissionGroup.reminders
'PERMISSION_REMINDERS=1',
]
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 65a0bf75..43474d39 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -59,6 +59,10 @@
This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
NSCalendarsUsageDescription
This app requires calendar access to set reminders for Virtual & Normal Appointments.
+ NSCalendarsWriteOnlyAccessUsageDescription
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
+ NSCalendarsFullAccessUsageDescription
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
NSCameraUsageDescription
This app requires camera access to enable virtual consultation between patient & doctor
NSContactsUsageDescription
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 24d6c620..3b774575 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -21,14 +21,16 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/';
var BASE_URL = 'https://uat.hmgwebservices.com/';
- //var BASE_URL = 'https://hmgwebservices.com/';
+// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://webservices.hmg.com/';
-// Pharmacy UAT URLsProductDetailService
+// var BASE_URL = 'http://10.50.100.198:4422/';
+
+// Pharmacy UAT URLs
// var BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// var PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -36,6 +38,8 @@ var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
var BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
+var PHARMACY_REDIRECT_URL = 'https://bit.ly/AlhabibPharmacy';
+
// Pharmacy VidaPlus URLs
// var BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapitest/api/';
// var PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapitest/api/';
@@ -335,7 +339,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 11.1;
+var VERSION_ID = 11.3;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 63619f59..3f3074d3 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1901,4 +1901,6 @@ const Map localizedValues = {
"habibCallCenter": {"en": "Please contact AlHabib call center to update your insurance manually.", "ar": "يرجى الاتصال بمركز اتصال الحبيب لتحديث التأمين الخاص بك يدوياً."},
"cashAmountUpdateInsurance": {"en": "Please note that this is the cash amount, If you want to update your insurance, Please tap below:", "ar": "يرجى ملاحظة أن هذا هو المبلغ النقدي، إذا كنت ترغب في تحديث التأمين الخاص بك، يرجى النقر أدناه:"},
"validInsurance": {"en": "Do you have a valid insurance?", "ar": "هل لديك تأمين صالح؟"},
+ "checkInViaLocation": {"en": "Check-In Via Location", "ar": "تسجيل الوصول عبر الموقع"},
+ "locationCheckInError": {"en": "Please make sure that you're within the hospital location to perform online check-in.", "ar": "يرجى التأكد من تواجدك داخل موقع المستشفى لإجراء تسجيل الوصول عبر الإنترنت."},
};
\ No newline at end of file
diff --git a/lib/core/model/privilege/ProjectDetailListModel.dart b/lib/core/model/privilege/ProjectDetailListModel.dart
new file mode 100644
index 00000000..782c376b
--- /dev/null
+++ b/lib/core/model/privilege/ProjectDetailListModel.dart
@@ -0,0 +1,32 @@
+class ProjectDetailListModel {
+ int? projectID;
+ String? latitude;
+ String? longitude;
+ int? geofenceRadius;
+ String? checkInQrCode;
+
+ ProjectDetailListModel(
+ {this.projectID,
+ this.latitude,
+ this.longitude,
+ this.geofenceRadius,
+ this.checkInQrCode});
+
+ ProjectDetailListModel.fromJson(Map json) {
+ projectID = json['ProjectID'];
+ latitude = json['Latitude'];
+ longitude = json['Longitude'];
+ geofenceRadius = json['GeofenceRadius'];
+ checkInQrCode = json['CheckInQrCode'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['ProjectID'] = this.projectID;
+ data['Latitude'] = this.latitude;
+ data['Longitude'] = this.longitude;
+ data['GeofenceRadius'] = this.geofenceRadius;
+ data['CheckInQrCode'] = this.checkInQrCode;
+ return data;
+ }
+}
diff --git a/lib/core/service/ancillary_orders_service.dart b/lib/core/service/ancillary_orders_service.dart
index a9608682..99babdfd 100644
--- a/lib/core/service/ancillary_orders_service.dart
+++ b/lib/core/service/ancillary_orders_service.dart
@@ -54,15 +54,18 @@ class AncillaryOrdersService extends BaseService {
return Future.value(localRes);
}
- Future getOrdersDetails(appointmentNo, orderNo, projectID) async {
+ Future