Commit Graph

3384 Commits (dev_v3.13.6)
 

Author SHA1 Message Date
haroon amjad 7b181192f6 Apple Pay updates 8 months ago
Aamir Muhammad e18ba6822a changes local 8 months ago
Aamir Muhammad 660ec3a207 changes local 8 months ago
Aamir Muhammad 52a5e978a7 changes local 8 months ago
haroon amjad 3dffb26aee updates 8 months ago
Sultan khan 5e9d08b9aa Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
8 months 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
8 months ago
haroon amjad 968e59707e updates 8 months ago
Sultan khan 99e2edea31 lab result change for PMA-892 8 months ago
haroon amjad 2ebaed4841 label updated 8 months ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 8 months ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 8 months ago
haroon amjad fe37de9621 Loading dialog updates 8 months ago
Sultan khan 63f5f7890e updates 8 months ago
Sultan khan eee2ccf148 updates 8 months ago
haroon amjad 727a9f1363 updates & checks 8 months ago
haroon amjad e0c9914206 Issue for appointment reschedule fixed 8 months ago
haroon amjad 7fc47ebf34 LiveCare invoice fix 8 months ago
haroon amjad 162b2fd22a updates 9 months ago
Aamir Muhammad 64568edc01 Android build issue fixed 9 months ago
Sultan khan d255ada2ea eye measurements fixed 9 months ago
Aamir Muhammad b6d222a7ea JIRA Fixes 9 months ago
haroon amjad b42c47f074 Update to stores 9 months 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
9 months 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
9 months ago
haroon amjad e0ae8d7c8e Updates & fixes 9 months ago
Sultan khan d4519e1507 fixed 9 months ago
Sultan khan 001417f9b3 fixes 9 months ago
haroon amjad 357f0f8c24 updates 9 months ago
haroon amjad a12558076f Merge branch 'development_v3.3' into dev_3.3_AmbulanceRequestCR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
9 months ago
haroon amjad 46ad672649 Apple Pay fixes 9 months ago
Sultan khan 735582e3ab updated code. 9 months 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
9 months ago
haroon amjad 6e558bf5a6 Splash fix 9 months 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
9 months ago
haroon amjad 32757c85f8 updates 9 months ago
haroon amjad 180cc43705 Update to stores 9 months ago
haroon amjad cb79d625d1 Update to stores for LiveCare fix 9 months ago
haroon amjad 30b57ff5f0 updates 9 months ago
haroon amjad ccdf410995 Update to stores 9 months ago
haroon amjad 9043e3c687 Apple Pay Updates 9 months ago
haroon amjad e28805f70f updates 9 months ago
haroon amjad b4138b2066 Show Date check added in DoctorView 9 months ago
haroon amjad c65d668c92 updates 9 months ago
haroon amjad 3792a67ae7 updates 9 months ago
haroon amjad 7850748ea2 Dental updates 9 months 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
9 months ago
haroon amjad 0168f06bb9 updates 9 months ago
haroon amjad 1b0961a08f location timeout 9 months ago
haroon amjad c29e2c88f0 location timeout handled in online check-in via location 9 months ago