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
|
69493934b1
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/QRCode.dart
|
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
|
1e98539537
|
Code merged for PenguinIn Indoor navigation into main branch
|
1 year ago |
haroon amjad
|
fd70387b2d
|
Merge branch 'dev_v3.13.6' into dev_v3.13.6_PenguinIn
# Conflicts:
# pubspec.yaml
|
1 year ago |
taha.alam
|
f80892b630
|
WD: header added to location list
|
1 year ago |
taha.alam
|
633059b0be
|
WD: Location dialog is added.
|
1 year ago |
haroon amjad
|
db91921de1
|
update to stores version 16.3
|
1 year ago |
Aamir.Muhammad
|
5883b06fcb
|
Updated to 3.24 Flutter & Penguin Fixed.
|
1 year ago |
haroon amjad
|
f42223292a
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/config.dart
|
1 year ago |
haroon amjad
|
536c95c825
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
1 year ago |
haroon amjad
|
dc17576c26
|
Flutter version upgraded to 3.22.0
|
1 year ago |
haroon amjad
|
f714d17686
|
fixes
|
1 year ago |
haroon amjad
|
f8d797f80a
|
updates
|
1 year ago |
haroon amjad
|
9f629afb9c
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/app_shared_preferences.dart
|
1 year ago |
haroon amjad
|
50ba0372db
|
language updates
|
1 year ago |
haroon amjad
|
34778d91d7
|
language fixes
|
1 year ago |
haroon amjad
|
a39d2840e0
|
Merge branch 'dev_v3.13.6' into dev_v_3.13.6_CR_6804
|
1 year ago |
haroon amjad
|
ed037edf22
|
Apple Pay fixes
|
1 year ago |
haroon amjad
|
11a43eb0ae
|
updates
|
1 year ago |
haroon amjad
|
0eaeb75207
|
Merge branch 'dev_v3.13.6' into dev_3.13.6_CR6750
|
1 year ago |
Aamir.Muhammad
|
4c5ba6048f
|
CR Fixes Search By Clinic & Search By Doctor List Reload Issue
|
1 year ago |
haroon amjad
|
ca8533190a
|
Walkin appointment booking implementation contd
|
1 year ago |
haroon amjad
|
d65325f998
|
Payment flow integration for Walk-In appointments
|
1 year ago |
Sultan khan
|
9501c2ea9a
|
derma CR 6804 CHANGES and language on initial load issue fix.
|
1 year ago |
haroon amjad
|
d0e743dcc9
|
Family members issue fixed in android
|
2 years ago |
haroon amjad
|
752d5e5944
|
Appointment timeline fix
|
2 years ago |
haroon amjad
|
2b560840aa
|
lab special result fix
|
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 |
Aamir.Muhammad
|
29c2fd067e
|
Null fixes after merge from 3.13
|
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
|
9a102be7c7
|
PatientID QR image added
|
2 years ago |
haroon amjad
|
6e30df2a29
|
WeCare service 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 |
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 |
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 |
haroon amjad
|
727a9f1363
|
updates & checks
|
2 years ago |
Aamir Muhammad
|
b6d222a7ea
|
JIRA Fixes
|
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 |