haroon amjad
|
693f8cb090
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
71a28e2ed6
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
cc783045bb
|
fix categories & cantact design
|
4 years ago |
haroon amjad
|
b15bd2362b
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
haroon amjad
|
2670d0be57
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Fatimah Alshammari
|
de86cffb8c
|
fix lakum issues
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
4 years ago |
Fatimah Alshammari
|
7bbabd798a
|
fix issue
|
4 years ago |
Fatimah Alshammari
|
e640f41c35
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacies/widgets/ProductOrderItem.dart
|
4 years ago |
Fatimah Alshammari
|
12b20831df
|
fix app bar
|
4 years ago |
haroon amjad
|
816dfe4a12
|
Pharmacy fixes
|
4 years ago |
Fatimah Alshammari
|
2992ca4f70
|
fix translation
|
4 years ago |
Fatimah Alshammari
|
bd93395d0f
|
fix order details issue
|
4 years ago |
haroon amjad
|
5f0985adaa
|
Updates
|
4 years ago |
Fatimah Alshammari
|
468d64a1e0
|
fix design issue
|
4 years ago |
Fatimah Alshammari
|
998c1af0f7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
ae3bb1bb2d
|
fix issues
|
4 years ago |
haroon amjad
|
61a406085b
|
lakum fixes
|
4 years ago |
haroon amjad
|
47b7b0db58
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
4 years ago |
Fatimah Alshammari
|
bdf3429502
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
|
4 years ago |
haroon amjad
|
777d88be30
|
updates
|
4 years ago |
Fatimah Alshammari
|
54ff9931cb
|
fixed arrow issue order page
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
Fatimah Alshammari
|
3bfca80ab9
|
fixed issue
|
4 years ago |
haroon amjad
|
4823919fcb
|
Pharmacy fixes
|
4 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
4 years ago |
haroon amjad
|
41822d2cf1
|
Merge branch 'development' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
e494c9304d
|
fixed issues
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
Fatimah Alshammari
|
bdededa397
|
fixed arabic version
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
4 years ago |
Fatimah Alshammari
|
b98d8b3a46
|
fixed prescription issue
|
5 years ago |
Fatimah Alshammari
|
2481e4c9ea
|
fixed categories issues and home page button
|
5 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
|
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 |
Zohaib Iqbal Kambrani
|
15ec3ec9b9
|
Translation Track Driver, enhancement, initial camera
|
5 years ago |
Zohaib Iqbal Kambrani
|
63663f1b24
|
Track Delivery Driver Completed
|
5 years ago |