Fatimah Alshammari
|
12b20831df
|
fix app bar
|
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 |
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 |
Sikander Saleem
|
ca363adee2
|
merge & improvements
|
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
|
5 years ago |
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
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 |
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
5 years ago |
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
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 |