Commit Graph

31 Commits (dc3d3bc7726cdfe5a0a4ea37ec6e174e12b4dfd7)

Author SHA1 Message Date
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
hussam al-habibeh cb85085969 show bottom nav in pharmacy all pages 4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad e82b8d4439 Lakum & other fixes 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 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
Fatimah Alshammari c629fcb85c fixed recommended products new design 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal 0c6fb67718 fixed issues 5 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
5 years ago
mosazaid 1a45f99606 some fixes on pharmacy 5 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 5 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari ba4003cb56 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/locator.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari 52fa0f6f89 fixed orders 5 years ago
mosazaid 2843b1393e some design enhancments 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal c82f01cd1a fix merge issues 5 years ago
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
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 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 1e00b9a4d8 added my-profile 5 years ago