Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed

# Conflicts:
#	lib/pages/delivery/delivery_confirmed_page.dart
#	lib/pages/delivery/information_page.dart
setting_branch
enadhilal 6 years ago
parent 4096288fc6
commit ee067c4001

@ -16,9 +16,9 @@ class PendingOrdersRes {
String descriptionN; String descriptionN;
double longitude; double longitude;
double latitude; double latitude;
Null amount; dynamic amount;
String orderCreatedOn; String orderCreatedOn;
Null ePharmacyOrderNo; dynamic ePharmacyOrderNo;
int projectID; int projectID;
String appointmentNo; String appointmentNo;
String dischargeID; String dischargeID;

Loading…
Cancel
Save