Commit Graph

30 Commits (eefdb1fa3ec2ec1194b2ed92a263ebf691fd366d)

Author SHA1 Message Date
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
haroon amjad a0bca92195 CR Implemented 2 years ago
devamirsaleemahmad 1c19b36d2d models updates -> 3.13.6 2 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Zohaib Iqbal Kambrani d1c99d1d82 ER Average waiting time label applied 4 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Mohammad Aljammal ec401d4848 Done Ed online 5 years ago
Mohammad Aljammal 4457b5f109 add translation to ER service 5 years ago
mosazaid 5bcc67b77d Nearest Er fix design 5 years ago
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
Mohammad Aljammal c7d396875e Ambulance Service steps 5 years ago
Mohammad Aljammal f543126152 Ambulance Service 5 years ago
Amjad amireh 368db03ab8 edit card_position.dart 5 years ago
Amjad amireh d1a01f5afa edit card_position.dart 5 years ago
Amjad amireh 525080c09e edit card_position.dart 5 years ago
Amjad amireh e638464657 edit card_position.dart 5 years ago
Mohammad Aljammal ddf53ce999 ER 5 years ago
Mohammad Aljammal 50d1e50df4 ER 5 years ago
Mohammad Aljammal ed1c04ab25 ER 5 years ago
Mohammad Aljammal 629251d216 ER 5 years ago
Mohammad Aljammal 5485cbab36 ER 5 years ago
Mohammad Aljammal 2ef36d3d8a ER 5 years ago
Mohammad Aljammal f534f8a348 ER 5 years ago
Mohammad Aljammal 20f9f6f06c ER 5 years ago
Mohammad Aljammal db79f299b6 ER 5 years ago
Mohammad Aljammal e254261ef9 ER 5 years ago
Mohammad Aljammal 4ffbb80f3d ER 5 years ago