Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
5 years ago |
Mohammad Aljammal
|
50a45528d1
|
Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
|
5 years ago |
Fatimah Alshammari
|
8624d695dc
|
fixed order details
|
5 years ago |
Fatimah Alshammari
|
747763c4be
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
5 years ago |
mosazaid
|
44287db553
|
bug-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 |
mosazaid
|
dfeb70c892
|
Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
|
5 years ago |
mosazaid
|
0b2002d4dd
|
finish payment order
|
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
|
f3cdd08857
|
adding fharmacy payment feature
|
5 years ago |
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
5 years ago |
Fatimah Alshammari
|
7a516cae51
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
|
5 years ago |
Fatimah Alshammari
|
0f22a50a5d
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
|
5 years ago |
Zohaib Iqbal Kambrani
|
bbd953ae43
|
Order Delivery Driver tracking [inprogress]
|
5 years ago |
Fatimah Alshammari
|
a1b2709ac8
|
fixed orders
|
5 years ago |
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
5 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
5 years ago |
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
5 years ago |
Fatimah Alshammari
|
e5bf7acc52
|
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
5 years ago |
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
5 years ago |
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
5 years ago |
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
5 years ago |
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
5 years ago |
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
5 years ago |
Fatimah Alshammari
|
f137bd44c0
|
created order and order details UI pages
|
5 years ago |