From d4283c011627949192af0695b4ea1b964c7d66de Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 1 Nov 2021 09:44:44 +0200 Subject: [PATCH] fix merge issue --- .../viewModels/pharmacyModule/product_detail_view_model.dart | 5 +---- .../pharmacies/screens/product-details/product-detail.dart | 5 ++++- lib/widgets/pharmacy/product_tile.dart | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart b/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart index 01c95b04..98596ee0 100644 --- a/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart +++ b/lib/core/viewModels/pharmacyModule/product_detail_view_model.dart @@ -62,7 +62,7 @@ class ProductDetailViewModel extends BaseViewModel{ setState(ViewState.Idle); } - Future addToCartData(quantity, itemID, BuildContext context) async { + Future addToCartData(quantity, itemID) async { hasError = false; setState(ViewState.BusyLocal); var resp = await _productDetailService.addToCart(quantity, itemID); @@ -72,11 +72,8 @@ class ProductDetailViewModel extends BaseViewModel{ setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); - - // OrderPreviewViewModel orderPreviewViewModel = Provider.of(context); Provider.of(locator().navigatorKey.currentContext, listen: false) .setShoppingCartResponse( object); - // orderPreviewViewModel.cartResponse = object; } } diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index 07c5d0e8..9367ceb9 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -338,6 +338,9 @@ class __ProductDetailPageState extends State { ), )); } + addToShoppingCartFunction({quantity,itemID,ProductDetailViewModel model})async{ + await model.addToCartData(quantity,itemID); + } addToWishlistFunction({itemID, ProductDetailViewModel model}) async { isInWishList = true; @@ -356,7 +359,7 @@ class __ProductDetailPageState extends State { ProductDetailViewModel model, }) async { GifLoaderDialogUtils.showMyDialog(context); - await model.addToCartData(quantity, itemID, context); + await model.addToCartData(quantity, itemID); GifLoaderDialogUtils.hideDialog(context); } } diff --git a/lib/widgets/pharmacy/product_tile.dart b/lib/widgets/pharmacy/product_tile.dart index 15eab3ed..de449eaf 100644 --- a/lib/widgets/pharmacy/product_tile.dart +++ b/lib/widgets/pharmacy/product_tile.dart @@ -319,6 +319,6 @@ class productTile extends StatelessWidget { addToCartFunction(quantity, itemID, BuildContext context) async { ProductDetailViewModel x = new ProductDetailViewModel(); - await x.addToCartData(quantity, itemID, context); + await x.addToCartData(quantity, itemID); } }