Commit Graph

1758 Commits (30a1353be637374a2d2fee81d3c39e6e2b4e6cbf)
 

Author SHA1 Message Date
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 4 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 4 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
4 years ago
Mohammad Aljammal 0e5fd1d1ec Merge branch 'fatima-new' into 'development'
Fatima new

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

See merge request Cloud_Solution/diplomatic-quarter!423
4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Mohammad Aljammal ad8fd65f75 Merge branch 'product_detail_page' into 'development'
add count to cart

See merge request Cloud_Solution/diplomatic-quarter!422
4 years ago
Elham Rababh 944bbce1bf add count to cart 4 years ago
Elham Rababh bfbd04e35d add count to cart 4 years ago
mosazaid acdd19eeed calling cart from pharmacy home and add provider to it 4 years ago
Mohammad Aljammal f736ab5365 Merge branch 'fix_product_tile' into 'development'
Fix product tile

See merge request Cloud_Solution/diplomatic-quarter!421
4 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
4 years ago
Mohammad Aljammal d2be206d6c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!420
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 4 years ago
Fatimah Alshammari 4309952b17 fixed subCategories 4 years ago
Elham Rababh b0b278a7e3 fix bugs 4 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
4 years ago
Elham Rababh 9254004125 fix coloring issue 4 years ago
Mohammad Aljammal 0e373059a0 Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!419
4 years ago
mosazaid 8b5e1e57c7 fix bugs pharmacy wishlist 4 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
4 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 4 years ago
Elham Rababh 7de8c2588f fix coloring issue 4 years ago
Mohammad Aljammal 00a0e34347 Merge branch 'product_detail_page' into 'development'
add loader and cache on images

See merge request Cloud_Solution/diplomatic-quarter!415
4 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Mohammad Aljammal e578b1e759 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home and increase performance

See merge request Cloud_Solution/diplomatic-quarter!416
4 years ago
Elham Rababh 2981eb3236 fix public card issues 4 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 4 years ago
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 055b888ba2 fix address 4 years ago
Elham Rababh 3b79d0ac41 return the disable colors 4 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 4 years ago
Mohammad Aljammal 48642a3c7c Merge branch 'product_detail_page' into 'development'
Product detail page

See merge request Cloud_Solution/diplomatic-quarter!414
4 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Elham Rababh 1e1e230908 fix call service in case not login 4 years ago
Mohammad Aljammal b539ff5851 Merge branch 'pharmacy_fix' into 'development'
cart fix

See merge request Cloud_Solution/diplomatic-quarter!413
4 years ago
Elham Rababh a5751f0d70 handel un login cases 4 years ago
hussam al-habibeh c56e4a1a5c cart fix 4 years ago
Mohammad Aljammal 6339e30369 Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!412
4 years ago
mosazaid a9d0b7a14b fix bugs pharmacy home 4 years ago
Elham Rababh 19cb48e133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 4 years ago
Elham Rababh 338901d423 remove add to cart 4 years ago
Elham Rababh 7c15bca746 fix item 4 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 4 years ago