Commit Graph

6 Commits (3c2a89cd8ea5a5f230908a0ba160eac38f7be385)

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
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago
Zohaib Iqbal Kambrani 15ec3ec9b9 Translation Track Driver, enhancement, initial camera 4 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 years ago
Zohaib Iqbal Kambrani bbd953ae43 Order Delivery Driver tracking [inprogress] 4 years ago