Commit Graph

14 Commits (123b1de1a45a2e0696ef29fedd7b233573e1c946)

Author SHA1 Message Date
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
Fatimah Alshammari c629fcb85c fixed recommended products new design 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
enadhilal 0c6fb67718 fixed issues 4 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 4 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 4 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
4 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
4 years ago