 Sikander Saleem
|
ca363adee2
|
merge & improvements
|
3 years ago |
Fatimah Alshammari
|
b98d8b3a46
|
fixed prescription issue
|
4 years ago |
|
Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
4 years ago |
mosazaid
|
b623bd0dce
|
Merge branch 'development' into fix_bugs
|
4 years ago |
|
mosazaid
|
e5474b3062
|
fix perscription pages bugs
|
4 years ago |
Zohaib Iqbal Kambrani
|
b91ce441e2
|
Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
Mohammad Aljammal
|
50a45528d1
|
Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes
See merge request Cloud_Solution/diplomatic-quarter!276
|
4 years ago |
|
Fatimah Alshammari
|
8624d695dc
|
fixed order details
|
4 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
|
4 years ago |
|
mosazaid
|
44287db553
|
bug-fixes
|
4 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
|
4 years ago |
|
mosazaid
|
dfeb70c892
|
Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
mosazaid
|
0b2002d4dd
|
finish payment order
|
4 years ago |
|
Fatimah Alshammari
|
c629fcb85c
|
fixed recommended products new design
|
4 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
Fatimah Alshammari
|
e5829d8513
|
fix recommended for you
|
4 years ago |
|
mosazaid
|
f3cdd08857
|
adding fharmacy payment feature
|
4 years ago |
enadhilal
|
0cb493d56c
|
Merge branch 'development' into enad_pharmacy2
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
enadhilal
|
0c6fb67718
|
fixed issues
|
4 years ago |
|
Fatimah Alshammari
|
42bf76f712
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
15ec3ec9b9
|
Translation Track Driver, enhancement, initial camera
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
4 years ago |
|
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
516df96e21
|
no message
|
4 years ago |
|
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
4 years ago |
|
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
4 years ago |
|
Fatimah Alshammari
|
7a516cae51
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
Fatimah Alshammari
|
0f22a50a5d
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
|
Zohaib Iqbal Kambrani
|
bbd953ae43
|
Order Delivery Driver tracking [inprogress]
|
4 years ago |
|
Fatimah Alshammari
|
a1b2709ac8
|
fixed orders
|
4 years ago |
|
Fatimah Alshammari
|
ba4003cb56
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
|
4 years ago |
|
Fatimah Alshammari
|
52fa0f6f89
|
fixed orders
|
4 years ago |
|
mosazaid
|
2843b1393e
|
some design enhancments
|
4 years ago |
Mohammad Aljammal
|
de1b7cc1d0
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
c82f01cd1a
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
16d1f667d4
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
mosazaid
|
d77a607b78
|
commit
|
4 years ago |
|
mosazaid
|
38d58ebaaf
|
Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
4 years ago |
|
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
Fatimah Alshammari
|
5fa5e9b7c8
|
fixed orders and profile
|
4 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
|
4 years ago |
|
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
4 years ago |
|
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
4 years ago |
|
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
4 years ago |
|
mosazaid
|
c058cf0e93
|
finish address add/edit/delete/select
|
4 years ago |
|
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
4 years ago |
|
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
4 years ago |
|
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
4 years ago |
|
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |