From 21c315c1a30b5ed16ea5895002d593de11262f51 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Mon, 22 Nov 2021 11:27:21 +0300 Subject: [PATCH] fix wishlist issue --- lib/pages/final_products_page.dart | 2 +- lib/pages/parent_categorise_page.dart | 3 +-- lib/pages/pharmacies/ProductCheckTypeWidget.dart | 1 + .../product-details/shared/product_details_app_bar.dart | 2 +- lib/pages/pharmacies/wishlist.dart | 4 ++-- lib/pages/sub_categorise_page.dart | 3 +-- lib/widgets/pharmacy/product_tile.dart | 9 ++++++++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/pages/final_products_page.dart b/lib/pages/final_products_page.dart index 758ceb78..253d7c08 100644 --- a/lib/pages/final_products_page.dart +++ b/lib/pages/final_products_page.dart @@ -487,7 +487,7 @@ class _FinalProductsPageState extends State { color: CustomColors.green, ), onPressed: () async { - if (model.finalProducts[index].rxMessage == null) { + if (model.finalProducts[index].isRx == false) { GifLoaderDialogUtils.showMyDialog(context); await addToCartFunction(1, model.finalProducts[index].id); GifLoaderDialogUtils.hideDialog(context); diff --git a/lib/pages/parent_categorise_page.dart b/lib/pages/parent_categorise_page.dart index c1b1b2b7..c025eb3c 100644 --- a/lib/pages/parent_categorise_page.dart +++ b/lib/pages/parent_categorise_page.dart @@ -1273,8 +1273,7 @@ class _ParentCategorisePageState extends State { ), onPressed: () async { - if (model.parentProducts[index].rxMessage == - null) { + if (model.parentProducts[index].isRx == false) { GifLoaderDialogUtils.showMyDialog(context); await addToCartFunction(1, model.parentProducts[index].id); diff --git a/lib/pages/pharmacies/ProductCheckTypeWidget.dart b/lib/pages/pharmacies/ProductCheckTypeWidget.dart index d0a112c6..8ac83fd2 100644 --- a/lib/pages/pharmacies/ProductCheckTypeWidget.dart +++ b/lib/pages/pharmacies/ProductCheckTypeWidget.dart @@ -37,6 +37,7 @@ class _ProductCheckTypeWidgetState extends State { productImage: widget.model.wishListList[index].product.images[0].src, productID: widget.model.wishListList[index].product.id, onDelete: deleteWishListItem, + isRx:widget.model.wishListList[index].product.isRx, ), ), diff --git a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart index ad638be1..18749662 100644 --- a/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart +++ b/lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart @@ -149,7 +149,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { return Container( child: new Wrap( children: [ - if (product.stockAvailability != 'Out of stock') + if (product.stockAvailability != 'Out of stock' && product.isRx != true) new ListTile( leading: Icon(Icons.shopping_cart), title: Text( diff --git a/lib/pages/pharmacies/wishlist.dart b/lib/pages/pharmacies/wishlist.dart index a70f2cab..00088b59 100644 --- a/lib/pages/pharmacies/wishlist.dart +++ b/lib/pages/pharmacies/wishlist.dart @@ -38,8 +38,8 @@ class WishlistPage extends StatelessWidget { ), Padding( padding: const EdgeInsets.all(8.0), - child: Text( - 'There is no data', + child: Text(TranslationBase.of(context).noData, + // 'There is no data', style: TextStyle(fontSize: 30), ), ) diff --git a/lib/pages/sub_categorise_page.dart b/lib/pages/sub_categorise_page.dart index a0b54f9f..60b85361 100644 --- a/lib/pages/sub_categorise_page.dart +++ b/lib/pages/sub_categorise_page.dart @@ -1219,8 +1219,7 @@ class _SubCategorisePageState extends State { if (model .subProducts[ index] - .rxMessage == - null) { + .isRx == false) { GifLoaderDialogUtils .showMyDialog( context); diff --git a/lib/widgets/pharmacy/product_tile.dart b/lib/widgets/pharmacy/product_tile.dart index b7293ce1..73565ee7 100644 --- a/lib/widgets/pharmacy/product_tile.dart +++ b/lib/widgets/pharmacy/product_tile.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart' import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; @@ -27,6 +28,7 @@ class productTile extends StatelessWidget { final dynamic productID; final Function onDelete; final dynamic approvedTotalReviews; + final dynamic isRx; // final VoidCallback deleteWishlistItems; @@ -47,6 +49,7 @@ class productTile extends StatelessWidget { this.productID, this.onDelete, this.approvedTotalReviews, + this.isRx }); @override @@ -163,10 +166,14 @@ class productTile extends StatelessWidget { color: Colors.green, ), onPressed: () async { + if(isRx == false){ GifLoaderDialogUtils.showMyDialog(context); await addToCartFunction(1, productID, context); GifLoaderDialogUtils.hideDialog(context); - Utils.navigateToCartPage(); + Utils.navigateToCartPage();} + else { + AppToast.showErrorToast(message: TranslationBase.of(context).needPrescription); + } }, ), ],