Commit Graph

15 Commits (2ec9331d2f27e829f5c84e90a2ba2fef2b03f7bb)

Author SHA1 Message Date
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
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 5 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Fatimah Alshammari ed68eed9df added links for profile 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