Sultan khan
|
eee2ccf148
|
updates
|
2 years ago |
haroon amjad
|
727a9f1363
|
updates & checks
|
2 years ago |
haroon amjad
|
162b2fd22a
|
updates
|
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 |
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
|
bea15150aa
|
Merge branch 'development_v3.3' into dev_3.3_faiz_payfort
|
2 years ago |
haroon amjad
|
b39357a497
|
Medical report changes, Loading added in Location Check-In
|
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
|
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
|
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 |
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 |
haroon amjad
|
0a9aee0246
|
updates
|
2 years ago |
haroon amjad
|
421bae2037
|
updates
|
2 years ago |
haroon amjad
|
8b468fe4b5
|
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 |
Sultan khan
|
f2079d4bbd
|
payment fix
|
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 |
devamirsaleemahmad
|
1ddac14efb
|
Calender Permission Fix Ios 17+
|
2 years ago |
Aamir Muhammad
|
f211fd5617
|
Call Notification Fix
|
2 years ago |
haroon amjad
|
1ecb8ebfe9
|
updated to stores version 11.3
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Aamir Muhammad
|
b4bc99369f
|
Changes into Rating Bar
|
2 years ago |
Sultan khan
|
c96c151f44
|
null safety issue fixed.
|
2 years ago |
Sultan khan
|
1a5687a27c
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/uitl/app_toast.dart
|
2 years ago |
Sultan khan
|
ec13edc28b
|
updates.
|
2 years ago |
devamirsaleemahmad
|
8f591654a5
|
changes
|
2 years ago |
devamirsaleemahmad
|
cbc38940ea
|
changes
|
2 years ago |
devamirsaleemahmad
|
23b7d85911
|
changes
|
2 years ago |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
2 years ago |
Sultan khan
|
40656a65d8
|
update in progress
|
2 years ago |
devamirsaleemahmad
|
c1fd6313b1
|
changes
|
2 years ago |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
2 years ago |
haroon amjad
|
a9ae44ca89
|
Implemented checks for InPatient CR
|
3 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
|
3 years ago |
haroon amjad
|
a60f66a069
|
Updates
|
3 years ago |
haroon amjad
|
420aef3195
|
Updates
|
3 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
|
3 years ago |
haroon amjad
|
a7a06f4083
|
Home page change
|
3 years ago |
haroon amjad
|
906fd5fd6a
|
Inpatient services in dev
|
3 years ago |
haroon amjad
|
2fea4b2b07
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/pages/landing/widgets/services_view.dart
|
3 years ago |
haroon amjad
|
fcf0c589a0
|
Updates & fixes
|
3 years ago |
haroon amjad
|
9a7d0af6ea
|
InPatient API implemented
|
3 years ago |
haroon amjad
|
128bd2ec54
|
Inpatient services implementation
|
3 years ago |
haroon amjad
|
dc859b01f7
|
updates & fixes
|
3 years ago |
haroon amjad
|
5045cc6faa
|
Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices
|
3 years ago |
haroon amjad
|
bc8a979438
|
Upload to stores
|
3 years ago |
haroon amjad
|
22274ebbb0
|
updates & fixes
|
3 years ago |
Zohaib Iqbal Kambrani
|
35b129fb68
|
migrated project to latest flutter sdk
|
3 years ago |
haroon amjad
|
3709ebcb32
|
Updates
|
3 years ago |
haroon amjad
|
f6191d9bf7
|
updates & fixes
|
3 years ago |
haroon amjad
|
e03412214e
|
Ambulance request fixes
|
3 years ago |
haroon amjad
|
106334c9cf
|
updates & fixes
|
3 years ago |
haroon amjad
|
58a6dc6a6f
|
Tamara & Apple Pay Fixes + Other Updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
8bd5a71318
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Timezone fixes & Activate/Deactivate file changes
Updates
Timezone Updates
CMC Updates
updates
Updates
Laser Male back image added
Updates & fixes
E-Cens sign off
Analtyics at registration and liveacare payment fail
analytics events update
Analytics
no message
Updates & fixes
ED Online Check-In
Calendar fixes
updates & fixes
Analytics statements align to bottom of block
Analytics for login registration
updates
# Conflicts: Fixed
# lib/analytics/flows/appointments.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
1aabf08417
|
no message
|
4 years ago |
haroon amjad
|
ca43849d9d
|
CMC Updates
|
4 years ago |
haroon amjad
|
11529c65c5
|
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
e615ca1a16
|
no message
|
4 years ago |
haroon amjad
|
3396b4253b
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
6cd660184a
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
1c6a62776c
|
Analytics statements align to bottom of block
|
4 years ago |
Zohaib Iqbal Kambrani
|
a0e619eec6
|
fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
fb4fb8d29e
|
Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
Google analytics events update
Updates
Updates & fixes
DateTime Fixes
HHC Fixes
updates & fixes
Updates & fixes
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
e107d8a1a4
|
no message
|
4 years ago |
haroon amjad
|
1faf27959a
|
Updates
|
4 years ago |
haroon amjad
|
9057a96d7f
|
Updates & fixes
|
4 years ago |
haroon amjad
|
842e099953
|
DateTime Fixes
|
4 years ago |
haroon amjad
|
f1129cc14c
|
updates & fixes
|
4 years ago |
haroon amjad
|
fd96869d89
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
|
4 years ago |
haroon amjad
|
c3538ebdb6
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
94a99a911e
|
Offer And Packages (View Only)
|
4 years ago |
haroon amjad
|
aae48f2555
|
Android permission dialog updates
|
4 years ago |
Sikander Saleem
|
27d0d80017
|
Merge branch 'development_v2.5' into sikander_family_profile_switch
# Conflicts:
# lib/pages/DrawerPages/family/my-family.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Sikander Saleem
|
bcf746aa0b
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
|
4 years ago |
Sikander Saleem
|
1b82146303
|
my family switch profile on dashboard.
|
4 years ago |
Sikander Saleem
|
230444803d
|
Merge remote-tracking branch 'origin/development_v2.5' into development_v2.5
|
4 years ago |
Sikander Saleem
|
fd73c248e2
|
my family switch profile improvement.
|
4 years ago |
haroon amjad
|
d344169399
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookSuccess.dart
|
4 years ago |
haroon amjad
|
a918d409fb
|
updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
99bdd25bd3
|
added more analytics logs
|
4 years ago |
Zohaib Iqbal Kambrani
|
687bc543ab
|
OpenTok Video Call
|
4 years ago |
Zohaib Iqbal Kambrani
|
bf7c1d1610
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
updates
livecare changes
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
aac15c5a4a
|
partial analytics fixes and updates
|
4 years ago |
haroon amjad
|
0ea2550246
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5
|
4 years ago |
haroon amjad
|
32edb2e71e
|
updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
c61de7cfdc
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
23404b4495
|
Video call at InAppWebView
|
4 years ago |
Zohaib Iqbal Kambrani
|
936b7c28f9
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Covid updates & other fixes
# Conflicts: Resolved
# lib/config/config.dart
# lib/pages/webRTC/signaling.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
haroon amjad
|
927db41068
|
Covid updates & other fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
a26b17f52d
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Translation fixes
OBGyne updates
updates
OB Gyne appo updates
no message
updates & fixes
no message
no message
Ancillary Orders completed
updates & fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
a8e1ba6b86
|
no message
|
4 years ago |
haroon amjad
|
ac5077e9e7
|
Translation fixes
|
4 years ago |
haroon amjad
|
4b4ac4819f
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
ff508de9f7
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Updates & fixes
# Conflicts: resolved
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |