taha.alam
|
7486f320dc
|
king khalid university application
|
1 year 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
|
1 year ago |
haroon amjad
|
96d5c3ce1d
|
My Instructions added
|
1 year ago |
haroon amjad
|
6e30df2a29
|
WeCare service added
|
1 year 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 |
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
|
d6dacfb743
|
Load more added in appointments timeline.
|
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
|
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 |
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
|
c29e2c88f0
|
location timeout handled in online check-in via location
|
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
|
fddb423451
|
Updates & fixes
|
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 |
haroon amjad
|
a0bca92195
|
CR Implemented
|
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
|
245716119e
|
Location based Check In implemented
|
2 years ago |
haroon amjad
|
6dd5fda997
|
Location check in implementing
|
2 years ago |
devamirsaleemahmad
|
0e8c1a8b2f
|
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/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/ToDoList/widgets/paymentDialog.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
b10383c3ff
|
Translation updates
|
2 years ago |
haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
2 years ago |
haroon amjad
|
cb2bacf539
|
Update insurance for cash patient in ToDo List
|
2 years ago |
haroon amjad
|
185f54d26d
|
updates & fixes
|
2 years ago |
Sultan khan
|
aa605a2e47
|
file updated
|
2 years ago |
Sultan khan
|
b45cbbcf29
|
updates
|
2 years ago |
haroon amjad
|
af5b0766a2
|
CR 6654, Disable update manual insurance temporarily.
|
2 years ago |
haroon amjad
|
df610690d5
|
updates
|
2 years ago |
haroon amjad
|
e780df90e1
|
updates
|
2 years ago |
haroon amjad
|
9ed454f67a
|
Cash patient check implemented
|
2 years ago |
haroon amjad
|
49963911ba
|
Patient eligibility change
|
2 years ago |
haroon amjad
|
72ee34f9a7
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
haroon amjad
|
1300dadce1
|
Inpatient advance payment
|
2 years ago |
haroon amjad
|
a9ae44ca89
|
Implemented checks for InPatient CR
|
2 years ago |
haroon amjad
|
dd79b1dfca
|
InPatient pending advance payment done
|
2 years ago |
haroon amjad
|
4afdf5545e
|
Translations added
|
2 years ago |
haroon amjad
|
a17b941c63
|
InPatient Medical Report continued
|
2 years ago |
haroon amjad
|
9b3c07d3b1
|
Added AED in advance payment
|
2 years ago |
haroon amjad
|
f624c70cee
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
haroon amjad
|
b92e45aa93
|
Updates & fixes
|
2 years ago |
haroon amjad
|
a60f66a069
|
Updates
|
2 years ago |
haroon amjad
|
3fb8876c31
|
Manual Insurance Card Update
|
2 years ago |
haroon amjad
|
0e054429ef
|
Meal Plan implementation completed
|
2 years ago |
haroon amjad
|
6877244d0e
|
CR# 5805 Ask Doc Improvements dev completed.
|
2 years ago |
haroon amjad
|
60d5ba4a9e
|
Birth Notification implemented
|
2 years ago |
haroon amjad
|
01ee9a2710
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
2 years ago |
haroon amjad
|
a7a06f4083
|
Home page change
|
2 years ago |
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |