Commit Graph

240 Commits (32edb2e71ee21fda2a7d99d10ff5e9a88d2c2770)

Author SHA1 Message Date
haroon amjad 32edb2e71e updates 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 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
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
haroon amjad 7ffc467552 Lakum fixes 4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
Haroon Amjad d5c68c5032 Packages & offers design 4 years ago
haroon amjad 72784f68b9 Fixes & updates 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
Mirza.Shafique fa986476ee feedback status bar 4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 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
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
haroon amjad 494b1f221d Updates & fixes 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
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad cb220031dd Updates & fixes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
haroon amjad 503ab739ca prescription availability design revamped 4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
haroon amjad a075d53dd5 UI 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 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 7467da7409 Imports organized 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
haroon amjad 44d59ed01a updates & fixes 4 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
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
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 4 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 4 years ago