Commit Graph

899 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)

Author SHA1 Message Date
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 3 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 3 years ago
haroon amjad cf7291e379 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 03882c166c Translation & UI updates 3 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 3 years ago
haroon amjad 6d3ead24e1 localisation update 3 years ago
Sultan Khan a31f55aaa7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 4780039cc7 family file change 3 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 3 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad e564cdc7e5 Updates & fixes 3 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 3 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 881644a22e family files changes 3 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem a026fbf940 feedback status added. 3 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
3 years ago
Sultan Khan a39658206d my family 3 years ago
haroon amjad e1f5eb8b83 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 8ea6a5de04 localization fix 3 years ago
Sikander Saleem 54c3beadf2 improvements. 3 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 58c78656bf Rating dialog updates 3 years ago
Mirza.Shafique dde16a13fe General page in profile 3 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
3 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 3 years ago
haroon amjad 4a2e01b8b1 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Sultan Khan 5c8b809e39 family file fixes 3 years ago
Mirza.Shafique d664a216c6 Profile Page and Back Button Click 3 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 3 years ago
Mirza.Shafique 6261f01ab6 Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique 9c7e8e3637 Back Button on Landing Page 1 3 years ago
haroon amjad cbf2e84959 fixes 3 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 3 years ago
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
Sultan khan 7e095248c5 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes

See merge request Cloud_Solution/diplomatic-quarter!428
3 years ago
Sikander Saleem 8aa1fbfb4a localized_values fixed. 3 years ago
Sultan Khan 9010558dc9 family files changes 3 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 3 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
haroon amjad 96c290c3f3 Localization file updates 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
3 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 3 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 3 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
Sikander Saleem 6099738a5c improvements 3 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 3 years ago
haroon amjad 89e1aa70c0 updates 3 years ago
haroon amjad 22c6a8ce42 no message 3 years ago
Sultan Khan 5fe0214e04 bug fixes 3 years ago
Haroon Amjad 062ca5c11c EReferral fixes 3 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 3 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 3 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad fa8c739b2c updates & fixes 3 years ago
Mirza.Shafique 6e244a55f5 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
3 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 3 years ago
haroon amjad c3feed771c merge conflicts resolved 3 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan c54146b3ba sechedule fix 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 0348397df3 insurance approval detail company name added. 3 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 3 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan dd58b8637b bug fixs 3 years ago
haroon amjad e5a636b704 Covid Test changes 3 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
haroon amjad c186c9f186 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 0fe4a21388 updates & fixes 3 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 3 years ago
haroon amjad 32462ff5ba covid translation updates 3 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan c6404a2a0b tracker services 3 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
Mirza.Shafique 82a1d410db Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/landing/widgets/logged_slider_view.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 169aafa26b hmc services design fixed 3 years ago
Mirza.Shafique 831780555c CMC 1.0 3 years ago
haroon amjad 2669378da4 Insurance Approval API updated 3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 3 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 3 years ago
Sultan Khan 671c432cd7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 0086875d0d Design Updated for tracker 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 73ff5c4707 Bug fixes 3 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
Sikander Saleem fab051f9e7 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
3 years ago
Sultan Khan c6e7c8cd37 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 52665fe217 login issue fixed 3 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
3 years ago
Sikander Saleem a61fea551c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 590ea48ea9 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/MyAppointments/SchedulePage.dart
3 years ago
Mirza.Shafique e1e3741abf Event Reminder 3 years ago
haroon amjad b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
3 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
3 years ago
Zohaib Iqbal Kambrani d9672c47a0 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  BUG FIXES
  fix issues  PAP-910,PAP-911
  fix bugs pharmacy
  Dental procedures implemented
  Revert "Merge branch 'foote_in_all_pages' into 'development'"
  fixed products issues
  calendar events changes
  Covid passport CR implemented in Covid test flow
  doctor schedule
  Covid certificate passport CR implemented
  Covid Lab result generate certificate implemented
  return bottom sheet inside appointments list
  fix issues related to footer
  remove unused code
  remove footer from pharmacy pages
  first step from add footer for all pages

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari f09cdd944d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 3 years ago
Sikander Saleem 402cf5936a improvement. 3 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d1fc4751ad BUG FIXES 3 years ago
Zohaib Iqbal Kambrani d1c99d1d82 ER Average waiting time label applied 3 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 3 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 3 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
3 years ago
mosazaid a2e60e7584 fix bugs pharmacy 3 years ago
haroon amjad e9c26ee85f Dental procedures implemented 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 years ago
Sikander Saleem 6191377914 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
3 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 3 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 3 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 3 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 3 years ago