Commit Graph

1278 Commits (bc91b9ad88c462099f279c59880477d5789968ff)

Author SHA1 Message Date
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 3 years ago
Fatimah Alshammari a4f404386b fixed issues 3 years ago
Fatimah Alshammari e494c9304d fixed issues 3 years ago
Fatimah Alshammari f649701276 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 3 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
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 d8db5ad590 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/pharmacies/screens/cart-order-page.dart
3 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 3 years ago
hussam al-habibeh 75ef3fde80 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix
 Conflicts:
	lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart
3 years ago
hussam al-habibeh 66acda38a3 add to cart fix 3 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 3 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 3 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 3 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
3 years ago
Elham Rababh be21cb352b return recommended products 3 years ago
Fatimah Alshammari ac63f09633 edit arabic version 3 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
3 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 3 years ago
Fatimah Alshammari 74929f76e5 edit home page 3 years ago
Mohammad Aljammal bcd99555e3 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!423
3 years ago
mosazaid c1f3d3cc1c fixes 3 years ago
Elham Rababh 944bbce1bf add count to cart 3 years ago
Elham Rababh bfbd04e35d add count to cart 3 years ago
mosazaid acdd19eeed calling cart from pharmacy home and add provider to it 3 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
3 years ago
Mohammad Aljammal eb19daa98f fix car count 3 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 3 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 3 years ago
Elham Rababh b0b278a7e3 fix bugs 3 years ago
Elham Rababh 145117aa63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
3 years ago
Elham Rababh 9254004125 fix coloring issue 3 years ago
mosazaid 8b5e1e57c7 fix bugs pharmacy wishlist 3 years ago
mosazaid 4d37bc2958 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
	lib/pages/pharmacies/screens/product-details/recommended_products.dart
	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
	lib/widgets/others/app_scafold_detail_page.dart
3 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 3 years ago
Elham Rababh 7de8c2588f fix coloring issue 3 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 3 years ago
Elham Rababh 2981eb3236 fix public card issues 3 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 3 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 3 years ago
Elham Rababh 055b888ba2 fix address 3 years ago
Elham Rababh 3b79d0ac41 return the disable colors 3 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 3 years ago
Mohammad Aljammal 48642a3c7c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!414
3 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 3 years ago
Elham Rababh 1e1e230908 fix call service in case not login 3 years ago
Elham Rababh a5751f0d70 handel un login cases 3 years ago
Mohammad Aljammal 6339e30369 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
3 years ago