From 65aac99806e03753eec4aa8e5d1e26cd1d60c43f Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 10 Nov 2021 10:44:00 +0200 Subject: [PATCH] fix Availabilty part --- .../product-details/footor/footer-widget.dart | 8 +------- .../screens/product-details/product-detail.dart | 16 +++++++++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart index 72399498..644ab693 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -209,13 +209,7 @@ class _FooterWidgetState extends State { ); } else { await widget.addToShoppingCartFunction(quantity: widget.quantity, itemID: widget.item.id, model: widget.model); - // Navigator.of(context).pushNamed( - // CART_ORDER_PAGE, - // ); - Navigator.push( - context, - FadePage(page: CartOrderPage()), - ); + } }, fontWeight: FontWeight.w600, diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index b1e6aff9..6a8ac3ea 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart' import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-name-and-price.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/recommended_products.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/reviews_info.dart'; @@ -14,6 +15,7 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -113,8 +115,7 @@ class __ProductDetailPageState extends State { isInWishList: isInWishList, addToCartFunction: addToCartFunction, ), - body: model.state == ViewState.Idle - ? SingleChildScrollView( + body: SingleChildScrollView( child: Column( children: [ Container( @@ -311,9 +312,9 @@ class __ProductDetailPageState extends State { ) ], ), - ) - : AppCircularProgressIndicator(), - bottomSheet: model.state == ViewState.Idle + ), + // : AppCircularProgressIndicator(), + bottomSheet: model.state == ViewState.Idle || model.state == ViewState.ErrorLocal ? FooterWidget( model.isStockAvailable, widget.product.orderMaximumQuantity, @@ -334,6 +335,11 @@ class __ProductDetailPageState extends State { GifLoaderDialogUtils.showMyDialog(context); await model.addToCartData(quantity, itemID); GifLoaderDialogUtils.hideDialog(context); + if(model.state != ViewState.ErrorLocal) + Navigator.push( + context, + FadePage(page: CartOrderPage()), + ); } addToWishlistFunction({itemID, ProductDetailViewModel model}) async {