|
|
|
@ -69,6 +69,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),
|
|
|
|
@ -126,7 +127,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>[
|
|
|
|
@ -195,17 +207,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'
|
|
|
|
@ -214,9 +215,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -393,7 +394,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>[
|
|
|
|
@ -462,16 +473,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'
|
|
|
|
@ -480,9 +481,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -836,7 +837,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>[
|
|
|
|
@ -907,16 +918,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'
|
|
|
|
@ -925,9 +926,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
@ -1105,7 +1106,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>[
|
|
|
|
@ -1176,16 +1187,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'
|
|
|
|
@ -1194,9 +1195,9 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
width: 20,
|
|
|
|
width: 20,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
|
|
|
|
),
|
|
|
|
Divider(
|
|
|
|
Divider(
|
|
|
|
color: Colors.grey[350],
|
|
|
|
color: Colors.grey[350],
|
|
|
|
height: 20,
|
|
|
|
height: 20,
|
|
|
|
|