Commit Graph

13 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)

Author SHA1 Message Date
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
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
hussam al-habibeh d4fd95606e add pharmacy icons for bottom nav 4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
hussam al-habibeh f7cee8f484 pharmacy module app && category home page 5 years ago