Commit Graph

176 Commits (f547dc105cf09ad4c8e2015bae63e61aceb2eacd)

Author SHA1 Message Date
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
haroon amjad b08dfb117c Updates & fixes 4 years ago
haroon amjad ddf764897a Pharmacy Payment method design fix, Blood Donation fix 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad eed4fd2509 Pharmacy prescriptions page design 4 years ago
haroon amjad 9dbe922259 pharmacy updates 4 years ago
haroon amjad e58b925382 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/cart-order-page.dart
4 years ago
Fatimah Alshammari a4f404386b fixed issues 4 years ago
haroon amjad 41822d2cf1 Merge branch 'development' into haroon-new-design 4 years ago
Fatimah Alshammari e494c9304d fixed issues 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
haroon amjad 832d48971f updates 4 years ago
Sikander Saleem ba4792cd38 merge improvements. 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
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
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 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
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
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 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
Elham Rababh be21cb352b return recommended products 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
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 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 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
Sikander Saleem b4031e973e chevron icon to arrow forward 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
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
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 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