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
|
5 years ago |
haroon amjad
|
289e74fd0a
|
fixes
|
5 years ago |
Elham Rababh
|
05e4e7be45
|
fix bottom bar in cart page
|
5 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
|
5 years ago |
Elham Rababh
|
65aac99806
|
fix Availabilty part
|
5 years ago |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
5 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
5 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
5 years ago |
haroon amjad
|
11d37d26e5
|
Product Detail page fix
|
5 years ago |
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
5 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
5 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
|
5 years ago |
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
5 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
|
5 years ago |
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
5 years ago |
Mohammad Aljammal
|
f424315a19
|
last commit 😄
|
5 years ago |
Mohammad Aljammal
|
d4283c0116
|
fix merge issue
|
5 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
|
5 years ago |
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
5 years ago |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
5 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
|
5 years ago |
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
5 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
Elham Rababh
|
2c30b5a494
|
fix issues
|
5 years ago |
haroon amjad
|
3dc82a0547
|
Pharmacy updates
|
5 years ago |
haroon amjad
|
9dbe922259
|
pharmacy updates
|
5 years ago |
Fatimah Alshammari
|
a4f404386b
|
fixed issues
|
5 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 |
mosazaid
|
8b5e1e57c7
|
fix bugs pharmacy wishlist
|
5 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
|
5 years ago |
mosazaid
|
a41980b252
|
fix bugs pharmacy wishlist
|
5 years ago |
Elham Rababh
|
7de8c2588f
|
fix coloring issue
|
5 years ago |
Elham Rababh
|
2981eb3236
|
fix public card issues
|
5 years ago |
Elham Rababh
|
3b79d0ac41
|
return the disable colors
|
5 years ago |
Elham Rababh
|
47e19c4ab5
|
add loader and cache on images
|
5 years ago |
Elham Rababh
|
1e1e230908
|
fix call service in case not login
|
5 years ago |
Elham Rababh
|
a5751f0d70
|
handel un login cases
|
5 years ago |