Commit Graph

106 Commits (c56e4a1a5c72d9ef376dd0165b6e59cd33c79622)

Author SHA1 Message Date
Mohammad Aljammal 76eef8625d Merge branch 'pharmacy_fix_bugs' into 'development'
fix bugs pharmacy home

See merge request Cloud_Solution/diplomatic-quarter!411
4 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
Elham Rababh e20e90c20c fix quantity_box 4 years ago
Elham Rababh d5f1a162c0 replace bottom sheet button 4 years ago
mosazaid 185d66e342 fix bugs pharmacy home 4 years ago
Elham Rababh 6fe41382c0 first step from design 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid f47d59c43f fix bugs pharmacy home 4 years ago
Elham Rababh 2839af658a fix issues 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid 01a77d5352 fix bugs pharmacy 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 4 years ago
Elham Rababh db277a62f5 fix brand design 4 years ago
Elham Rababh 9b42d411ca remove cart from product details 4 years ago
Elham Rababh cc88f0f81e first step of fixing 4 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 4 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 239ad530ce fixed isuues 4 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 4 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 5 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 5 years ago
Fatimah Alshammari faa8a13778 fixed isuue-product details 5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
haroon amjad 74671d2f25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/order-preview-service.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
haroon amjad b9a12341d5 updates & fixes 5 years ago
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
Fatimah Alshammari e5829d8513 fix recommended for you 5 years ago
mosazaid c64769e422 Merge branch 'development' into pharmacy-payment-feature 5 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 5 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
5 years ago