Commit Graph

764 Commits (d865bd9c3b514ae81e063aedbc56cfe8a9f7e1cc)

Author SHA1 Message Date
haroon amjad 889828d4d4 Lab report download VIDA Plus implementation 11 months ago
haroon amjad 8b74c9df61 updates 11 months ago
haroon amjad 1080a59106 Lab report download enabled 11 months ago
Haroon Amjad 2c5be020e9 LanguageID added in Lab Report Email API 11 months ago
haroon amjad f74a3301da SAR new symbol integrated 11 months ago
Haroon Amjad 04413aa7d6 lab report updates 11 months ago
haroon amjad d98f2c31a2 updates 11 months ago
haroon amjad 780f645cbe Updates & fixes, CR 6038 Ask Dr changes implemented 12 months ago
Haroon Amjad a31c677919 invoice type check added 1 year ago
haroon amjad 0e73d6d23e updates 1 year ago
haroon amjad baa7790b89 Patient occupation selection implemented 1 year ago
haroon amjad cfcba179c4 CR 7241 Lab result enhancement code merged 1 year ago
haroon amjad 1561a776e3 Merge branch 'dev_v3.13.6' into dev_3.13.6_Development
# Conflicts:
#	lib/config/config.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInBookAppointment.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInHome.dart
#	lib/pages/ErService/EROnlineCheckIn/EROnlineCheckInPaymentDetails.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/services/clinic_services/get_clinic_service.dart
1 year ago
haroon amjad cd7da0dd70 Penguin SDK changes & crashlytics 1 year ago
haroon amjad c58cbae99c InPatient prescription send email issue fixed 1 year ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 1 year ago
haroon amjad 3d44aa2e64 Sickleave updates 1 year ago
haroon amjad 605f02afe2 Sickleave CR updates & changes 1 year ago
haroon amjad 073cb9f7e8 Update to stores 16.5:
1. Indoor navigation
2. Walkin Appointment
3. Derma Package
4. NPHIES Eligibility
1 year ago
Haroon Amjad 057994dfd2 Merge branch 'dev_3.13.6_CR6750' of http://34.17.75.184/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 8862cc6c06 Release issues resolved 1 year ago
haroon amjad db91921de1 update to stores version 16.3 1 year ago
haroon amjad a5d68bf470 update 1 year ago
haroon amjad d3d8d1f121 Update to stores 16.0 1 year ago
haroon amjad d65325f998 Payment flow integration for Walk-In appointments 1 year ago
haroon amjad 1094d297f4 Update to stores 15.9 2 years ago
haroon amjad 8edf65daf1 Updates & Fixes 2 years ago
haroon amjad 5b7b40c732 Updates & fixes 2 years ago
Aamir.Muhammad d9cf383648 Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
2 years ago
haroon amjad 3a65113149 Update to stores 15.7 2 years ago
Sultan khan 21e4bb5138 error code 699 fixes 2 years ago
haroon amjad 9c957741b4 medical report fix 2 years ago
Aamir.Muhammad 8441a0ef00 Merge remote-tracking branch 'origin/development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/pages/login/login.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/services/clinic_services/get_clinic_service.dart
#	lib/uitl/utils.dart
#	lib/widgets/dialogs/radio_selection_dialog.dart
2 years ago
haroon amjad 96d5c3ce1d My Instructions added 2 years ago
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 69e64fd5fb Blood Donation CR merged into dev_3.3 2 years ago
haroon amjad f8e7ccf73f updates 2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
haroon amjad 727a9f1363 updates & checks 2 years ago
Aamir Muhammad b6d222a7ea JIRA 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
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad eb1bddf772 updates 2 years ago
haroon amjad bbc42bd1e7 updates 2 years ago
haroon amjad fe7c2c6873 CR 6631 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago