Commit Graph

227 Commits (a9bd9f1fdf771e0d57ea381f99f4e0b946916250)

Author SHA1 Message Date
Elham Ali a9bd9f1fdf Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar  in cart page

See merge request Cloud_Solution/diplomatic-quarter!504
3 years ago
haroon amjad 289e74fd0a fixes 3 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 3 years ago
haroon amjad 08f0f7b660 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!501
3 years ago
Elham Ali 47c2c80b36 Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes

See merge request Cloud_Solution/diplomatic-quarter!502
3 years ago
Elham Rababh 65aac99806 fix Availabilty part 3 years ago
Fatimah Alshammari d1e0b6ccd9 fix issue 3 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 3 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Elham Rababh dc7a5d3dca Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
haroon amjad 3ec2f990b1 product detail page updates 3 years ago
Fatimah Alshammari c4e185ea60 fixed issues 3 years ago
Elham Rababh b7dc6ee4b1 change model 3 years ago
Fatimah Alshammari 444bc7383d Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 62d904aa68 fixed issues 3 years ago
Elham Rababh 41097f119c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
haroon amjad 11d37d26e5 Product Detail page fix 3 years ago
Elham Rababh 4e54349e3b Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 3 years ago
Elham Rababh df9e58402d first step from update design 3 years ago
haroon amjad 6ffa07392c Product detail page updates 3 years ago
Elham Rababh f8883f5439 first step from fixing check out process 3 years ago
Fatimah Alshammari 239d2c1036 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 3 years ago
haroon amjad e1e31de818 Lakum fixes 3 years ago
haroon amjad be771917f0 pharmacy fixes 3 years ago
haroon amjad bebcd85557 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 5943522163 UI fixes 3 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
3 years ago
Fatimah Alshammari 78fc77159c fix lakum issues 3 years ago
haroon amjad 8d6278a59b 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
Mohammad Aljammal c0cf2f71a2 Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy

See merge request Cloud_Solution/diplomatic-quarter!478
3 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 3 years ago
haroon amjad 8c99bba17b Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad e82b8d4439 Lakum & other fixes 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
Mohammad Aljammal f424315a19 last commit 😄 3 years ago
Mohammad Aljammal d4283c0116 fix merge issue 3 years ago
Mohammad Aljammal 4cb63e353b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
3 years ago
Fatimah Alshammari 044f74865e fixed issues 3 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 3 years ago
Elham Rababh c97c39ea11 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
 Conflicts:
	lib/config/config.dart
	lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
3 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 3 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
3 years ago
Fatimah Alshammari e6378b7ada fix issues 3 years ago
Elham Rababh 616748dc6f fix proceed button 3 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
3 years ago
haroon amjad b08dfb117c Updates & fixes 3 years ago
Elham Rababh 2c30b5a494 fix issues 3 years ago
Fatimah Alshammari c242910aa2 fixed issues 3 years ago