Commit Graph

656 Commits (a59c60f79a2ed5d0bbf3c1a238697940530ce771)

Author SHA1 Message Date
haroon amjad 494b1f221d Updates & fixes 3 years ago
haroon amjad 1858be18b7 Feedback Status fixes 3 years ago
Haroon Amjad 59dac89118 updates 3 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
3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
haroon amjad babb48b1db base app client changes 3 years ago
haroon amjad 03882c166c Translation & UI updates 3 years ago
Fatimah Alshammari 9cf0794cf6 Fixed out of stuck items issues 3 years ago
haroon amjad e564cdc7e5 Updates & fixes 3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
Fatimah Alshammari e2763a5bd5 fixed cart shopping issues 3 years ago
Sikander Saleem ae85f75e81 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/feedback/status_feedback_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem a026fbf940 feedback status added. 3 years ago
haroon amjad 07a98d75c6 My tracker fixes 3 years ago
haroon amjad 40cbca565a fixes 3 years ago
Sultan Khan 160049973e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan e3a7c08e7c blood type changes 3 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
3 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 3 years ago
haroon amjad b475adb5c3 Updates & fixes 3 years ago
Elham Rababh 2526d6bc6f fix issue in cart page 3 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 3 years ago
haroon amjad 0a9d0e5eaa fixes 3 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
3 years ago
Sikander Saleem f509679173 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 3 years ago
haroon amjad 022b1bd000 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad cb220031dd Updates & fixes 3 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 3 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 3 years ago
haroon amjad 7264d03818 Family Files previleges fix 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
Mohammad Aljammal 29d0afdea4 Merge branch 'product_detail_page' into 'development'
fix bottom sheet functions

See merge request Cloud_Solution/diplomatic-quarter!424
3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
haroon amjad 2c4ff16f0c updates & fixes 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Elham Rababh 8fac62bcb1 fix bottom sheet functions 3 years ago
mosazaid c1f3d3cc1c fixes 3 years ago
Mohammad Aljammal 0150bc4684 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/ProductCheckTypeWidget.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
3 years ago
Mohammad Aljammal eb19daa98f fix car count 3 years ago
Elham Rababh b0b278a7e3 fix bugs 3 years ago
haroon amjad 503ab739ca prescription availability design revamped 3 years ago
mosazaid 4d37bc2958 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
 Conflicts:
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/pharmacies/screens/product-details/recommended_products.dart
	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
	lib/widgets/others/app_scafold_detail_page.dart
3 years ago
mosazaid a41980b252 fix bugs pharmacy wishlist 3 years ago
haroon amjad 69af6799c4 updates 3 years ago
Elham Rababh 58d43f7e46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 3 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
mosazaid 0d2d4c64c2 fix bugs pharmacy home and increase performance 3 years ago