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
|
fe7c2c6873
|
CR 6631
|
2 years ago |
haroon amjad
|
ac52ba75a7
|
Updates & Fixes
|
2 years ago |
haroon amjad
|
98a5b7d049
|
my appointments fixes
|
2 years ago |
haroon amjad
|
27ed5c95f2
|
update to stores
|
2 years ago |
haroon amjad
|
e67bd54c04
|
updates
|
2 years ago |
haroon amjad
|
b39357a497
|
Medical report changes, Loading added in Location Check-In
|
2 years ago |
haroon amjad
|
63621b5fed
|
Updates & fixes
|
2 years ago |
haroon amjad
|
cd8b76a374
|
In App Apple Pay implemented
|
2 years ago |
haroon amjad
|
e1718270eb
|
updates
|
2 years ago |
haroon amjad
|
e6d093a84c
|
updates
|
2 years ago |
haroon amjad
|
86d3e03c06
|
Updates
|
2 years ago |
haroon amjad
|
e5d8505c2d
|
Updates & fixes
|
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
|
27b6e04d33
|
updates
|
2 years ago |
haroon amjad
|
3401496739
|
Updates & fixes
|
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
|
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 |
haroon amjad
|
cfa341aba5
|
Apple Pay Updates
|
2 years ago |
haroon amjad
|
4ac11b2169
|
LanguageID Fixes
|
2 years ago |
haroon amjad
|
e4ce158277
|
updates
|
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
|
52b3c196d6
|
updates
|
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 |
Faiz Hashmi
|
b769959823
|
Revert "changes to build app"
This reverts commit 1492efde
|
2 years ago |
Faiz Hashmi
|
0e67851646
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
|
2 years ago |
haroon amjad
|
f7dffea2eb
|
Language ID fixes
|
2 years ago |
haroon amjad
|
724a26ca68
|
Updates
|
2 years ago |
haroon amjad
|
a9d4cb2fd8
|
InApp Browser Update
|
2 years ago |
haroon amjad
|
bcfeff2661
|
updates
|
2 years ago |
haroon amjad
|
cfd8b5e8a5
|
Language ID Changes
|
2 years ago |
haroon amjad
|
264aed70a0
|
NFC Check added
|
2 years ago |
Faiz Hashmi
|
d3b4f37c73
|
Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
# pubspec.yaml
|
2 years ago |
haroon amjad
|
165f3fb9f6
|
NFC Check removed for appo checkin
|
2 years ago |
haroon amjad
|
47779f6fa7
|
last appointment rating fixed
|
2 years ago |
haroon amjad
|
01db5408c9
|
fixes
|
2 years ago |
haroon amjad
|
80167378d9
|
lat long fixes
|
2 years ago |
haroon amjad
|
eef6f78fd6
|
Updates
|
2 years ago |
haroon amjad
|
c6c4f933b2
|
Invoice Type param added in Labs & Rad
|
2 years ago |
haroon amjad
|
0a9aee0246
|
updates
|
2 years ago |
haroon amjad
|
421bae2037
|
updates
|
2 years ago |
Sultan khan
|
f2a57255fc
|
no message
|
2 years ago |
haroon amjad
|
8b468fe4b5
|
Updates & fixes
|
2 years ago |
Sultan khan
|
6a74cdd2da
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
Sultan khan
|
70077c97db
|
local auth change
|
2 years ago |
Aamir Muhammad
|
6f99aca8a5
|
Inpatient Cr Merge
|
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
|
70176e0cb1
|
updates
|
2 years ago |
Sultan khan
|
359a177797
|
updates
|
2 years ago |
haroon amjad
|
beb3453ff5
|
updates
|
2 years ago |
Sultan khan
|
f2079d4bbd
|
payment fix
|
2 years ago |
Sultan khan
|
557a3baafe
|
theme change
|
2 years ago |
haroon amjad
|
ded6e02663
|
CheckIn By Param added
|
2 years ago |
devamirsaleemahmad
|
6671dea8d8
|
Delete Event on Calender
|
2 years ago |
haroon amjad
|
a0bca92195
|
CR Implemented
|
2 years ago |
Sultan khan
|
f534ee6f58
|
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/reminder_dialog.dart
|
2 years ago |
Sultan khan
|
62dc3c162a
|
updated 3.13.6
|
2 years ago |
devamirsaleemahmad
|
2def9f3744
|
Merges From 3.3
|
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
|
fb62ce2f19
|
Calender Fix Ios 17+
|
2 years ago |
devamirsaleemahmad
|
1ddac14efb
|
Calender Permission Fix Ios 17+
|
2 years ago |
Aamir Muhammad
|
a24afd4302
|
Calender Permission
|
2 years ago |
Aamir Muhammad
|
f211fd5617
|
Call Notification Fix
|
2 years ago |
haroon amjad
|
cb9ced27c2
|
updates
|
2 years ago |
haroon amjad
|
1ecb8ebfe9
|
updated to stores version 11.3
|
2 years ago |
Aamir Muhammad
|
542864c89c
|
Gif Loader & My Family Fixes
|
2 years ago |
haroon amjad
|
f8fb336740
|
Location checkin privilege applied
|
2 years ago |
Aamir Muhammad
|
75b969b265
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
Aamir Muhammad
|
7f890bb24a
|
Changes
|
2 years ago |
Sultan khan
|
8c46d2577d
|
updated with assets
|
2 years ago |
Sultan khan
|
8c520d9431
|
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
|
2 years ago |
Sultan khan
|
432e64e51d
|
updates
|
2 years ago |
Aamir Muhammad
|
b4bc99369f
|
Changes into Rating Bar
|
2 years ago |
haroon amjad
|
245716119e
|
Location based Check In implemented
|
2 years ago |
haroon amjad
|
6dd5fda997
|
Location check in implementing
|
2 years ago |
haroon amjad
|
5c8bb241b3
|
Next Actions handled when navigating from My Appointments to ToDo list
|
2 years ago |
devamirsaleemahmad
|
8bdcfcb764
|
Changes & Latest Merges 3.3
|
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 |
devamirsaleemahmad
|
9d1b153739
|
Dropdown Changed
|
2 years ago |
haroon amjad
|
b579e494c1
|
updates
|
2 years ago |
Sultan khan
|
413535ef0b
|
null safety fixed.
|
2 years ago |
Sultan khan
|
649521c31f
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
Sultan khan
|
c96c151f44
|
null safety issue fixed.
|
2 years ago |
devamirsaleemahmad
|
d6f51f6c82
|
changes
|
2 years ago |
haroon amjad
|
7f753014df
|
Inpatient advance payment projectID param issue resolved
|
2 years ago |
haroon amjad
|
7c426b90e5
|
updates
|
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 |
haroon amjad
|
b10383c3ff
|
Translation updates
|
2 years ago |
haroon amjad
|
dd0099236d
|
Insurance dialog added post registration
|
2 years ago |
haroon amjad
|
1997dbe128
|
updates
|
2 years ago |
haroon amjad
|
c7ee76d816
|
updates
|
2 years ago |
haroon amjad
|
e4492cbc1f
|
Medical instructions updates
|
2 years ago |
haroon amjad
|
cb2bacf539
|
Update insurance for cash patient in ToDo List
|
2 years ago |
haroon amjad
|
4fcc698f50
|
CR 6654 done
|
2 years ago |
haroon amjad
|
bbee4dba66
|
CR 6654 cancel manual insurance update CR done.
|
2 years ago |
devamirsaleemahmad
|
cbc38940ea
|
changes
|
2 years ago |
devamirsaleemahmad
|
ed748a626b
|
changes
|
2 years ago |
devamirsaleemahmad
|
23b7d85911
|
changes
|
2 years ago |
haroon amjad
|
81de6f9848
|
updated app to stores Version ID 11.0
|
2 years ago |
devamirsaleemahmad
|
4231c85055
|
Merge branch 'development_v3.3' 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/privilege/VidaPlusProjectListModel.dart
# lib/core/model/radiology/final_radiology.dart
# lib/core/model/radiology/request_send_rad_report_email.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/service/privilege_service.dart
# lib/core/viewModels/medical/labs_view_model.dart
# lib/core/viewModels/medical/radiology_view_model.dart
# lib/core/viewModels/project_view_model.dart
# lib/models/anicllary-orders/ancillary_order_list_model.dart
# lib/models/anicllary-orders/ancillary_orders_proc_list.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/Blood/confirm_payment_page.dart
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/Covid-DriveThru/covid-payment-summary.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/MyAppointments/widgets/AppointmentActions.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/insurance/insurance_update_screen.dart
# lib/pages/login/login.dart
# lib/pages/medical/ask_doctor/doctor_response.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/pages/medical/balance/my_balance_page.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/pages/medical/radiology/radiology_home_page.dart
# lib/pages/paymentService/payment_service.dart
# lib/splashPage.dart
# lib/uitl/utils.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
# lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
d5dd8757e9
|
Privileges added for QR & NFC CheckIn options
|
2 years ago |
haroon amjad
|
772992e3ff
|
updates
|
2 years ago |
devamirsaleemahmad
|
3f1ba19c64
|
changes & Null to Dynamic
|
2 years ago |
haroon amjad
|
41cd55e02b
|
paymentRequestID added in the request
|
2 years ago |
haroon amjad
|
13b2db47b5
|
HMC color change applied in my appointments
|
2 years ago |
haroon amjad
|
6bd6572e7e
|
Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus.
|
2 years ago |
haroon amjad
|
ee5fb615db
|
updates & fixes
|
2 years ago |
haroon amjad
|
185f54d26d
|
updates & fixes
|
2 years ago |
haroon amjad
|
0a478e077a
|
QR Code checkin implemented
|
2 years ago |
haroon amjad
|
542501f5c5
|
updates
|
2 years ago |
haroon amjad
|
a5e0de08ce
|
updates for ancillary
|
2 years ago |
devamirsaleemahmad
|
8544b3ce3d
|
changes & Deletion
|
2 years ago |
devamirsaleemahmad
|
720c0ac6e9
|
changes & Deletion
|
2 years ago |
haroon amjad
|
55f1e4166e
|
updates
|
2 years ago |
Sultan khan
|
4d52f639aa
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/pages/livecare/live_care_payment_page.dart
# lib/pages/medical/smart_watch_health_data/steps/stepsTracker.dart
# lib/pages/medical/vital_sign/vital_sign_details_screen.dart
# lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart
# lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
# lib/pages/medical/vital_sign/vital_sing_chart_blood_pressure.dart
|
2 years ago |
Sultan khan
|
0c534cffae
|
code update in progress
|
2 years ago |
devamirsaleemahmad
|
2c9e51aef0
|
changes
|
2 years ago |
devamirsaleemahmad
|
1c34843bc5
|
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
|
2 years ago |
Sultan khan
|
6a8de14d5d
|
code update in progress
|
2 years ago |
devamirsaleemahmad
|
519f396e76
|
changes
|
2 years ago |
Sultan khan
|
40656a65d8
|
update in progress
|
2 years ago |
devamirsaleemahmad
|
49d3df8c87
|
changes
|
2 years ago |
devamirsaleemahmad
|
47801ecb36
|
changes
|
2 years ago |
devamirsaleemahmad
|
d8836d5e89
|
Merge branch 'dev_v3.13.6_automigrate' into dev_v3.13.6
# Conflicts:
# lib/main.dart
# lib/uitl/CalendarUtils.dart
# lib/uitl/app_shared_preferences.dart
|
2 years ago |
devamirsaleemahmad
|
c1fd6313b1
|
changes
|
2 years ago |
Sultan khan
|
c63a1fadf5
|
code updated in-progress
|
2 years ago |
Sultan khan
|
6a6ac76973
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
|
2 years ago |
Sultan khan
|
8a42bf8b2f
|
Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
# lib/widgets/buttons/custom_text_button.dart
|
2 years ago |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
aa605a2e47
|
file updated
|
2 years ago |
devamirsaleemahmad
|
1c19b36d2d
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
b26f535749
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
9c2948db29
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
50816d452e
|
Merge remote-tracking branch 'origin/dev_v3.13.6' into dev_v3.13.6
|
2 years ago |
devamirsaleemahmad
|
b3587688b8
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
391331f508
|
code update in progress
|
2 years ago |
devamirsaleemahmad
|
971bab465c
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
03d550936e
|
models updates -> 3.13.6
|
2 years ago |
devamirsaleemahmad
|
cb56750e6b
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
04244675e1
|
code updated.
|
2 years ago |