Commit Graph

31 Commits (dc3d3bc7726cdfe5a0a4ea37ec6e174e12b4dfd7)

Author SHA1 Message Date
Fatimah Alshammari eb4801c7ee fixed rating issues 4 years ago
haroon amjad be771917f0 pharmacy fixes 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 bc91b9ad88 bottom nav pharmacy 4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 4 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 4 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 4 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 4 years ago
Fatimah Alshammari ac63f09633 edit arabic version 4 years ago
Fatimah Alshammari 8baad999c5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/config/config.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
hussam al-habibeh 806e07e4e6 products categories page fix 4 years ago
hussam al-habibeh e4d54f0c0b parent product and sub product update 4 years ago
hussam al-habibeh f1c2dbbbfc Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/parent_categorise_page.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 0a1db70229 parent product and sub product update 4 years ago
Fatimah Alshammari 7ebeb8cb4b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh b0165c0d29 fix pharmacy products filtering 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
hussam al-habibeh a534b1415e products filtering fix 5 years ago
hussam al-habibeh 2723422bbf daynimic listing 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 5 years ago
hussam al-habibeh e85b21c08f parent_categorise_page update 5 years ago
hussam al-habibeh 64cbae3602 Search 5 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 5 years ago
hussam al-habibeh 69a6bc2812 offers page 5 years ago