Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6

# Conflicts:
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/services/clinic_services/get_clinic_service.dart

lib/config/config.dart

@@ -346,7 +346,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 = 12.3;
+var VERSION_ID = 12.4;
 var SETUP_ID = '91877';
 var LANGUAGE = 2;
 // var  PATIENT_OUT_SA = 0;

lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart

@@ -278,7 +278,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
                         ),
                         mWidth(3),
                         Text(
-                          projectViewModel.user!.patientIdentificationNo!,
+                          projectViewModel.user.patientIdentificationNo!,
                           style: TextStyle(
                             fontWeight: FontWeight.w600,
                             fontSize: 12,
@@ -596,12 +596,15 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
               } else {
                 openPayment(selectedPaymentMethod, projectViewModel.user, double.parse(getTotalValue()), null, selectedInstallmentPlan);
               }
+            } else {
+              openPayment(selectedPaymentMethod, projectViewModel.user, double.parse(getTotalValue()), null, selectedInstallmentPlan);
             }
           },
           patientShare: double.parse(getTotalValue()),
           isFromAdvancePayment: !projectViewModel.havePrivilege(94),
         ));
   }
+
   void startApplePay() async {
     transID = Utils.getAdvancePaymentTransID(widget.projectID, projectViewModel.user.patientID!);
 
@@ -764,8 +767,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
       if (res["status"].toString().toLowerCase() == "success") {
         updateTamaraRequestStatus("success", "14", orderID, tamaraOrderID!, int.parse(this.selectedInstallmentPlan!), appo);
       } else {
-        updateTamaraRequestStatus("Failed", "00", Utils.getAppointmentTransID(appo.projectID!, appo.clinicID!, appo.appointmentNo!), tamaraOrderID != null ? tamaraOrderID! : "",
+        updateTamaraRequestStatus("Failed", "00", transID, tamaraOrderID != null ? tamaraOrderID! : "", int.parse(this.selectedInstallmentPlan!), appo);
-            int.parse(this.selectedInstallmentPlan!), appo);
       }
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
@@ -815,10 +817,6 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
   createAdvancePayment(res, AppoitmentAllHistoryResultList appo) {
     DoctorsListService service = new DoctorsListService();
     String paymentReference = res['Fort_id'].toString();
-    // List<AncillaryOrdersProcedureList> ancillaryOrdersProcedureList = [];
-    // selectedProcList.forEach((element) {
-    //   ancillaryOrdersProcedureList.add(new AncillaryOrdersProcedureList(procedureID: num.parse(element.procedureID), procedureDescription: element.procedureName));
-    // });
     service.HIS_createAdvancePayment(appo, widget.projectID.toString(), res['Amount'], res['Fort_id'], res['PaymentMethod'], projectViewModel.user.patientType,
             projectViewModel.user.firstName! + " " + projectViewModel.user.lastName!, projectViewModel.user.patientID, localContext,
             isAncillaryOrder: true)
@@ -837,6 +835,17 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
     });
   }
 
+  addAdvancedNumberRequest(String advanceNumber, String paymentReference, dynamic appointmentID, AppoitmentAllHistoryResultList appo) {
+    DoctorsListService service = new DoctorsListService();
+    service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, localContext).then((res) {
+      autoGenerateInvoice();
+    }).catchError((err) {
+      GifLoaderDialogUtils.hideDialog(localContext);
+      AppToast.showErrorToast(message: err.toString());
+      print(err);
+    });
+  }
+
   autoGenerateInvoice() {
     List<dynamic> selectedProcListAPI = [];
 
@@ -861,17 +870,6 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
     });
   }
 
-
-  addAdvancedNumberRequest(String advanceNumber, String paymentReference, dynamic appointmentID, AppoitmentAllHistoryResultList appo) {
-    DoctorsListService service = new DoctorsListService();
-    service.addAdvancedNumberRequest(advanceNumber, paymentReference, appointmentID, localContext).then((res) {
-      autoGenerateInvoice();
-    }).catchError((err) {
-      GifLoaderDialogUtils.hideDialog(localContext);
-      AppToast.showErrorToast(message: err.toString());
-      print(err);
-    });
-  }
   showAlertDialog(dynamic invoiceNo, dynamic projectID) {
     AlertDialogBox(
         context: context,

lib/pages/BookAppointment/DentalComplaints.dart

@@ -264,7 +264,8 @@ class _DentalComplaintsState extends State<DentalComplaints> {
     getLanguageID();
     hasDentalPlan = false;
     ClinicListService service = new ClinicListService();
-    service.getChiefComplaintsList(widget.searchInfo.ClinicID!, widget.searchInfo.ProjectID!, languageID,  context).then((res) {
+    int? patientID = projectViewModel.isLogin ? projectViewModel.user.patientID : -1;
+    service.getChiefComplaintsList(patientID!, widget.searchInfo.ClinicID!, widget.searchInfo.ProjectID!, languageID, false, context).then((res) {
       GifLoaderDialogUtils.hideDialog(context);
       if (res['MessageStatus'] == 1) {
         setState(() {

lib/pages/MyAppointments/MyAppointments.dart

@@ -333,6 +333,10 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
     //Merging Booked & Confirmed Appointments into Upcoming Tab
     _patientBookedAndConfirmedAppointmentListHospital.addAll(_patientBookedAppointmentListHospital);
     _patientBookedAndConfirmedAppointmentListClinic.addAll(_patientBookedAppointmentListClinic);
+
+    _patientBookedAndConfirmedAppointmentListHospital.addAll(_patientConfirmedAppointmentListHospital);
+    _patientBookedAndConfirmedAppointmentListClinic.addAll(_patientConfirmedAppointmentListClinic);
+
   }
 
   openAppointmentsTab() async {
@@ -359,7 +363,8 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
   }
 
   Widget getBookedAppointments() {
-    return _getAppointment(bookedAppoList.length, (filterType == FilterType.Clinic) ? _patientBookedAppointmentListClinic : _patientBookedAppointmentListHospital);
+    // return _getAppointment(bookedAppoList.length, (filterType == FilterType.Clinic) ? _patientBookedAppointmentListClinic : _patientBookedAppointmentListHospital);
+    return Container();
   }
 
   Widget getBookedAndConfirmedAppointments() {

lib/services/clinic_services/get_clinic_service.dart

@@ -64,7 +64,7 @@ class ClinicListService extends BaseService {
     return Future.value(localRes);
   }
 
-  Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, BuildContext context, {doctorId}) async {
+  Future<Map> getChiefComplaintsList(int patientID, int clinicID, int projectID, int languageID, bool isContinueDentalPlan, BuildContext context, {doctorId}) async {
     //Utils.showProgressDialog(context);
     Map<String, dynamic> request;
 
@@ -89,8 +89,8 @@ class ClinicListService extends BaseService {
       "SessionID": null,
       "isDentalAllowedBackend": true,
       "DeviceTypeID": 1,
-      "PatientID": 1,
+      "PatientID": patientID,
-      "ContinueDentalPlan": true,
+      "ContinueDentalPlan": isContinueDentalPlan,
       "IsSearchAppointmnetByClinicID": false,
       "DateofBirth": authUser.dateofBirth
     };