Commit Graph

745 Commits (f52aed49fd124e185ffdfd58bb9bc4d37b52bc31)

Author SHA1 Message Date
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
2 years ago
haroon amjad fddb423451 Updates & fixes 2 years 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
2 years ago
haroon amjad c6c4f933b2 Invoice Type param added in Labs & Rad 2 years ago
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
2 years ago
haroon amjad a0bca92195 CR Implemented 2 years ago
haroon amjad 245716119e Location based Check In implemented 2 years ago
haroon amjad 6dd5fda997 Location check in implementing 2 years ago
haroon amjad a6a541b903 Lab Orders CR implementation contd. 2 years ago
haroon amjad b10383c3ff Translation updates 2 years ago
haroon amjad dd0099236d Insurance dialog added post registration 2 years ago
haroon amjad cb2bacf539 Update insurance for cash patient in ToDo List 2 years ago
haroon amjad 185f54d26d updates & fixes 2 years ago
haroon amjad 542501f5c5 updates 2 years ago
haroon amjad af5b0766a2 CR 6654, Disable update manual insurance temporarily. 2 years ago
haroon amjad df610690d5 updates 2 years ago
haroon amjad e780df90e1 updates 2 years ago
haroon amjad 9ed454f67a Cash patient check implemented 2 years ago
haroon amjad 49963911ba Patient eligibility change 2 years 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
2 years ago
haroon amjad 1300dadce1 Inpatient advance payment 2 years ago
haroon amjad a9ae44ca89 Implemented checks for InPatient CR 2 years ago
haroon amjad dd79b1dfca InPatient pending advance payment done 2 years ago
haroon amjad 4afdf5545e Translations added 2 years ago
haroon amjad a17b941c63 InPatient Medical Report continued 3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad f624c70cee Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad b92e45aa93 Updates & fixes 3 years ago
haroon amjad a60f66a069 Updates 3 years ago
haroon amjad 3fb8876c31 Manual Insurance Card Update 3 years ago
haroon amjad 0e054429ef Meal Plan implementation completed 3 years ago
haroon amjad 6877244d0e CR# 5805 Ask Doc Improvements dev completed. 3 years ago
haroon amjad 60d5ba4a9e Birth Notification implemented 3 years ago
haroon amjad 420aef3195 Updates 3 years ago
haroon amjad 01ee9a2710 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad e098705374 localized strings 3 years ago
haroon amjad 7280e2a1d7 Birth Notification UI Implemented 3 years ago
haroon amjad a7a06f4083 Home page change 3 years ago
haroon amjad 2fea4b2b07 Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
#	lib/pages/landing/widgets/services_view.dart
3 years ago
haroon amjad b304332526 Patient app release to stores 10.4 3 years ago
haroon amjad 701eedf147 updates 3 years ago
haroon amjad 128bd2ec54 Inpatient services implementation 3 years ago
haroon amjad dc859b01f7 updates & fixes 3 years ago
haroon amjad 3bc09f792a Pharma LiveCare fixes 3 years ago
haroon amjad 4ecab57173 Pharma LiveCare updates 3 years ago
haroon amjad da423fe12a Pharma LiveCare updates 3 years ago
haroon amjad 4f50c3ff8e Pharmacy LiveCare revamped 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad 6bdb7a3305 Updates & fixes 3 years ago
haroon amjad 2e72d6a550 LiveCare contact added 3 years ago
haroon amjad aafdf3760d added sick leave status text & color 3 years ago
haroon amjad c8ec536267 Sickleave CR done 3 years ago
haroon amjad 25af2c23ef Sick leave CR, LiveCare support call, Appo calendar changes 3 years ago
haroon amjad 22a0e456bc Manual Insurance Updates, Service ID fixes, Tamara Fixes 3 years ago
haroon amjad e80ac2481a Ancillary order & manual insurance update 3 years ago
haroon amjad 442a94ac08 Updates & fixes 3 years ago
haroon amjad 3709ebcb32 Updates 3 years ago
haroon amjad 7ae4e7d616 updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 2ba744c3a6 Timezone fixes & Activate/Deactivate file changes 4 years ago
haroon amjad ca43849d9d CMC Updates 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
haroon amjad 27c6837f25 updates & fixes 4 years ago
Zohaib Iqbal Kambrani fb4fb8d29e Merge branch 'development_v2.5' into zik_webrtc_dev_v2.5
* development_v2.5:
  Google analytics events update
  Updates
  Updates & fixes
  DateTime Fixes
  HHC Fixes
  updates & fixes
  Updates & fixes

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 1faf27959a Updates 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
Zohaib Iqbal Kambrani 612d9eb019 Project Filter Applied on Packages & Offers 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad 8d988ba994 updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad a918d409fb updates & fixes 4 years ago
haroon amjad 32edb2e71e updates 4 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
haroon amjad ac5077e9e7 Translation fixes 4 years ago
haroon amjad 736edad018 OB Gyne appo updates 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
haroon amjad 7f5f3ababe Registration fix 4 years ago
haroon amjad 0acc134e6e Updates & fixes 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
4 years ago
haroon amjad 693f8cb090 Updates & fixes 4 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 4 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 4 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
Fatimah Alshammari 0985436a10 fix translation issue 4 years ago
haroon amjad 4e3d99b007 Updates & fixes 4 years ago
haroon amjad b15bd2362b Updates & fixes 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Fatimah Alshammari a55ca33c1b Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/search_products_page.dart
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari bc9fc5a878 fix issue 4 years ago
haroon amjad 14b0c4c125 Merge branch 'products_tails' into 'development_new_design_2.0'
fix on design

See merge request Cloud_Solution/diplomatic-quarter!550
4 years ago
Elham Rababh d6eeb02c91 fix on design 4 years ago
haroon amjad d1fcdcc898 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
Elham Rababh c6be53d800 first step from product details 4 years ago