haroon amjad
|
5b7b40c732
|
Updates & fixes
|
1 year ago |
haroon amjad
|
c97fd25cdd
|
Zoom integration updates & other stability fixes
|
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
|
7b181192f6
|
Apple Pay updates
|
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
|
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 |
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
|
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
|
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
|
cd8b76a374
|
In App Apple Pay implemented
|
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 |
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
|
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
|
512db615be
|
Language ID fixes & app update to stores, VersionID 11.5
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
devamirsaleemahmad
|
d6f51f6c82
|
changes
|
2 years ago |
devamirsaleemahmad
|
c1fd6313b1
|
changes
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
2 years ago |
haroon amjad
|
63426a691d
|
Ancillary orders family members issue resolved
|
3 years ago |
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
haroon amjad
|
3bc09f792a
|
Pharma LiveCare fixes
|
3 years ago |
haroon amjad
|
a20d6c7c28
|
Livecare updates
|
3 years ago |
haroon amjad
|
4ecab57173
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
da423fe12a
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
f686013692
|
Pharma LiveCare updates
|
3 years ago |
haroon amjad
|
4f50c3ff8e
|
Pharmacy LiveCare revamped
|
3 years ago |
haroon amjad
|
74b0acefd3
|
Updates & fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
haroon amjad
|
22a0e456bc
|
Manual Insurance Updates, Service ID fixes, Tamara Fixes
|
3 years ago |
haroon amjad
|
e80ac2481a
|
Ancillary order & manual insurance update
|
3 years ago |
haroon amjad
|
dfa88b7de7
|
Updates, fixes & release VersionID 9.1
|
3 years ago |
haroon amjad
|
21cf9da900
|
HMS Core & LiveCare Schedule fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
3 years ago |
haroon amjad
|
2ba744c3a6
|
Timezone fixes & Activate/Deactivate file changes
|
3 years ago |
haroon amjad
|
eb3f5b5cb5
|
Updates & fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
7051b3ed63
|
Analtyics at registration and liveacare payment fail
|
3 years ago |
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
3 years ago |
haroon amjad
|
f50bfda330
|
updates
|
3 years ago |
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
3 years ago |
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
3 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |