|
|
|
|
@ -22,46 +22,40 @@ class DeliveryConfirmedPage extends StatelessWidget {
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
|
return BaseView<OrdersViewModel>(
|
|
|
|
|
builder: (_, model, w) => AppScaffold(
|
|
|
|
|
body: SafeArea(
|
|
|
|
|
child: Container(
|
|
|
|
|
color: Theme.of(context).primaryColor,
|
|
|
|
|
child: ListView(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Column(
|
|
|
|
|
isShowAppBar: true,
|
|
|
|
|
appBarColor: Theme.of(context).primaryColor,
|
|
|
|
|
arrowColor: Colors.white,
|
|
|
|
|
titleColor: Colors.white,
|
|
|
|
|
body: SafeArea(
|
|
|
|
|
child: Container(
|
|
|
|
|
color: Theme.of(context).primaryColor,
|
|
|
|
|
child: ListView(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Stack(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
child: Container(
|
|
|
|
|
alignment: Alignment.topLeft,
|
|
|
|
|
child: IconButton(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
iconSize: 40,
|
|
|
|
|
icon: Icon(Icons.arrow_back),
|
|
|
|
|
onPressed: () {
|
|
|
|
|
Navigator.pop(context);
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
height: MediaQuery.of(context).size.width * 0.7,
|
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
|
top: MediaQuery.of(context).size.width * 0.2,
|
|
|
|
|
),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white10,
|
|
|
|
|
shape: BoxShape.circle),
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Icon(
|
|
|
|
|
Icons.check_circle,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
size: 60,
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
height: MediaQuery.of(context).size.width * 0.7,
|
|
|
|
|
padding: EdgeInsets.only(
|
|
|
|
|
top: MediaQuery.of(context).size.width * 0.12,
|
|
|
|
|
),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white10, shape: BoxShape.circle),
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Icon(
|
|
|
|
|
Icons.check_circle,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
size: 75,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height:
|
|
|
|
|
MediaQuery.of(context).size.width * 0.03,
|
|
|
|
|
),
|
|
|
|
|
Text(
|
|
|
|
|
TranslationBase.of(context).deliveryInfo,
|
|
|
|
|
@ -70,102 +64,101 @@ class DeliveryConfirmedPage extends StatelessWidget {
|
|
|
|
|
fontSize: 20,
|
|
|
|
|
fontWeight: FontWeight.bold),
|
|
|
|
|
),
|
|
|
|
|
Text(
|
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|
.confirmationSent,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
fontSize: 13,
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height:
|
|
|
|
|
MediaQuery.of(context).size.width * 0.03,
|
|
|
|
|
),
|
|
|
|
|
Text(
|
|
|
|
|
TranslationBase.of(context).confirmationSent,
|
|
|
|
|
style: TextStyle(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
fontSize: 13,
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
height: MediaQuery.of(context).size.width,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
height: MediaQuery.of(context).size.width * 1.0,
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
top: MediaQuery.of(context).size.width * 0.75,
|
|
|
|
|
),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
borderRadius: BorderRadius.only(
|
|
|
|
|
topLeft: Radius.circular(80),
|
|
|
|
|
topRight: Radius.circular(80)),
|
|
|
|
|
),
|
|
|
|
|
Stack(
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.end,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
height: MediaQuery.of(context).size.width,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
width: MediaQuery.of(context).size.width,
|
|
|
|
|
//800,
|
|
|
|
|
height: MediaQuery.of(context).size.width * 1.2,
|
|
|
|
|
//440,
|
|
|
|
|
margin: EdgeInsets.only(top: 60),
|
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
borderRadius: BorderRadius.only(
|
|
|
|
|
topLeft: Radius.circular(80),
|
|
|
|
|
topRight: Radius.circular(80)),
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
bottom: MediaQuery.of(context).size.width * 0.09,
|
|
|
|
|
),
|
|
|
|
|
child: Column(
|
|
|
|
|
mainAxisAlignment: MainAxisAlignment.end,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.center,
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
bottom: MediaQuery.of(context).size.width *
|
|
|
|
|
0.15, //50
|
|
|
|
|
FlatButton.icon(
|
|
|
|
|
padding: EdgeInsets.all(8),
|
|
|
|
|
color: Colors.orangeAccent,
|
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
|
borderRadius: new BorderRadius.circular(10.0),
|
|
|
|
|
),
|
|
|
|
|
child: Column(
|
|
|
|
|
children: <Widget>[
|
|
|
|
|
FlatButton.icon(
|
|
|
|
|
padding: EdgeInsets.all(8),
|
|
|
|
|
color: Colors.orangeAccent,
|
|
|
|
|
shape: RoundedRectangleBorder(
|
|
|
|
|
borderRadius:
|
|
|
|
|
new BorderRadius.circular(10.0),
|
|
|
|
|
),
|
|
|
|
|
label: Text(
|
|
|
|
|
TranslationBase.of(context).addNoteBtn,
|
|
|
|
|
style: TextStyle(color: Colors.white),
|
|
|
|
|
),
|
|
|
|
|
icon: Icon(
|
|
|
|
|
Icons.mode_edit,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
onPressed: () {},
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height:
|
|
|
|
|
MediaQuery.of(context).size.width *
|
|
|
|
|
0.1, //20,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.all(10),
|
|
|
|
|
child: SecondaryButton(
|
|
|
|
|
label: TranslationBase.of(context)
|
|
|
|
|
.nextDelivery,
|
|
|
|
|
onTap: () {
|
|
|
|
|
getNextOrder(context, model);
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
label: Text(
|
|
|
|
|
TranslationBase.of(context).addNoteBtn,
|
|
|
|
|
style: TextStyle(color: Colors.white),
|
|
|
|
|
),
|
|
|
|
|
icon: Icon(
|
|
|
|
|
Icons.mode_edit,
|
|
|
|
|
color: Colors.white,
|
|
|
|
|
),
|
|
|
|
|
onPressed: () {},
|
|
|
|
|
),
|
|
|
|
|
SizedBox(
|
|
|
|
|
height:
|
|
|
|
|
MediaQuery.of(context).size.width * 0.02, //20,
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.all(10),
|
|
|
|
|
child: SecondaryButton(
|
|
|
|
|
label: TranslationBase.of(context).nextDelivery,
|
|
|
|
|
onTap: () {
|
|
|
|
|
getNextOrder(context, model);
|
|
|
|
|
},),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
CustomerBriefCard(
|
|
|
|
|
itemId: item.orderID,
|
|
|
|
|
customerFirstName: item.firstName,
|
|
|
|
|
customerLastName: item.lastName,
|
|
|
|
|
mobileNo: item.mobileNumber,
|
|
|
|
|
totalPayment: item.amount,
|
|
|
|
|
deliveryTime: item.orderCreatedOn),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
Container(
|
|
|
|
|
margin: EdgeInsets.only(
|
|
|
|
|
top: MediaQuery.of(context).size.width * 0.6,
|
|
|
|
|
),
|
|
|
|
|
child: CustomerBriefCard(
|
|
|
|
|
itemId: item.orderID,
|
|
|
|
|
customerFirstName: item.firstName,
|
|
|
|
|
customerLastName: item.lastName,
|
|
|
|
|
mobileNo: item.mobileNumber,
|
|
|
|
|
totalPayment: item.amount,
|
|
|
|
|
showDistance: false,
|
|
|
|
|
deliveryTime: item.orderCreatedOn),
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
),
|
|
|
|
|
],),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
),
|
|
|
|
|
|
hussam al-habibeh
5 years ago