Commit Graph

33 Commits (e917da91838ace226f152d43b0a7b4fe6e621ad4)

Author SHA1 Message Date
Elham Rababh 05e4e7be45 fix bottom bar in cart page 3 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
Fatimah Alshammari 62d904aa68 fixed issues 3 years ago
Fatimah Alshammari eb4801c7ee fixed rating issues 3 years ago
haroon amjad be771917f0 pharmacy fixes 3 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
3 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 3 years ago
Fatimah Alshammari e6378b7ada fix issues 3 years ago
Elham Rababh 2c30b5a494 fix issues 3 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 3 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 3 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 3 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 3 years ago
Elham Rababh 2981eb3236 fix public card issues 3 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
3 years ago
hussam al-habibeh 9a2d52309c products categories page fix 3 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
3 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 3 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
3 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 3 years ago
Elham Rababh cc88f0f81e first step of fixing 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 years ago
hussam al-habibeh 8c58dced7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/core/service/pharmacy_categorise_service.dart
	lib/pages/final_products_page.dart
4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
mosazaid 5d0a122689 fix bugs 4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 4 years ago
Mohammad Aljammal 77dcb918c3 Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
4 years ago
hussam al-habibeh 64cbae3602 Search 4 years ago
hussam al-habibeh 69ea8b7bd7 daynmic products listing 4 years ago