From 1356709c668d9c07ce5f806b8f35fa9d72910ae2 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Tue, 24 Nov 2020 18:07:24 +0200 Subject: [PATCH] ES-185:add pharmacy order id --- .../orders/deliverd_order_res_model.dart | 2 +- .../orders/pending_orders_req_model.dart | 2 +- .../delivery/delivery_confirmed_page.dart | 3 +- lib/pages/delivery/information_page.dart | 3 +- lib/widgets/delivery/customer_brief_card.dart | 33 ++++++++++++++----- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/lib/core/model/orders/deliverd_order_res_model.dart b/lib/core/model/orders/deliverd_order_res_model.dart index eec0584..a1d8619 100644 --- a/lib/core/model/orders/deliverd_order_res_model.dart +++ b/lib/core/model/orders/deliverd_order_res_model.dart @@ -25,7 +25,7 @@ class DeliverdOrderResModel { String patientID; bool patientOutSA; int channel; - double distanceInKilometers; + dynamic distanceInKilometers; List itemsQuantitiesList; DeliverdOrderResModel( diff --git a/lib/core/model/orders/pending_orders_req_model.dart b/lib/core/model/orders/pending_orders_req_model.dart index 5bc368f..0ac5649 100644 --- a/lib/core/model/orders/pending_orders_req_model.dart +++ b/lib/core/model/orders/pending_orders_req_model.dart @@ -9,7 +9,7 @@ class PendingOrders { String firstName; String lastName; String mobileNumber; - int distanceInKilometers; + dynamic distanceInKilometers; String longitude; String latitude; int driverAppPageID; diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/delivery_confirmed_page.dart index bf46ec7..c1196b0 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/delivery_confirmed_page.dart @@ -184,7 +184,8 @@ class DeliveryConfirmedPage extends StatelessWidget { : MediaQuery.of(context).size.width * 0.4, ), child: CustomerBriefCard( - itemId: item.orderID, + customerOrderId: item.orderID, + pharmacyOrderId: item.ePharmacyOrderNo, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/information_page.dart index 98d60f6..d069607 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/information_page.dart @@ -336,7 +336,8 @@ class InformationPage extends StatelessWidget { ), ), CustomerBriefCard( - itemId: item.orderID, + customerOrderId: item.orderID, + pharmacyOrderId: item.ePharmacyOrderNo, customerFirstName: item.firstName, customerLastName: item.lastName, mobileNo: item.mobileNumber, diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index 4a51523..66c3634 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -4,7 +4,8 @@ import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart'; import 'package:flutter/material.dart'; class CustomerBriefCard extends StatelessWidget { - final int itemId; + final int customerOrderId; + final int pharmacyOrderId; final String time; final String customerFirstName; final String customerLastName; @@ -18,7 +19,8 @@ class CustomerBriefCard extends StatelessWidget { final dynamic distanceInKilometers; CustomerBriefCard({ - this.itemId, + this.customerOrderId, + this.pharmacyOrderId, this.time, this.customerFirstName, this.customerLastName, @@ -68,12 +70,27 @@ class CustomerBriefCard extends StatelessWidget { children: [ Expanded( flex: 3, - child: Text( - 'ID: ${itemId}', - style: TextStyle( - color: Color(0xff636363), - fontWeight: FontWeight.w500, - fontSize: 17.5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Customer Order Id: ${customerOrderId}', + style: TextStyle( + color: Color(0xff636363), + fontWeight: FontWeight.w500, + fontSize: 17.5), + ), + SizedBox( + height: 10, + ), + Text( + 'Pharmacy Order Id: ${pharmacyOrderId}', + style: TextStyle( + color: Color(0xff636363), + fontWeight: FontWeight.w500, + fontSize: 17.5), + ), + ], ), ), Expanded(