fix wishlist issue

merge-update-with-lab-changes
Fatimah Alshammari 4 years ago
parent 7bbabd798a
commit 21c315c1a3

@ -487,7 +487,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
color: CustomColors.green, color: CustomColors.green,
), ),
onPressed: () async { onPressed: () async {
if (model.finalProducts[index].rxMessage == null) { if (model.finalProducts[index].isRx == false) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1, model.finalProducts[index].id); await addToCartFunction(1, model.finalProducts[index].id);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -1273,8 +1273,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
onPressed: onPressed:
() async { () async {
if (model.parentProducts[index].rxMessage == if (model.parentProducts[index].isRx == false) {
null) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1, await addToCartFunction(1,
model.parentProducts[index].id); model.parentProducts[index].id);

@ -37,6 +37,7 @@ class _ProductCheckTypeWidgetState extends State<ProductCheckTypeWidget> {
productImage: widget.model.wishListList[index].product.images[0].src, productImage: widget.model.wishListList[index].product.images[0].src,
productID: widget.model.wishListList[index].product.id, productID: widget.model.wishListList[index].product.id,
onDelete: deleteWishListItem, onDelete: deleteWishListItem,
isRx:widget.model.wishListList[index].product.isRx,
), ),
), ),

@ -149,7 +149,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
return Container( return Container(
child: new Wrap( child: new Wrap(
children: <Widget>[ children: <Widget>[
if (product.stockAvailability != 'Out of stock') if (product.stockAvailability != 'Out of stock' && product.isRx != true)
new ListTile( new ListTile(
leading: Icon(Icons.shopping_cart), leading: Icon(Icons.shopping_cart),
title: Text( title: Text(

@ -38,8 +38,8 @@ class WishlistPage extends StatelessWidget {
), ),
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),
), ),
) )

@ -1219,8 +1219,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
if (model if (model
.subProducts[ .subProducts[
index] index]
.rxMessage == .isRx == false) {
null) {
GifLoaderDialogUtils GifLoaderDialogUtils
.showMyDialog( .showMyDialog(
context); context);

@ -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/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.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/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
@ -27,6 +28,7 @@ class productTile extends StatelessWidget {
final dynamic productID; final dynamic productID;
final Function onDelete; final Function onDelete;
final dynamic approvedTotalReviews; final dynamic approvedTotalReviews;
final dynamic isRx;
// final VoidCallback deleteWishlistItems; // final VoidCallback deleteWishlistItems;
@ -47,6 +49,7 @@ class productTile extends StatelessWidget {
this.productID, this.productID,
this.onDelete, this.onDelete,
this.approvedTotalReviews, this.approvedTotalReviews,
this.isRx
}); });
@override @override
@ -163,10 +166,14 @@ class productTile extends StatelessWidget {
color: Colors.green, color: Colors.green,
), ),
onPressed: () async { onPressed: () async {
if(isRx == false){
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await addToCartFunction(1, productID, context); await addToCartFunction(1, productID, context);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
Utils.navigateToCartPage(); Utils.navigateToCartPage();}
else {
AppToast.showErrorToast(message: TranslationBase.of(context).needPrescription);
}
}, },
), ),
], ],

Loading…
Cancel
Save