Commit Graph

46 Commits (ff72b4b31e64d9d670161172961c75832ddf709c)

Author SHA1 Message Date
Zohaib Iqbal Kambrani a398220033 no message 3 years ago
haroon amjad 3eb7a4325b updates & fixes 3 years ago
haroon amjad efced34ffa Updates 3 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 3 years ago
haroon amjad c2b0326676 Updates & fixes 3 years ago
Sikander Saleem 684add0090 merge improvements 3 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
3 years ago
haroon amjad 4c2410cfd5 Health plugin updated 3 years ago
haroon amjad 330f2d6c86 Fixes & updates 3 years ago
haroon amjad d5b58c07ca Smartwatch fixes 3 years ago
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 3 years ago
haroon amjad cf27c3e796 Incoming call & LiveCare pending UI revamped 3 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 3 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 3 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 3 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 3 years ago
haroon amjad e679c7df0d updates & fixes 3 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
3 years ago
haroon amjad 44d59ed01a updates & fixes 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 3 years ago
Sultan Khan d6fd03b571 CONFIG 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 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
4 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 4 years ago
haroon amjad db0fcd51cc pharmacy updates 4 years ago
mosazaid 0b2002d4dd finish payment order 4 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago
haroon amjad 146019432a LiveCare schedule implemented 4 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 4 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 4 years ago
haroon amjad 85062859c8 updates 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
haroon amjad b89c1f03b3 language translation fixes 4 years ago
haroon amjad 506e32e8c8 Payment issues resolved 4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
haroon amjad 4f53d058d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 4 years ago
haroon amjad 750746aabe updates & fixes 4 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 4 years ago
haroon amjad 3a9fa97c91 updates 4 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 4 years ago
haroon amjad 00d9214460 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
4 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 4 years ago