|
|
|
@ -70,6 +70,7 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
TabBar(
|
|
|
|
TabBar(
|
|
|
|
labelPadding: EdgeInsets.only(left: 3.0, right: 3.0),
|
|
|
|
labelPadding: EdgeInsets.only(left: 3.0, right: 3.0),
|
|
|
|
labelColor: Colors.black,
|
|
|
|
labelColor: Colors.black,
|
|
|
|
|
|
|
|
indicatorColor: Colors.green,
|
|
|
|
tabs: [
|
|
|
|
tabs: [
|
|
|
|
Tab(text: TranslationBase.of(context).delivered),
|
|
|
|
Tab(text: TranslationBase.of(context).delivered),
|
|
|
|
Tab(text: TranslationBase.of(context).processing),
|
|
|
|
Tab(text: TranslationBase.of(context).processing),
|
|
|
|
@ -127,7 +128,18 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
return Container(
|
|
|
|
return Container(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Row(
|
|
|
|
InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
deliveredOrderList[
|
|
|
|
|
|
|
|
index]),
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment:
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
@ -196,17 +208,6 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
child: InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
deliveredOrderList[
|
|
|
|
|
|
|
|
index]),
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
languageID == "ar"
|
|
|
|
languageID == "ar"
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
@ -215,9 +216,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -394,7 +395,17 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
return Container(
|
|
|
|
return Container(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Row(
|
|
|
|
InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
processingOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment:
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
@ -463,16 +474,6 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
child: InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
processingOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
languageID == "ar"
|
|
|
|
languageID == "ar"
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
@ -481,9 +482,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -837,7 +838,17 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Row(
|
|
|
|
InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
pendingOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment:
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
@ -908,16 +919,6 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
child: InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
pendingOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
languageID == "ar"
|
|
|
|
languageID == "ar"
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
@ -926,9 +927,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -1106,7 +1107,17 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
child: Column(
|
|
|
|
child: Column(
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
Row(
|
|
|
|
InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
cancelledOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: Row(
|
|
|
|
mainAxisAlignment:
|
|
|
|
mainAxisAlignment:
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
MainAxisAlignment.spaceBetween,
|
|
|
|
children: <Widget>[
|
|
|
|
children: <Widget>[
|
|
|
|
@ -1177,16 +1188,6 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Container(
|
|
|
|
Container(
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
margin: EdgeInsets.all(8.0),
|
|
|
|
child: InkWell(
|
|
|
|
|
|
|
|
onTap: () {
|
|
|
|
|
|
|
|
Navigator.push(
|
|
|
|
|
|
|
|
context,
|
|
|
|
|
|
|
|
FadePage(
|
|
|
|
|
|
|
|
page: OrderDetailsPage(
|
|
|
|
|
|
|
|
orderModel:
|
|
|
|
|
|
|
|
cancelledOrderList[
|
|
|
|
|
|
|
|
index])));
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
child: SvgPicture.asset(
|
|
|
|
languageID == "ar"
|
|
|
|
languageID == "ar"
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
? 'assets/images/pharmacy/arrow_left.svg'
|
|
|
|
@ -1195,9 +1196,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
|