Commit Graph

68 Commits (ffc2f2b4bb70fa2fa2510bde49254d7d99ed2d11)

Author SHA1 Message Date
Fatimah Alshammari ffc2f2b4bb fix issues 4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago
Fatimah Alshammari ae3bb1bb2d fix issues 4 years ago
haroon amjad d630c6c45f Pharmacy fixes 4 years ago
hussam al-habibeh b09bc3bef9 merge dev to hussam pharmacy fix 4 years ago
Elham Ali a9bd9f1fdf Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix bottom bar  in cart page

See merge request Cloud_Solution/diplomatic-quarter!504
4 years ago
haroon amjad 289e74fd0a fixes 4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
Elham Ali 47c2c80b36 Merge branch 'nov_fixes' into 'development_new_design_2.0'
Nov fixes

See merge request Cloud_Solution/diplomatic-quarter!502
4 years ago
Elham Rababh 65aac99806 fix Availabilty part 4 years ago
Fatimah Alshammari f5de786745 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
haroon amjad 3ec2f990b1 product detail page updates 4 years ago
Fatimah Alshammari c4e185ea60 fixed issues 4 years ago
haroon amjad 11d37d26e5 Product Detail page fix 4 years ago
haroon amjad 6ffa07392c Product detail page updates 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
Fatimah Alshammari 28678633e7 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
Mohammad Aljammal f424315a19 last commit 😄 4 years ago
Mohammad Aljammal d4283c0116 fix merge issue 4 years ago
Mohammad Aljammal 4cb63e353b 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
4 years ago
Fatimah Alshammari 044f74865e fixed issues 4 years ago
mosazaid 4939fe63d1 pharmacy cart fixe counter 4 years ago
Fatimah Alshammari 42e74759e4 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
4 years ago
Fatimah Alshammari e6378b7ada fix issues 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Elham Rababh 2c30b5a494 fix issues 4 years ago
haroon amjad 3dc82a0547 Pharmacy updates 4 years ago
haroon amjad 9dbe922259 pharmacy updates 4 years ago
Fatimah Alshammari a4f404386b fixed issues 4 years ago
haroon amjad ed4fca2d4c Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!444
5 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
5 years ago
Fatimah Alshammari 30a1353be6 fixed brands design and recommended products issues 5 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
5 years ago
hussam al-habibeh 66acda38a3 add to cart fix 5 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 5 years ago
Elham Rababh be21cb352b return recommended products 5 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 5 years ago
Elham Rababh 944bbce1bf add count to cart 5 years ago
Elham Rababh bfbd04e35d add count to cart 5 years ago
Elham Rababh 3dc28d318a fix bugs on wish list 5 years ago
Elham Rababh b0b278a7e3 fix bugs 5 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
5 years ago
Elham Rababh 9254004125 fix coloring issue 5 years ago