Commit Graph

569 Commits (e53ba65dddfd332ea0a57e4748ec3cfcd010a9f1)

Author SHA1 Message Date
Zohaib Iqbal Kambrani 9d71793e88 no message 4 years ago
haroon amjad 73822300f9 Health Calculators APIs updated 4 years ago
haroon amjad cb69684bb8 SessionID update 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 4c5b9b4244 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Translation update
  Fixes & updates
  Blood donation fixes
  Pharmacy Payment method design fix, Blood Donation fix
  improvements
  blood donation dialog change & improvements.
  Pharmacy updates
  Pharmacy prescriptions page design
  LiveCare design fixes
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Zohaib Iqbal Kambrani ebfa9cd630 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  Layout files
  pharmacy updates
  fixed issues
  Updates
  UI fixes
  Updates
  Smartwatch updates
  Smartwatch updates
  fixed issues
  fixed loader issue
4 years ago
Zohaib Iqbal Kambrani f3462dfc19 Applied cost from api at cart 4 years ago
haroon amjad 6f92a093ab Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 1fff2dad25 Smartwatch updates 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad d409875741 Smartwatch updates 4 years ago
haroon amjad 1f077f71f8 no message 4 years ago
haroon amjad 2032053cb7 Working on Health data 4 years ago
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
haroon amjad 1858be18b7 Feedback Status fixes 4 years ago
Haroon Amjad 59dac89118 updates 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
haroon amjad babb48b1db base app client changes 4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 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
4 years ago
Sikander Saleem a026fbf940 feedback status added. 4 years ago
haroon amjad 07a98d75c6 My tracker fixes 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad 0a9d0e5eaa fixes 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
haroon amjad 7264d03818 Family Files previleges fix 4 years ago
haroon amjad 259581c4f8 updates & fixes 4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
haroon amjad 69af6799c4 updates 4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
haroon amjad 22c6a8ce42 no message 4 years ago
haroon amjad 85d68b0388 ereferral fixes 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan d535cb421d bug fixes 4 years ago
haroon amjad 4ac0845003 updates & fixes 4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 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
4 years ago
haroon amjad 304ba8afa4 bas app client fixes 4 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
4 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
4 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
4 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
4 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
Sultan Khan 32f62fbe56 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 4 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 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 4 years ago
haroon amjad 2bba42b574 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
Mirza.Shafique e890c80831 CMC 1.3 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
haroon amjad 9ffe064a3b updates & fixes 4 years ago
haroon amjad 45272d251c Updates & fixes 4 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 4 years ago
Sultan Khan 73ff5c4707 Bug fixes 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
haroon amjad e679c7df0d updates & fixes 4 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
4 years ago
haroon amjad 8cb9a5e619 updates 4 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
4 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 4 years ago
Sultan Khan abcd207554 schedule page fix 4 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
4 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 4 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 4 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
4 years ago