Commit Graph

1778 Commits (a40cd6ccd2ed9767006223495a6532fda5999328)
 

Author SHA1 Message Date
haroon amjad a40cd6ccd2 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!451
4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
Fatimah Alshammari f649701276 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 3be7f7f899 fixed loader issue 4 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
4 years ago
haroon amjad 2709b177c6 Merge branch 'pharmacy_fix' into 'development'
add to cart fix

See merge request Cloud_Solution/diplomatic-quarter!435
4 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 4 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 4 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
4 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 4 years ago
hussam al-habibeh a8fb7152b1 add to cart fix 4 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
4 years ago
Mohammad Aljammal 0590642854 Merge branch 'cart' into 'development'
Cart

See merge request Cloud_Solution/diplomatic-quarter!434
4 years ago
hussam al-habibeh 66acda38a3 add to cart fix 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
Mohammad Aljammal 26c83cd93d Merge branch 'pharmacy_fix_bugs' into 'development'
Pharmacy fix bugs

See merge request Cloud_Solution/diplomatic-quarter!430
4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 years ago
Fatimah Alshammari 10f75191c6 added shopping cart to categories 4 years ago
mosazaid c7f558b92e Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 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 988625e4f1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 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