Commit Graph

288 Commits (faf3bbdd9ea8dbcd154e588bfa137c0fb4f1548d)

Author SHA1 Message Date
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad d8e9f36844 updates 2 years ago
Sultan khan f29d33d7e7 Changes for voice command search 3 years ago
haroon amjad 98abc5a069 updates 3 years ago
haroon amjad 0e01835327 Target SDK & Compile SDK bumped to 33 3 years ago
Zohaib Iqbal Kambrani 35b129fb68 migrated project to latest flutter sdk 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 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
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad 94aab4a737 Speech to text fix in iOS 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad eb64962d7c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b0ae08d6a5 updates & fixes 4 years ago
Elham Rababh 16c1064a45 PMAU-19 4 years ago
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
Elham Rababh 05e4e7be45 fix bottom bar in cart page 4 years ago
hussam al-habibeh 5927f3e35f pharmacy home page update 4 years ago
haroon amjad be771917f0 pharmacy fixes 4 years ago
haroon amjad 8d6278a59b Pharmacy fixes 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
hussam al-habibeh 46d7e7ee14 show bottom nav in pharmacy all pages 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
haroon amjad 5e5f540431 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Zohaib Iqbal Kambrani 9fd2304d33 tamara. 4 years ago
haroon amjad e913316c54 Updates 4 years ago
Mirza.Shafique e3bfe83ea2 app bar back icon issue 4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
Mirza.Shafique a273bacc17 design fixes 1.1 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 832d48971f updates 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
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
Elham Rababh 75fdadafbd refactor widget in the cart preview 4 years ago
mosazaid b779c250a4 pharmacy cart and wishlist fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
mosazaid 9a1dc3c678 pharmacy cart and wishlist fixes 4 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
4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
mosazaid c1f3d3cc1c fixes 4 years ago
Elham Rababh 2981eb3236 fix public card issues 4 years ago
Elham Rababh ad0c8eaffb fix scaffold 4 years ago
Elham Rababh 65cf4316ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Elham Rababh bb96201c2e remove the custom scaffold 4 years ago
mosazaid c558fe6bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
hussam al-habibeh cb2b9db0ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix 4 years ago