Commit Graph

15 Commits (dc3d3bc7726cdfe5a0a4ea37ec6e174e12b4dfd7)

Author SHA1 Message Date
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
Elham Rababh 2526d6bc6f fix issue in cart page 4 years ago
Elham Rababh 055b888ba2 fix address 4 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
mosazaid 2843b1393e some design enhancments 5 years ago
mosazaid d77a607b78 commit 5 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
5 years ago
mosazaid c058cf0e93 finish address add/edit/delete/select 5 years ago
mosazaid 6ac8d67b83 finish address add/edit/delete/select 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
Fatimah Alshammari 1e00b9a4d8 added my-profile 5 years ago