fix issues

merge-update-with-lab-changes
Fatimah Alshammari 4 years ago
parent bdf3429502
commit ae3bb1bb2d

@ -96,7 +96,8 @@ class _CartOrderPageState extends State<CartOrderPage> {
model.cartResponse.shoppingCarts.length, model.cartResponse.shoppingCarts.length,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
physics: const AlwaysScrollableScrollPhysics(), physics: ScrollPhysics(),
// physics: const AlwaysScrollableScrollPhysics(),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ProductOrderItem( return ProductOrderItem(
item: model.cartResponse.shoppingCarts[index], item: model.cartResponse.shoppingCarts[index],

@ -185,7 +185,8 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
// width: 500, // width: 500,
margin: EdgeInsets.only(bottom: 6), margin: EdgeInsets.only(bottom: 10),
padding: EdgeInsets.only(bottom: 10),
color: Colors.white, color: Colors.white,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -255,7 +256,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await model.getProductLocationData(widget.product.sku); await model.getProductLocationData(widget.product.sku);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
//
setState(() { setState(() {
isDetails = false; isDetails = false;
isReviews = false; isReviews = false;
@ -289,7 +290,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
) )
: isAvailability : isAvailability
? AvailabilityInfo( ? AvailabilityInfo(
previousModel: model, previousModel: model
) )
: Container(), : Container(),
], ],
@ -298,17 +299,17 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
if (projectViewModel.isLogin) // if (projectViewModel.isLogin)
RecommendedProducts( // RecommendedProducts(
product: widget.product, // product: widget.product,
productDetailViewModel: model, // productDetailViewModel: model,
addToWishlistFunction: (itemID) async { // addToWishlistFunction: (itemID) async {
await addToWishlistFunction(itemID: itemID, model: model); // await addToWishlistFunction(itemID: itemID, model: model);
}, // },
deleteFromWishlistFunction: (itemID) async { // deleteFromWishlistFunction: (itemID) async {
await deleteFromWishlistFunction(itemID: itemID, model: model); // await deleteFromWishlistFunction(itemID: itemID, model: model);
}, // },
) // )
], ],
), ),
), ),

@ -30,15 +30,19 @@ class ReviewsInfo extends StatelessWidget {
Container( Container(
child: Row( child: Row(
children: [ children: [
Container( Expanded(
child: Text( child: Container(
previousModel.productDetailService[0] child: Text(
.reviews[index].customerId previousModel.productDetailService[0].reviews[index].customer.firstName.toString() + " "
.toString(), + previousModel.productDetailService[0].reviews[index].customer.lastName.toString(),
style: TextStyle( // previousModel.productDetailService[0]
fontSize: 17, // .reviews[index].customerId
color: Colors.grey, // .toString(),
fontWeight: FontWeight.w600), style: TextStyle(
fontSize: 17,
color: Colors.grey,
fontWeight: FontWeight.w600),
),
), ),
), ),
Container( Container(

@ -249,11 +249,11 @@ class _OrderPageState extends State<OrderPage>
left: 13.0, right: 13.0), left: 13.0, right: 13.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.blue[700], color: Color(0xFF4CAF50),
style: BorderStyle.solid, style: BorderStyle.solid,
width: 5.0, width: 5.0,
), ),
color: Colors.blue[700], color: Color(0xFF4CAF50),
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
30.0)), 30.0)),
child: deliveredOrderList[ child: deliveredOrderList[
@ -535,11 +535,11 @@ class _OrderPageState extends State<OrderPage>
left: 13.0, right: 13.0), left: 13.0, right: 13.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.green, color: Colors.grey[700],
style: BorderStyle.solid, style: BorderStyle.solid,
width: 5.0, width: 5.0,
), ),
color: Colors.green, color: Colors.grey[700],
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
30.0)), 30.0)),
child: processingOrderList[ child: processingOrderList[
@ -1142,7 +1142,7 @@ class _OrderPageState extends State<OrderPage>
cancelledOrderList.clear(); cancelledOrderList.clear();
for (int i = 0; i < model.orders.length; i++) { for (int i = 0; i < model.orders.length; i++) {
if (model.orders[i].orderStatusId == 40 || if (model.orders[i].orderStatusId == 40 ||
model.orders[i].orderStatus == 996 || model.orders[i].orderStatusId == 996 ||
model.orders[i].orderStatusId == 200) { model.orders[i].orderStatusId == 200) {
cancelledOrderList.add(model.orders[i]); cancelledOrderList.add(model.orders[i]);
} }

@ -604,9 +604,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
print(widget.orderModel.orderStatusId); print(widget.orderModel.orderStatusId);
// if(orderStatus == 'delivered') // if(orderStatus == 'delivered')
if (widget.orderModel.orderStatusId == 30 || widget.orderModel.orderStatusId == 997 || widget.orderModel.orderStatusId == 994) if (widget.orderModel.orderStatusId == 30 || widget.orderModel.orderStatusId == 997 || widget.orderModel.orderStatusId == 994)
return Colors.blue[700]; return Color(0xFF4CAF50);
else if (widget.orderModel.orderStatusId == 20 || widget.orderModel.orderStatusId == 995 || widget.orderModel.orderStatusId == 998 || widget.orderModel.orderStatusId == 999) else if (widget.orderModel.orderStatusId == 20 || widget.orderModel.orderStatusId == 995 || widget.orderModel.orderStatusId == 998 || widget.orderModel.orderStatusId == 999)
return Colors.green; return Colors.grey[700];
else if (widget.orderModel.orderStatusId == 10) else if (widget.orderModel.orderStatusId == 10)
return Colors.orange[300]; return Colors.orange[300];
else if (widget.orderModel.orderStatusId == 40 || widget.orderModel.orderStatusId == 996 || widget.orderModel.orderStatusId == 200) return Colors.red[900]; else if (widget.orderModel.orderStatusId == 40 || widget.orderModel.orderStatusId == 996 || widget.orderModel.orderStatusId == 200) return Colors.red[900];

Loading…
Cancel
Save