Commit Graph

37 Commits (e6fd5293ca2b32b5b7fa4e81f86e4ef97c0070c8)

Author SHA1 Message Date
hussam al-habibeh 7607631052 sub categories pagnation 4 years ago
Elham Rababh 258e107e1b fix cart order page 4 years ago
Elham Rababh 7b6622ee4c fix cart order page 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
haroon amjad f4ccecc1af Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
fix issue

See merge request Cloud_Solution/diplomatic-quarter!516
4 years ago
Fatimah Alshammari adfa707eda fix issue 4 years ago
Elham Rababh 6ff829ab91 fix cart order page 4 years ago
Elham Rababh fb1d07fcba fix cart back button 4 years ago
haroon amjad 67b6fd4ab6 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7a8ed5b014 Total amount calculation fixes 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
haroon amjad a3fdb35c30 fixes 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh a35e149088 product pagination 4 years ago
Elham Rababh 8a168386da fix black screen which is appear in cart page 4 years ago
Elham Rababh b7dc6ee4b1 change model 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
Fatimah Alshammari 23acdfd494 fix loader issue and design 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad 8d6278a59b 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 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 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
4 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
4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
Elham Rababh 616748dc6f fix proceed button 4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
Fatimah Alshammari 428791c725 fixed design 4 years ago
Fatimah Alshammari 1089ce3aa3 Updates 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad 9dbe922259 pharmacy updates 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago