Commit Graph

34 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)

Author SHA1 Message Date
haroon amjad a6c6651363 Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
haroon amjad 6d88607631 Updates & fixes 4 years ago
haroon amjad c05772c63a pharmacy fixes 4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
haroon amjad 302e9dbadd Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Fatimah Alshammari c84d1cadad fix address issue 4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
Elham Rababh 34596163d1 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes 4 years ago
Elham Rababh 12e47aba82 fix as first step 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
haroon amjad 61a406085b lakum fixes 4 years ago
haroon amjad 4823919fcb Pharmacy fixes 4 years ago
Elham Rababh f88864efd4 fix calling missing APi 4 years ago
Elham Rababh 2c3c270c43 finish steps inside payment 4 years ago
Elham Rababh df9e58402d first step from update design 4 years ago
Elham Rababh f8883f5439 first step from fixing check out process 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
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