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.

Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima ... # Conflicts: # lib/core/model/pharmacies/order_model.dart # lib/pages/pharmacies/product-brands.dart # lib/pages/pharmacies/screens/pharmacy_module_page.dart # lib/pages/pharmacy/order/Order.dart # lib/pages/pharmacy/order/OrderDetails.dart # lib/pages/pharmacy/profile/profile.dart		4 years ago
..
address-select-page.dart	fix merge issues	4 years ago
cart-order-page.dart	fix bugs	4 years ago
cart-order-preview.dart	adding fharmacy payment feature	4 years ago
lacum-activitaion-vida-page.dart	some fixes on pharmacy	4 years ago
lacum-registration-page.dart	some design enhancments	4 years ago
lacum-setting-page.dart	some fixes on pharmacy	4 years ago
lacum-transfer-page.dart	some fixes on pharmacy	4 years ago
lakum-main-page.dart	some fixes on pharmacy	4 years ago
lakum-points-month-page.dart	fix merge issues	4 years ago
lakum-points-year-page.dart	fix merge issues	4 years ago
lakum-terms-conditions-page.dart	some design enhancments	4 years ago
order-preview-page.dart	Revert "Merge branch 'pharmacy-hussam' into 'master'"	4 years ago
payment-method-select-page.dart	fix merge issues	4 years ago
pharmacy-terms-conditions-page.dart	fix merge issues	4 years ago
pharmacy_module_page.dart	Merge branch 'development' into pharmacy-Fatima	4 years ago
phramacy-product-detail-page.dart	finish home page and start working on order preview page	4 years ago
recommended-product-page.dart	fix recommended for you	4 years ago