Commit Graph

2844 Commits (147fb6cee8e1cdd6ee5bf2bbdf773c6ac8d08adf)

Author SHA1 Message Date
haroon amjad 7b181192f6 Apple Pay updates 2 years ago
Aamir Muhammad e18ba6822a changes local 2 years ago
Aamir Muhammad 660ec3a207 changes local 2 years ago
Aamir Muhammad 52a5e978a7 changes local 2 years ago
haroon amjad 3dffb26aee updates 2 years 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
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 968e59707e updates 2 years ago
Sultan khan 99e2edea31 lab result change for PMA-892 2 years ago
haroon amjad 2ebaed4841 label updated 2 years ago
haroon amjad d6dacfb743 Load more added in appointments timeline. 2 years ago
haroon amjad 5256d8873f ToDo & Appo Timeline changes 2 years ago
haroon amjad fe37de9621 Loading dialog updates 2 years ago
Sultan khan 63f5f7890e updates 2 years ago
Sultan khan eee2ccf148 updates 2 years ago
haroon amjad 727a9f1363 updates & checks 2 years ago
haroon amjad e0c9914206 Issue for appointment reschedule fixed 2 years ago
haroon amjad 7fc47ebf34 LiveCare invoice fix 2 years ago
haroon amjad 162b2fd22a updates 2 years ago
Sultan khan d255ada2ea eye measurements fixed 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
haroon amjad b42c47f074 Update to stores 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
Sultan khan 001417f9b3 fixes 2 years ago
haroon amjad 357f0f8c24 updates 2 years 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
2 years ago
haroon amjad 46ad672649 Apple Pay fixes 2 years ago
Sultan khan 735582e3ab updated code. 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
haroon amjad 6e558bf5a6 Splash fix 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 32757c85f8 updates 2 years ago
haroon amjad 180cc43705 Update to stores 2 years ago
haroon amjad cb79d625d1 Update to stores for LiveCare fix 2 years ago
haroon amjad 9043e3c687 Apple Pay Updates 2 years ago
haroon amjad e28805f70f updates 2 years ago
haroon amjad b4138b2066 Show Date check added in DoctorView 2 years ago
haroon amjad c65d668c92 updates 2 years ago
haroon amjad 7850748ea2 Dental 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 0168f06bb9 updates 2 years ago
haroon amjad 1b0961a08f location timeout 2 years ago
haroon amjad c29e2c88f0 location timeout handled in online check-in via location 2 years ago
haroon amjad eb1bddf772 updates 2 years ago
haroon amjad f1a74749f7 param update 2 years ago
haroon amjad bbc42bd1e7 updates 2 years ago
haroon amjad d3bdcfa975 Apple Pay code merged into main branch 2 years ago
haroon amjad 48202ffd12 updates 2 years ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad ec0bed04d3 Apple Pay in production implemented & tested 2 years ago
haroon amjad fe7c2c6873 CR 6631 2 years ago
haroon amjad ac52ba75a7 Updates & Fixes 2 years ago
haroon amjad 98a5b7d049 my appointments fixes 2 years ago
haroon amjad 27ed5c95f2 update to stores 2 years ago
haroon amjad e67bd54c04 updates 2 years ago
haroon amjad b39357a497 Medical report changes, Loading added in Location Check-In 2 years ago
haroon amjad 63621b5fed Updates & fixes 2 years ago
haroon amjad cd8b76a374 In App Apple Pay implemented 2 years ago
haroon amjad e1718270eb updates 2 years ago
haroon amjad e6d093a84c updates 2 years ago
haroon amjad 86d3e03c06 Updates 2 years ago
haroon amjad e5d8505c2d Updates & fixes 2 years ago
Sultan khan 4b28581c55 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/models/Appointments/toDoCountProviderModel.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/login/login.dart
#	lib/services/authentication/auth_provider.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 75bfeaa716 My appointment fixes 2 years ago
haroon amjad 27b6e04d33 updates 2 years ago
haroon amjad 3401496739 Updates & fixes 2 years ago
Sultan khan 86f5e81fea merge with 3.3 2 years ago
Sultan khan d0c7b08eac 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/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad fddb423451 Updates & fixes 2 years ago
haroon amjad aa04e943ef updates & fixes 2 years ago
Sultan khan 98a2545a9b Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/config/config.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/uitl/push-notification-handler.dart
2 years ago
Sultan khan c1fbce7eae bug fixes 2 years ago
haroon amjad cfa341aba5 Apple Pay Updates 2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
haroon amjad e4ce158277 updates 2 years ago
Sultan khan 4338da513d 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/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/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.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/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
2 years ago
haroon amjad 52b3c196d6 updates 2 years ago
Faiz Hashmi 704c0bbbc6 Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 2 years ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 2 years ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 2 years ago
Faiz Hashmi b769959823 Revert "changes to build app"
This reverts commit 1492efde
2 years ago
Faiz Hashmi 0e67851646 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 2 years ago
haroon amjad f7dffea2eb Language ID fixes 2 years ago
haroon amjad 724a26ca68 Updates 2 years ago
haroon amjad a9d4cb2fd8 InApp Browser Update 2 years ago
haroon amjad bcfeff2661 updates 2 years ago
haroon amjad cfd8b5e8a5 Language ID Changes 2 years ago
haroon amjad 264aed70a0 NFC Check added 2 years ago
Faiz Hashmi d3b4f37c73 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 165f3fb9f6 NFC Check removed for appo checkin 2 years ago
haroon amjad 47779f6fa7 last appointment rating fixed 2 years ago
haroon amjad 01db5408c9 fixes 2 years ago
haroon amjad 80167378d9 lat long fixes 2 years ago
haroon amjad eef6f78fd6 Updates 2 years ago
haroon amjad c6c4f933b2 Invoice Type param added in Labs & Rad 2 years ago
haroon amjad 0a9aee0246 updates 2 years ago
haroon amjad 421bae2037 updates 2 years ago
Sultan khan f2a57255fc no message 2 years ago