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
|
20bfdc3652
|
Project Name Top & Bottom changes implemented
|
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
|
1 year 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 |
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
|
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 |
Sultan khan
|
eee2ccf148
|
updates
|
2 years ago |
haroon amjad
|
727a9f1363
|
updates & checks
|
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
|
b39357a497
|
Medical report changes, Loading added in Location Check-In
|
2 years ago |
haroon amjad
|
e6d093a84c
|
updates
|
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
|
3401496739
|
Updates & fixes
|
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 |
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
|
724a26ca68
|
Updates
|
2 years ago |
haroon amjad
|
cfd8b5e8a5
|
Language ID Changes
|
2 years ago |
haroon amjad
|
80167378d9
|
lat long fixes
|
2 years ago |
haroon amjad
|
c6c4f933b2
|
Invoice Type param added in Labs & Rad
|
2 years ago |
haroon amjad
|
421bae2037
|
updates
|
2 years ago |
Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
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 |
Sultan khan
|
432e64e51d
|
updates
|
2 years ago |