Commit Graph

104 Commits (5b7b40c732d9e5448ffbf94aeb165898979b78bf)

Author SHA1 Message Date
haroon amjad 5b7b40c732 Updates & fixes 1 year ago
haroon amjad c97fd25cdd Zoom integration updates & other stability fixes 1 year ago
Haroon Amjad 582f1f1566 updates 1 year ago
haroon amjad 9ab10eebce Zoom Video SDK integrated 2 years ago
Sultan khan 08b4c8f86e Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/config/config.dart
#	lib/core/viewModels/project_view_model.dart
#	lib/main.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/widgets/LiveCareHistoryCard.dart
#	lib/pages/medical/eye/ContactLensPage.dart
#	lib/pages/medical/medical_profile_page_new.dart
#	lib/uitl/LocalNotification.dart
#	lib/uitl/gif_loader_dialog_utils.dart
#	lib/widgets/Loader/gif_loader_container.dart
#	lib/widgets/data_display/medical/time_line_new_widget.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
haroon amjad 162b2fd22a updates 2 years ago
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
Sultan khan 30c14c2167 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
#	lib/core/model/reports/Reports.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/viewModels/medical/ask_doctor_view_model.dart
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/BookAppointment/BookSuccess.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/DrawerPages/family/my-family.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/MyAppointments.dart
#	lib/pages/MyAppointments/widgets/PrescriptionReport.dart
#	lib/pages/ToDoList/ObGyne/ObGyne-TimeSlots.dart
#	lib/pages/ToDoList/ToDo.dart
#	lib/pages/medical/eye/EyeHomePage.dart
#	lib/pages/medical/reports/report_list_widget.dart
#	lib/services/appointment_services/GetDoctorsList.dart
#	lib/uitl/location_util.dart
#	lib/uitl/utils.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	pubspec.yaml
2 years ago
Faiz Hashmi ccb9e93d62 Added InAppApple Pay with PayFort 2 years ago
Aamir Muhammad 6f99aca8a5 Inpatient Cr Merge 2 years ago
devamirsaleemahmad 1ddac14efb Calender Permission Fix Ios 17+ 2 years ago
Aamir Muhammad f211fd5617 Call Notification Fix 2 years ago
Aamir Muhammad b4bc99369f Changes into Rating Bar 2 years ago
devamirsaleemahmad d6f51f6c82 changes 2 years ago
devamirsaleemahmad cbc38940ea changes 2 years ago
devamirsaleemahmad 3f1ba19c64 changes & Null to Dynamic 2 years ago
devamirsaleemahmad 8544b3ce3d changes & Deletion 2 years ago
Sultan khan c63a1fadf5 code updated in-progress 2 years ago
Sultan khan b45cbbcf29 updates 2 years ago
haroon amjad e50a67ea12 Vida Plus changes 3 years ago
haroon amjad 22274ebbb0 updates & fixes 3 years ago
haroon amjad 58a6dc6a6f Tamara & Apple Pay Fixes + Other Updates 3 years ago
haroon amjad 8b7a6e7689 ED Online Check-In 3 years ago
haroon amjad 9057a96d7f Updates & fixes 3 years ago
haroon amjad 927db41068 Covid updates & other fixes 4 years ago
haroon amjad 4b4ac4819f no message 4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 4 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 4 years ago
haroon amjad 39190681c6 Updates 4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
hussam al-habibeh bc91b9ad88 bottom nav pharmacy 4 years ago
Zohaib Iqbal Kambrani 8b1ac05012 Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0: (105 commits)
  app bar back icon issue
  improvements
  emergency nearest ui changes
  Zoom Avatar implementation
  no message
  Child Vaccine 3
  register
  register page
  Working on Health data
  Child Vaccine 2
  registration
  Ereferral fixed, HHC moved to new APIs, Notification new design implemented
  registration done
  Child Vaccine 1.0
  In App Review
  In App Review
  oder log merge fix
  design fixes 3
  Chart fix & In-App update implemented
  design fixes 1.1
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad 12a58856e5 Chart fix & In-App update implemented 4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
Mohammad Aljammal eb19daa98f fix car count 4 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 4 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 4 years ago
Sikander Saleem f6ae7ed770 merge changes-4 4 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 4 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 4 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 4 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago