haroon amjad
|
b51989e798
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacies/compare.dart
# lib/pages/pharmacies/my_reviews.dart
# lib/pages/pharmacies/wishlist.dart
|
5 years ago |
 Sikander Saleem
|
f0bb94c422
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
|
haroon amjad
|
7467da7409
|
Imports organized
|
5 years ago |
Fatimah Alshammari
|
6d72be2a73
|
fixed cart order issues
|
5 years ago |
|
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
5 years ago |
mosazaid
|
74dd274502
|
working on pharmacy some fixes on cart page and request body
|
5 years ago |
|
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
5 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
6 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
6 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
6 years ago |
|
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
6 years ago |