Commit Graph

21 Commits (8e255f1f2226131bf376e27162fcabab2718d52b)

Author SHA1 Message Date
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