Commit Graph

20 Commits (ecaf503f8bb746cffbda3d2428278b0cfbe1f8c1)

Author SHA1 Message Date
Sultan khan eee2ccf148 updates 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
Sultan khan 001417f9b3 fixes 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 cb220031dd Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Sikander Saleem a61fea551c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 4 years ago
Sikander Saleem acd3855c77 Merge branch 'development' into development_new_design_2.0 4 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 4 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 4 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 4 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Mohammad Aljammal 4457b5f109 add translation to ER service 5 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
jammal 9328f942ba done ER service 5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago