You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
PatientApp-KKUMC/lib/pages/pharmacies/screens
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
..
cart-page Merge branch 'development' into haroon-new-design 4 years ago
product-details Merge branch 'development' into haroon-new-design 4 years ago
address-select-page.dart design fixes 1.1 4 years ago
lacum-activitaion-vida-page.dart some fixes on pharmacy 5 years ago
lacum-registration-page.dart Lakum & other fixes 4 years ago
lacum-setting-page.dart some fixes on pharmacy 5 years ago
lacum-transfer-page.dart some fixes on pharmacy 5 years ago
lakum-main-page.dart Lakum & other fixes 4 years ago
lakum-points-month-page.dart fix merge issues 5 years ago
lakum-points-year-page.dart fix merge issues 5 years ago
lakum-terms-conditions-page.dart some design enhancments 5 years ago
order-preview-page.dart Revert "Merge branch 'pharmacy-hussam' into 'master'" 5 years ago
payment-method-select-page.dart Pharmacy Payment method design fix, Blood Donation fix 4 years ago
pharmacy-terms-conditions-page.dart Imports organized 4 years ago
pharmacy_module_page.dart Merge branch 'development' into haroon-new-design 4 years ago
phramacy-product-detail-page.dart finish home page and start working on order preview page 5 years ago
recommended-product-page.dart Imports organized 4 years ago