fixed arabic version

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent a4bf52818e
commit bdededa397

@ -44,8 +44,8 @@ class _MyReviewsPageState extends State<MyReviewsPage> {
), ),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(TranslationBase.of(context).noData,
'There is no data', // 'There is no data',
style: TextStyle(fontSize: 30), style: TextStyle(fontSize: 30),
), ),
) )

@ -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)

@ -121,17 +121,40 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
), ),
color: getStatusBackgroundColor(), color: getStatusBackgroundColor(),
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
child: Text( child: model.orderListModel[0].orderStatusId == 30 ||
model.orderListModel[0].orderStatusId == 997 ||
model.orderListModel[0].orderStatusId == 994
// deliveredOrderList[index].orderStatusId == 30
? Text(
// deliveredOrderList[0].orderStatus.toString().substring(12),
TranslationBase.of(context).deliveredOrder,
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
)
: Text(
languageID == "ar" languageID == "ar"
? model.orderListModel[0].orderStatusn ? model.orderListModel[0].orderStatusn.toString()
: model.orderListModel[0].orderStatus, : model.orderListModel[0].orderStatus.toString(),
// TranslationBase.of(context).delivered,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 13.0, fontSize: 13.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), )
// Text(
// languageID == "ar"
// ? model.orderListModel[0].orderStatusn
// : model.orderListModel[0].orderStatus,
//// TranslationBase.of(context).delivered,
// style: TextStyle(
// color: Colors.white,
// fontSize: 13.0,
// fontWeight: FontWeight.bold,
// ),
// ),
), ),
], ],
), ),

@ -540,61 +540,29 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
width: 200, width: 200,
child: Button( child: Button(
onTap: onTap:
() async { () async {String categoriesId = "";
String for (CategoriseParentModel category in entityList) {
categoriesId = if (categoriesId == "") {categoriesId = category.id;
"";
for (CategoriseParentModel category
in entityList) {
if (categoriesId ==
"") {
categoriesId =
category
.id;
} else { } else {
categoriesId = categoriesId = "$categoriesId,${category.id}";
"$categoriesId,${category.id}";
} }
} }
String String brandIds = "";
brandIds = for (CategoriseParentModel brand in entityListBrands) {
""; if (brandIds == "") {brandIds = brand.id;
for (CategoriseParentModel brand
in entityListBrands) {
if (brandIds ==
"") {
brandIds =
brand
.id;
} else { } else {
brandIds = brandIds = "$brandIds,${brand.id}";
"$brandIds,${brand.id}";
} }
} }
GifLoaderDialogUtils GifLoaderDialogUtils.showMyDialog(context);
.showMyDialog(
context);
await model.getFilteredSubProducts( await model.getFilteredSubProducts(min: minField.text.toString(),
min: minField max: maxField.text.toString(), categoryId: categoriesId,
.text brandId: brandIds);
.toString(), GifLoaderDialogUtils.hideDialog(context);
max: maxField Navigator.pop(context);
.text
.toString(),
categoryId:
categoriesId,
brandId:
brandIds);
GifLoaderDialogUtils
.hideDialog(
context);
Navigator.pop(
context);
}, },
label: TranslationBase.of( label: TranslationBase.of(context).apply,
context)
.apply,
// 'Apply', // 'Apply',
backgroundColor: backgroundColor:
Colors Colors

Loading…
Cancel
Save