Commit Graph

1020 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 4 years ago
haroon amjad f9a733884d Calendar fixes 4 years ago
haroon amjad 27c6837f25 updates & 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
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 a9e48e487f HHC Fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad 4ba37d342c RRT Updates 4 years ago
haroon amjad 33329f5c8a base app client update 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad bc97cfa95b Update Insurance changes 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
haroon amjad 32edb2e71e updates 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 f879991b50 OBGyne updates 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 3eb7a4325b updates & fixes 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
haroon amjad aa36154764 Updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad a6c6651363 Updates & fixes 4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad c379c6a37b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4c2410cfd5 Health plugin updated 4 years ago
Fatimah Alshammari 216cc4a7e3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari d767febcd0 fix search issue 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
haroon amjad 75423e5501 Updates 4 years ago
hussam al-habibeh 141e650276 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
4 years ago
hussam al-habibeh af0316367d Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 2274c6affe Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!531
4 years ago
haroon amjad 68b443905e Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!544
4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
hussam al-habibeh e6fd5293ca fix filited produvts API 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad 333b41632c fixes 4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Zohaib Iqbal Kambrani 3bd94ee05e Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  fix issues
  Base app client updates
  prescription reminders added
  Medical Reminder 1.0
  lakum fixes
  Medical Reminder
4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
haroon amjad ab7162f164 Base app client updates 4 years ago
haroon amjad 68294690a1 prescription reminders added 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
haroon amjad 87a997d156 Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!521
4 years ago
hussam al-habibeh db1820fda4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 79d99dd48a Pharmacy security updates applied 4 years ago
hussam al-habibeh ff86dcbdc0 sub categories pagnation 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad f533dd5356 Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page

See merge request Cloud_Solution/diplomatic-quarter!515
4 years ago
Elham Rababh 6ff829ab91 fix cart order page 4 years ago
hussam al-habibeh 80c6be239e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 300668cc81 sub Categorise fixed 4 years ago
haroon amjad d630c6c45f Pharmacy fixes 4 years ago
Haroon Amjad 464ad9a3cb Shopping cart fix 4 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh a35e149088 product pagination 4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad 3ec2f990b1 product detail page updates 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
hussam al-habibeh b2b786d157 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad 90b821a37d Offers & packages UI completed 4 years ago
haroon amjad ea745f1b9f Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
Fatimah Alshammari ce0dff11b2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad b752b42a34 Updates & fixes 4 years ago
Fatimah Alshammari 77c8c85e88 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad 9ce77b56b9 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari ca11fe3134 fix issues 4 years ago
haroon amjad 30e67bbe3e updates 4 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
Fatimah Alshammari 6f63250252 fix issues 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
Mohammad Aljammal f9e33e7212 Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!467
4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad fa5fd8e323 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
haroon amjad 62974b7b72 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 94a5cac27d Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  LiveCare Schedule fixes
  improvements.
  live care design 3.0
  dialog ui changes in wallet & improvements.
  LiveCare Schedule API fix
  live care design 2.0
  Health converters UI done
  Health Calculators APIs updated
  Translation updates
  SessionID update
  live care design 1.0
  Updates & fixes
  blood sugar dialog improvement.

# Conflicts: Rseloved
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
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 df7d8a8603 Blood donation fixes 4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
haroon amjad eed4fd2509 Pharmacy prescriptions page design 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
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 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
Fatimah Alshammari e494c9304d fixed issues 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
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 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
Sultan Khan 160049973e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad 0a9d0e5eaa fixes 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 4 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 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
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
4 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
4 years ago
haroon amjad 2c4ff16f0c updates & fixes 4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
Elham Rababh b0b278a7e3 fix bugs 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
mosazaid 4d37bc2958 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/pharmacies/screens/product-details/recommended_products.dart
	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
	lib/widgets/others/app_scafold_detail_page.dart
4 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 4 years ago
haroon amjad 69af6799c4 updates 4 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 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
4 years ago
haroon amjad 5163c826ad Updates & fixes 4 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 4 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 4 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 4 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 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
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
Sikander Saleem 28c0450544 lab result filterName improvement. 4 years ago
haroon amjad f6d779431a fixes 4 years ago
haroon amjad 46cc73bdd7 CMC changes 4 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 4 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a4a2389a78 updates & fixes 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
haroon amjad 184942e891 Covid Payment fixes 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 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
haroon amjad 46d800c0c6 UI updates & fixes 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