Commit Graph

48 Commits (8d4fb5bbc668ea46ee1c2bf027ce19e07db2b401)

Author SHA1 Message Date
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
3 years ago
haroon amjad 9b3c07d3b1 Added AED in advance payment 3 years ago
haroon amjad ff23f3a8cb fixes 3 years ago
haroon amjad f28fcbd006 AdvanceNumber_VP added 3 years ago
haroon amjad 5045cc6faa Pharma LiveCare "IsPharmacy" Param added, Added Google API Availability check for Huawei devices 3 years ago
haroon amjad 74b0acefd3 Updates & fixes 3 years ago
haroon amjad e03412214e Ambulance request fixes 4 years ago
haroon amjad 21cf9da900 HMS Core & LiveCare Schedule fixes 4 years ago
haroon amjad 3896f02d13 Timezone Updates 4 years ago
haroon amjad 4ba229c436 Updates 4 years ago
haroon amjad eb3f5b5cb5 Updates & fixes 4 years ago
haroon amjad 4cbccd8efb analytics events update 4 years ago
Zohaib Iqbal Kambrani 86363a15d6 Merge branch 'development_v2.5' into zik_development_v2.5
* development_v2.5:
  Updates & fixes
  ED Online Check-In
  Calendar fixes
  updates & fixes
4 years ago
Zohaib Iqbal Kambrani 5c32e488d0 no message 4 years ago
haroon amjad 3396b4253b Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 1c6a62776c Analytics statements align to bottom of block 4 years ago
haroon amjad 9057a96d7f Updates & fixes 4 years ago
haroon amjad f1129cc14c updates & fixes 4 years ago
haroon amjad c3538ebdb6 Updates & fixes 4 years ago
haroon amjad aae48f2555 Android permission dialog updates 4 years ago
haroon amjad 60a44f9a42 OpenTok fixes 4 years ago
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad aa36154764 Updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 40d649dfa4 Updates & fixes 4 years ago
Haroon Amjad 59dac89118 updates 5 years ago
haroon amjad e564cdc7e5 Updates & fixes 5 years ago
haroon amjad 6c4afaf114 Advance payment API updates 5 years ago
haroon amjad 7467da7409 Imports organized 5 years ago
haroon amjad f946a7be4d updates & fixes 5 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
5 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 5 years ago
Mirza.Shafique afb08fcd0a Booking Filters Update 5 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 5 years ago
haroon amjad e679c7df0d updates & fixes 5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago
haroon amjad 506e32e8c8 Payment issues resolved 5 years ago
haroon amjad 15a8e64e7c updates & fixes 5 years ago
haroon amjad dfa7e0e02f updates & fixes 6 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 6 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 6 years ago
Mohammad Aljammal a0300738e8 done My balance 6 years ago