|
|
|
@ -243,9 +243,10 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
color: Colors.blue[700],
|
|
|
|
color: Colors.blue[700],
|
|
|
|
borderRadius:
|
|
|
|
borderRadius:
|
|
|
|
BorderRadius.circular(30.0)),
|
|
|
|
BorderRadius.circular(30.0)),
|
|
|
|
child: deliveredOrderList[index]
|
|
|
|
child: deliveredOrderList[index].orderStatusId == 30 ||
|
|
|
|
.orderStatusId ==
|
|
|
|
deliveredOrderList[index].orderStatusId == 997 ||
|
|
|
|
30
|
|
|
|
deliveredOrderList[index].orderStatusId == 994
|
|
|
|
|
|
|
|
// deliveredOrderList[index].orderStatusId == 30
|
|
|
|
? Text(
|
|
|
|
? Text(
|
|
|
|
// deliveredOrderList[0].orderStatus.toString().substring(12),
|
|
|
|
// deliveredOrderList[0].orderStatus.toString().substring(12),
|
|
|
|
TranslationBase.of(context)
|
|
|
|
TranslationBase.of(context)
|
|
|
|
@ -508,9 +509,11 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
color: Colors.green,
|
|
|
|
color: Colors.green,
|
|
|
|
borderRadius:
|
|
|
|
borderRadius:
|
|
|
|
BorderRadius.circular(30.0)),
|
|
|
|
BorderRadius.circular(30.0)),
|
|
|
|
child: processingOrderList[index]
|
|
|
|
child: processingOrderList[index].orderStatusId == 20 ||
|
|
|
|
.orderStatusId ==
|
|
|
|
processingOrderList[index].orderStatusId == 995 ||
|
|
|
|
20
|
|
|
|
processingOrderList[index].orderStatusId == 998 ||
|
|
|
|
|
|
|
|
processingOrderList[index].orderStatusId == 999
|
|
|
|
|
|
|
|
// processingOrderList[index].orderStatusId == 20
|
|
|
|
? Text(
|
|
|
|
? Text(
|
|
|
|
// deliveredOrderList[0].orderStatus.toString().substring(12),
|
|
|
|
// deliveredOrderList[0].orderStatus.toString().substring(12),
|
|
|
|
TranslationBase.of(context)
|
|
|
|
TranslationBase.of(context)
|
|
|
|
|