Commit Graph

15 Commits (8b7d0d4a7e7ba2d8e8a23d2e682e987b11c75bfe)

Author SHA1 Message Date
Sultan khan 90dc8e5e05 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/models/LiveCare/ApplePayInsertRequest.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/uitl/location_util.dart
#	pubspec.yaml
2 years ago
haroon amjad fe7c2c6873 CR 6631 2 years ago
Sultan khan d0c7b08eac 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/core/service/client/base_app_client.dart
	lib/core/viewModels/er/EdOnlineViewModel.dart
	lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart
	lib/pages/BookAppointment/DentalComplaints.dart
	lib/pages/BookAppointment/components/SearchByClinic.dart
	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/landing/landing_page.dart
	lib/pages/livecare/widgets/clinic_card.dart
	lib/pages/login/login.dart
	lib/pages/rateAppointment/rate_appointment_clinic.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/services/clinic_services/get_clinic_service.dart
	lib/uitl/push-notification-handler.dart
	lib/widgets/others/bottom_bar.dart
	pubspec.yaml
2 years ago
haroon amjad 4ac11b2169 LanguageID Fixes 2 years ago
devamirsaleemahmad cb56750e6b models updates -> 3.13.6 2 years ago
haroon amjad 75685b1f61 Project selection added in Laser & advance payment 3 years ago
haroon amjad dfa88b7de7 Updates, fixes & release VersionID 9.1 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 894cc0e336 Updates & fixes 4 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 5 years ago
Mohammad Aljammal a0300738e8 done My balance 6 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 6 years ago