Commit Graph

15 Commits (3fb522e15f6232598e2c75d52338cc49c85c0437)

Author SHA1 Message Date
Mohammad Aljammal 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/widgets/pharmacy/product_tile.dart
4 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
4 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
4 years ago
Fatimah Alshammari fda101840a fixed order isuues 4 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 4 years ago
Fatimah Alshammari 4a84483698 fixed order details 4 years ago
enadhilal 727940c5c6 fixed merging issues 4 years ago
enadhilal 9c55571072 Merge branch 'pharmacy' into enad_pharmacy2 4 years ago
enadhilal c22ca4e29e Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/locator.dart
#	lib/pages/base/base_view.dart
#	lib/pages/landing/home_page.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
enadhilal 888a74fb9b add these pages
​Product Tile Component
Product Detail Page
​Wishlist Page
​Reviews Page
Brands Page + Search
4 years ago
Fatimah Alshammari 9b8103bfd6 fixe order and order details 4 years ago
Fatimah Alshammari f137bd44c0 created order and order details UI pages 4 years ago
enadhilal 7ca6e6caa7 fix widget of product_tile 4 years ago
enadhilal d6d1c26c9a add product_tile widget 4 years ago