Commit Graph

475 Commits (85c8f5466f9ffdfa4b3f2a32a8bc1107cb205685)

Author SHA1 Message Date
haroon amjad f265c605ca Merge branch 'merge-update-with-lab-changes' into update-to-3.32-sdk
# Conflicts:
#	android/app/local.properties
#	android/app/src/main/AndroidManifest.xml
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Podfile
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/config/localized_values.dart
#	lib/core/model/labs/LabOrderResult.dart
#	lib/core/model/labs/lab_result.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/new_ui/exception_widget/ExceptionBottomSheet.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/forgot-password.dart
#	lib/pages/login/register_new.dart
#	lib/pages/login/saved_login.dart
#	lib/pages/login/welcome.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/uitl/app_toast.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/Lab_Result_details_wideget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/pickupLocation/PickupLocationFromMap.dart
#	pubspec.yaml
6 months ago
Aamir Muhammad 24a4020f5c fixes 6 months ago
Aamir Muhammad e64d1088a6 changes 6 months ago
Aamir Muhammad ff12e832ab fixes 6 months ago
Aamir Muhammad f04928c3e8 fixes for login & register (Points) 6 months ago
Aamir Muhammad ee4ae657b0 fixes 6 months ago
Aamir Muhammad e306bfd69b saved login fixes & design changes. 6 months ago
Aamir Muhammad 23fc89b40a font changes 6 months ago
Aamir Muhammad 6b96b6fc9e ui fixes 6 months ago
Aamir Muhammad 9704ef232f caleder changes 6 months ago
Aamir Muhammad 2dd823667c register Design. 6 months ago
Aamir Muhammad 93649616b2 translation & register Design changes. 6 months ago
Aamir Muhammad 16b37b847d translation & register Design changes. 6 months ago
Aamir Muhammad 6578baaf34 login using sms done 6 months ago
Aamir Muhammad 7ff7f88e24 updated app to latest flutter sdk with android native changes. 6 months ago
haroon amjad e748712954 Initial Commit 6 months ago
Aamir Muhammad 2346195844 fixes 6 months ago
Aamir Muhammad c666ba219c changes 6 months ago
Aamir Muhammad e571248b8d fixes 6 months ago
Aamir Muhammad bdaef7f89c fixes for login & register (Points) 6 months ago
Aamir Muhammad fd0635764d fixes 6 months ago
Aamir Muhammad da32bd8df1 saved login fixes & design changes. 7 months ago
Aamir Muhammad 54d17d2c16 font changes 7 months ago
Aamir Muhammad f0a80f7a25 ui fixes 7 months ago
Aamir Muhammad 0ac06092c2 caleder changes 7 months ago
Aamir Muhammad 0194ab9189 register Design. 7 months ago
Aamir Muhammad 3ee1ca8ebf translation & register Design changes. 7 months ago
Aamir Muhammad 1483b0c3b6 translation & register Design changes. 7 months ago
Aamir Muhammad cb9e152c01 login using sms done 7 months ago
Aamir Muhammad 0d3cf1b3c8 updated app to latest flutter sdk with android native changes. 7 months ago
Aamir Muhammad 8f8769d99a updated app to latest flutter sdk with android native changes. 7 months ago
Aamir Muhammad 5fb40a7c5f updated app to latest flutter sdk. 7 months ago
haroon amjad 9eb0947d12 Initial Commit 7 months ago
haroon amjad 21fda7987a Updates & fixes, App uploaded to Stores VersionID 17.9 11 months ago
haroon amjad 7ed401fb1c Riyal symbol update & sent to stores VersionID 17.8 11 months ago
haroon amjad f74a3301da SAR new symbol integrated 11 months ago
haroon amjad 780f645cbe Updates & fixes, CR 6038 Ask Dr changes implemented 1 year ago
haroon amjad cd7da0dd70 Penguin SDK changes & crashlytics 1 year ago
haroon amjad 20bfdc3652 Project Name Top & Bottom changes implemented 1 year ago
Aamir.Muhammad e045c375d2 Merge branch 'refs/heads/dev_v3.13.6' into dev_v3.13.6_PenguinIn_3.22-IOS
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad dc17576c26 Flutter version upgraded to 3.22.0 1 year ago
haroon amjad ed037edf22 Apple Pay fixes 1 year ago
haroon amjad 53015422e5 PenguinIn integration with HMG App 1 year ago
Sultan khan c9be715436 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/blood_donation.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
2 years ago
haroon amjad 7b181192f6 Apple Pay updates 2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Sultan khan eee2ccf148 updates 2 years ago
Aamir Muhammad b6d222a7ea JIRA Fixes 2 years ago
Sultan khan 0e04012219 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/services/clinic_services/get_clinic_service.dart
2 years ago
Sultan khan a4ed832147 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/pages/ErService/OrderLogPage.dart
#	lib/pages/ErService/rapid-response-team/rrt-request-page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/payfort_services/payfort_service.dart
#	lib/services/payfort_services/payfort_view_model.dart
#	lib/splashPage.dart
#	pubspec.yaml
2 years ago