57 Commits (c9be715436cb8f98f2ff6c1439b9af1b5a0e1ff6)

Author	SHA1	Message	Date
Sultan khan	c9be715436	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # lib/config/config.dart # lib/config/localized_values.dart # lib/core/service/client/base_app_client.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/Blood/blood_donation.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/pages/MyAppointments/widgets/AppointmentActions.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/livecare/widgets/clinic_list.dart # lib/pages/medical/balance/confirm_payment_page.dart	2 years ago
haroon amjad	7b181192f6	Apple Pay updates	2 years ago
Sultan khan	eee2ccf148	updates	2 years ago
Aamir Muhammad	b6d222a7ea	JIRA Fixes	2 years ago
Sultan khan	0e04012219	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	2 years ago
Sultan khan	a4ed832147	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # lib/config/config.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/Covid-DriveThru/covid-payment-summary.dart # lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart # lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart # lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart # lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart # lib/pages/ErService/OrderLogPage.dart # lib/pages/ErService/rapid-response-team/rrt-request-page.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/livecare/widgets/clinic_list.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/services/payfort_services/payfort_service.dart # lib/services/payfort_services/payfort_view_model.dart # lib/splashPage.dart # pubspec.yaml	2 years ago
haroon amjad	e0ae8d7c8e	Updates & fixes	2 years ago
haroon amjad	46ad672649	Apple Pay fixes	2 years ago
Sultan khan	6983e309e0	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # android/build.gradle # android/gradle.properties # ios/Runner.xcodeproj/project.pbxproj # lib/config/config.dart # lib/core/model/prescriptions/prescription_report_inp.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/BookAppointment/DentalComplaints.dart # lib/pages/BookAppointment/DoctorProfile.dart # lib/pages/BookAppointment/components/DocAvailableAppointments.dart # lib/pages/BookAppointment/widgets/DoctorView.dart # lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/livecare/widgets/clinic_list.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/services/appointment_services/GetDoctorsList.dart # lib/services/clinic_services/get_clinic_service.dart # pubspec.yaml	2 years ago
Sultan khan	90dc8e5e05	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # lib/core/service/client/base_app_client.dart # lib/main.dart # lib/models/LiveCare/ApplePayInsertRequest.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/livecare/widgets/clinic_list.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/services/appointment_services/GetDoctorsList.dart # lib/uitl/gif_loader_dialog_utils.dart # lib/uitl/location_util.dart # pubspec.yaml	2 years ago
haroon amjad	9043e3c687	Apple Pay Updates	2 years ago
haroon amjad	d3bdcfa975	Apple Pay code merged into main branch	2 years ago
haroon amjad	ec0bed04d3	Apple Pay in production implemented & tested	2 years ago
devamirsaleemahmad	2def9f3744	Merges From 3.3	2 years ago
devamirsaleemahmad	d73cc13100	Merge branch 'development_v3.3' into dev_v3.13.6 ... # Conflicts: # lib/config/config.dart # lib/core/service/client/base_app_client.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/BookAppointment/QRCode.dart # lib/pages/MyAppointments/widgets/AppointmentActions.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/landing/fragments/home_page_fragment2.dart # lib/splashPage.dart # lib/uitl/utils.dart	2 years ago
haroon amjad	1ecb8ebfe9	updated to stores version 11.3	2 years ago
devamirsaleemahmad	23b7d85911	changes	2 years ago
devamirsaleemahmad	4231c85055	Merge branch 'development_v3.3' into dev_v3.13.6 ... # Conflicts: # lib/config/config.dart # lib/core/model/labs/patient_lab_orders.dart # lib/core/model/labs/request_patient_lab_special_result.dart # lib/core/model/labs/request_send_lab_report_email.dart # lib/core/model/privilege/VidaPlusProjectListModel.dart # lib/core/model/radiology/final_radiology.dart # lib/core/model/radiology/request_send_rad_report_email.dart # lib/core/service/client/base_app_client.dart # lib/core/service/medical/labs_service.dart # lib/core/service/medical/radiology_service.dart # lib/core/service/privilege_service.dart # lib/core/viewModels/medical/labs_view_model.dart # lib/core/viewModels/medical/radiology_view_model.dart # lib/core/viewModels/project_view_model.dart # lib/models/anicllary-orders/ancillary_order_list_model.dart # lib/models/anicllary-orders/ancillary_orders_proc_list.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/Blood/confirm_payment_page.dart # lib/pages/BookAppointment/BookConfirm.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/BookAppointment/QRCode.dart # lib/pages/Covid-DriveThru/covid-payment-summary.dart # lib/pages/MyAppointments/MyAppointments.dart # lib/pages/MyAppointments/widgets/AppointmentActions.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/feedback/send_feedback_page.dart # lib/pages/insurance/insurance_update_screen.dart # lib/pages/login/login.dart # lib/pages/medical/ask_doctor/doctor_response.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/pages/medical/balance/my_balance_page.dart # lib/pages/medical/labs/laboratory_result_page.dart # lib/pages/medical/radiology/radiology_details_page.dart # lib/pages/medical/radiology/radiology_home_page.dart # lib/pages/paymentService/payment_service.dart # lib/splashPage.dart # lib/uitl/utils.dart # lib/widgets/bottom_navigation/bottom_navigation_item.dart # lib/widgets/data_display/medical/LabResult/FlowChartPage.dart # lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart # lib/widgets/data_display/medical/doctor_card.dart # lib/widgets/data_display/medical/medical_profile_item.dart # pubspec.yaml	2 years ago
haroon amjad	a5e0de08ce	updates for ancillary	2 years ago
devamirsaleemahmad	9c2948db29	models updates -> 3.13.6	2 years ago
Sultan khan	b45cbbcf29	updates	2 years ago
haroon amjad	4e962bda07	Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3 ... # Conflicts: # lib/config/config.dart # lib/core/model/labs/request_send_lab_report_email.dart # lib/core/service/medical/ask_doctor_services.dart # lib/core/service/medical/labs_service.dart # lib/core/viewModels/medical/labs_view_model.dart # lib/pages/conference/web_rtc/call_home_page_.dart # lib/pages/medical/labs/laboratory_result_page.dart # lib/pages/medical/patient_sick_leave_page.dart # lib/pages/webRTC/call_page.dart # lib/pages/webRTC/signaling.dart # lib/services/appointment_services/GetDoctorsList.dart # lib/uitl/LocalNotification.dart # lib/uitl/SignalRUtil.dart # lib/uitl/utils.dart # lib/widgets/others/floating_button_search.dart	2 years ago
haroon amjad	a58e4452b8	ancillary changes	2 years ago
haroon amjad	75685b1f61	Project selection added in Laser & advance payment	2 years ago
haroon amjad	3e63d80655	Ancillary order updates	2 years ago
haroon amjad	b337343df3	Project ID fix in ancillary orders	2 years ago
haroon amjad	f28fcbd006	AdvanceNumber_VP added	2 years ago
haroon amjad	63426a691d	Ancillary orders family members issue resolved	3 years ago
haroon amjad	5045cc6faa	Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices	3 years ago
haroon amjad	74b0acefd3	Updates & fixes	3 years ago
haroon amjad	22a0e456bc	Manual Insurance Updates, Service ID fixes, Tamara Fixes	3 years ago
haroon amjad	e80ac2481a	Ancillary order & manual insurance update	3 years ago
haroon amjad	e03412214e	Ambulance request fixes	3 years ago
haroon amjad	dfa88b7de7	Updates, fixes & release VersionID 9.1	3 years ago
haroon amjad	21cf9da900	HMS Core & LiveCare Schedule fixes	3 years ago
haroon amjad	eb3f5b5cb5	Updates & fixes	3 years ago
haroon amjad	27c6837f25	updates & fixes	3 years ago
haroon amjad	c3538ebdb6	Updates & fixes	3 years ago
haroon amjad	f8b3847d0a	Ancillary Orders completed	4 years ago
haroon amjad	efced34ffa	Updates	4 years ago
haroon amjad	0acc134e6e	Updates & fixes	4 years ago
haroon amjad	693f8cb090	Updates & fixes	4 years ago
haroon amjad	4acdad0e99	fixes & updates	4 years ago
haroon amjad	40d649dfa4	Updates & fixes	4 years ago
haroon amjad	7467da7409	Imports organized	4 years ago
Sultan Khan	c6404a2a0b	tracker services	4 years ago
Sikander Saleem	bb18645d85	Merge branch 'development' into development_new_design_2.0 ... # Conflicts: # lib/config/localized_values.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/MyAppointments/AppointmentDetails.dart # lib/pages/landing/landing_page.dart # lib/pages/medical/medical_profile_page.dart # lib/uitl/translations_delegate_base.dart	4 years ago
Sultan Khan	9e31a3c560	bug fixes	4 years ago
Sikander Saleem	5ab9dd1761	Appointment screen Changes & improvements.	4 years ago
haroon amjad	3f29bbd6b3	Updates & fixes	4 years ago