Commit Graph

1129 Commits (77651f965257b086e1db6d0b2a8ae0cf85fa3850)

Author SHA1 Message Date
Aamir Muhammad 77651f9652 Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/push-notification-handler.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/uitl/utils_new.dart
#	lib/widgets/avatar/large_avatar.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/bottom_options/BottomSheet.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
11 months ago
devamirsaleemahmad d73cc13100 Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
11 months ago
haroon amjad 1ecb8ebfe9 updated to stores version 11.3 11 months ago
Aamir Muhammad 542864c89c Gif Loader & My Family Fixes 11 months ago
haroon amjad f8fb336740 Location checkin privilege applied 12 months ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 12 months ago
haroon amjad 245716119e Location based Check In implemented 12 months ago
haroon amjad 6dd5fda997 Location check in implementing 12 months ago
devamirsaleemahmad 0e8c1a8b2f Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/book_reminder_page.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/ToDoList/widgets/paymentDialog.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	pubspec.yaml
12 months ago
haroon amjad 7c426b90e5 updates 12 months ago
haroon amjad b10383c3ff Translation updates 12 months ago
haroon amjad dd0099236d Insurance dialog added post registration 12 months ago
haroon amjad 1997dbe128 updates 12 months ago
haroon amjad cb2bacf539 Update insurance for cash patient in ToDo List 12 months ago
devamirsaleemahmad ed748a626b changes 12 months ago
haroon amjad 81de6f9848 updated app to stores Version ID 11.0 12 months ago
devamirsaleemahmad 4231c85055 Merge branch 'development_v3.3' 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/privilege/VidaPlusProjectListModel.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/model/radiology/request_send_rad_report_email.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/service/privilege_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/core/viewModels/medical/radiology_view_model.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/models/anicllary-orders/ancillary_order_list_model.dart
#	lib/models/anicllary-orders/ancillary_orders_proc_list.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/Blood/confirm_payment_page.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/insurance/insurance_update_screen.dart
#	lib/pages/login/login.dart
#	lib/pages/medical/ask_doctor/doctor_response.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/pages/medical/balance/my_balance_page.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/pages/medical/radiology/radiology_home_page.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/splashPage.dart
#	lib/uitl/utils.dart
#	lib/widgets/bottom_navigation/bottom_navigation_item.dart
#	lib/widgets/data_display/medical/LabResult/FlowChartPage.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/data_display/medical/medical_profile_item.dart
#	pubspec.yaml
12 months ago
haroon amjad d5dd8757e9 Privileges added for QR & NFC CheckIn options 12 months ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 12 months ago
haroon amjad 6bd6572e7e Lab, Rad & prescription disabled in my appointments screen in case of ER appointment (Clinic ID 10) & project is Vida Plus. 1 year ago
haroon amjad 185f54d26d updates & fixes 1 year ago
haroon amjad 542501f5c5 updates 1 year ago
haroon amjad a5e0de08ce updates for ancillary 1 year ago
Sultan khan c63a1fadf5 code updated in-progress 1 year ago
devamirsaleemahmad e8e7a726f5 updates -> 3.13.6 1 year ago
Sultan khan b45cbbcf29 updates 1 year ago
haroon amjad 7c804f77fb updates & fixes 1 year ago
haroon amjad 645e266af8 Vida plus updates sent to stores 1 year ago
haroon amjad f0a4bd6925 Commented the CRs code 1 year ago
haroon amjad 3f6c05825d updates 1 year ago
haroon amjad 4e962bda07 Merge branch 'development_v3.3' into PatientApp_VIDA_Plus_3.3
# Conflicts:
#	lib/config/config.dart
#	lib/core/model/labs/request_send_lab_report_email.dart
#	lib/core/service/medical/ask_doctor_services.dart
#	lib/core/service/medical/labs_service.dart
#	lib/core/viewModels/medical/labs_view_model.dart
#	lib/pages/conference/web_rtc/call_home_page_.dart
#	lib/pages/medical/labs/laboratory_result_page.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/SignalRUtil.dart
#	lib/uitl/utils.dart
#	lib/widgets/others/floating_button_search.dart
1 year ago
haroon amjad af5b0766a2 CR 6654, Disable update manual insurance temporarily. 1 year ago
haroon amjad df610690d5 updates 1 year ago
haroon amjad e780df90e1 updates 1 year ago
haroon amjad d8e9f36844 updates 1 year ago
Sultan khan abcf82346e Excluded change 1 year ago
haroon amjad 31144c7c27 updates 1 year ago
haroon amjad 2048747a62 ancillary updates 1 year ago
haroon amjad 9ed454f67a Cash patient check implemented 1 year ago
haroon amjad 49963911ba Patient eligibility change 1 year ago
haroon amjad 6f20f1b871 InPatient Discharge Medications 1 year ago
haroon amjad 72ee34f9a7 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/insurance/AttachInsuranceCardImageDialog.dart
#	lib/uitl/translations_delegate_base.dart
1 year ago
haroon amjad 0f863cd259 Updates & fixes 1 year ago
haroon amjad 6b121e7f39 Store build version 4.5.026 1 year ago
haroon amjad 1300dadce1 Inpatient advance payment 1 year ago
haroon amjad 4a7ca9cd46 InPatient advance payment history implemented 1 year ago
haroon amjad c58e180c91 Updates 1 year ago
haroon amjad 7c68779324 Nphies integration 1 year ago
haroon amjad ae0fca865d InPatient Advance payment API implemented 1 year ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 1 year ago