Commit Graph

3483 Commits (605f02afe2fec1025bd6a832787bdc18ad97706b)
 

Author SHA1 Message Date
haroon amjad f1a74749f7 param update 9 months ago
haroon amjad bbc42bd1e7 updates 9 months ago
haroon amjad d3bdcfa975 Apple Pay code merged into main branch 9 months ago
haroon amjad 48202ffd12 updates 9 months ago
haroon amjad bea15150aa Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 10 months ago
haroon amjad ec0bed04d3 Apple Pay in production implemented & tested 10 months ago
haroon amjad fe7c2c6873 CR 6631 10 months ago
haroon amjad ac52ba75a7 Updates & Fixes 10 months ago
haroon amjad 98a5b7d049 my appointments fixes 10 months ago
haroon amjad 27ed5c95f2 update to stores 10 months ago
haroon amjad e67bd54c04 updates 10 months ago
haroon amjad b39357a497 Medical report changes, Loading added in Location Check-In 10 months ago
haroon amjad 63621b5fed Updates & fixes 10 months ago
haroon amjad cd8b76a374 In App Apple Pay implemented 10 months ago
haroon amjad e1718270eb updates 10 months ago
haroon amjad e6d093a84c updates 10 months ago
haroon amjad 86d3e03c06 Updates 10 months ago
haroon amjad e5d8505c2d Updates & fixes 10 months ago
Sultan khan 4b28581c55 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/models/Appointments/toDoCountProviderModel.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/login/login.dart
#	lib/services/authentication/auth_provider.dart
#	lib/widgets/drawer/app_drawer_widget.dart
10 months ago
haroon amjad 75bfeaa716 My appointment fixes 10 months ago
haroon amjad 27b6e04d33 updates 10 months ago
haroon amjad 3401496739 Updates & fixes 10 months ago
Sultan khan 86f5e81fea merge with 3.3 10 months 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
10 months ago
haroon amjad fddb423451 Updates & fixes 10 months ago
haroon amjad aa04e943ef updates & fixes 10 months ago
Sultan khan 98a2545a9b Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	lib/config/config.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/uitl/push-notification-handler.dart
10 months ago
Sultan khan c1fbce7eae bug fixes 10 months ago
haroon amjad cfa341aba5 Apple Pay Updates 10 months ago
haroon amjad 4ac11b2169 LanguageID Fixes 10 months ago
haroon amjad e4ce158277 updates 10 months ago
Sultan khan 4338da513d 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/model/labs/patient_lab_orders.dart
#	lib/core/model/labs/request_patient_lab_special_result.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.dart
#	lib/core/model/rate/appoitment_rated.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/service/medical/radiology_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/models/Authentication/check_activation_code_request.dart
#	lib/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/DrawerPages/notifications/notification_details_page.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/clinic_list.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/splashPage.dart
#	lib/uitl/push-notification-handler.dart
#	lib/widgets/drawer/app_drawer_widget.dart
10 months ago
haroon amjad 52b3c196d6 updates 10 months ago
Faiz Hashmi 704c0bbbc6 Merge branch 'development_v3.3' into dev_3.3_faiz_payfort 10 months ago
Faiz Hashmi fe665fd5ae Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
10 months ago
haroon amjad 512db615be Language ID fixes & app update to stores, VersionID 11.5 10 months ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 10 months ago
haroon amjad 2008ccf92c updates 10 months ago
Faiz Hashmi b769959823 Revert "changes to build app"
This reverts commit 1492efde
10 months ago
Faiz Hashmi 0e67851646 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3 10 months ago
haroon amjad f7dffea2eb Language ID fixes 10 months ago
haroon amjad 724a26ca68 Updates 10 months ago
haroon amjad a9d4cb2fd8 InApp Browser Update 10 months ago
haroon amjad bcfeff2661 updates 10 months ago
haroon amjad cfd8b5e8a5 Language ID Changes 10 months ago
haroon amjad 264aed70a0 NFC Check added 10 months ago
Faiz Hashmi d3b4f37c73 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into development_v3.3
# Conflicts:
#	pubspec.yaml
10 months ago
haroon amjad 165f3fb9f6 NFC Check removed for appo checkin 11 months ago
haroon amjad 47779f6fa7 last appointment rating fixed 11 months ago
haroon amjad 01db5408c9 fixes 11 months ago