Commit Graph

14 Commits (a09b43ef8cb3f9de1b16d5f555429fa3665a8045)

Author SHA1 Message Date
Sikander Saleem ca363adee2 merge & improvements 4 years ago
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
5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 5 years ago
Fatimah Alshammari 7a516cae51 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Zohaib Iqbal Kambrani bbd953ae43 Order Delivery Driver tracking [inprogress] 5 years ago
Fatimah Alshammari a1b2709ac8 fixed orders 5 years ago
Fatimah Alshammari 52fa0f6f89 fixed orders 5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Fatimah Alshammari f137bd44c0 created order and order details UI pages 5 years ago