From a4f404386b09df7f4e2010d46b79b21a31060658 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Tue, 26 Oct 2021 13:41:05 +0300 Subject: [PATCH] fixed issues --- assets/images/pharmacy_module/payment.png | Bin 0 -> 15499 bytes lib/config/localized_values.dart | 2 +- .../pharmacies/screens/cart-order-page.dart | 8 +++++--- .../product-details/footor/footer-widget.dart | 4 +++- .../screens/product-details/product-detail.dart | 15 +++++++++++++++ .../widgets/home/GridViewButtons.dart | 6 +++++- 6 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 assets/images/pharmacy_module/payment.png diff --git a/assets/images/pharmacy_module/payment.png b/assets/images/pharmacy_module/payment.png new file mode 100644 index 0000000000000000000000000000000000000000..275aa40ac7941efaafe3ec10e9a62df4aad88802 GIT binary patch literal 15499 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 { endIndent: 0, ), Image.asset( - "assets/images/pharmacy_module/payment_image.png", + "assets/images/pharmacy_module/payment.png", width: mediaQuery.size.width - 20, height: 30.0, fit: BoxFit.scaleDown, @@ -348,6 +348,7 @@ class _OrderBottomWidgetState extends State { Icons.info, size: 25, color: Color(0xff005aff), +// color: Color(0xff005aff), ), ), ), @@ -420,8 +421,9 @@ class _OrderBottomWidgetState extends State { isAgree ? Colors.white : Colors.grey.shade300, fontSize: 14), ), - color: Color(0xff005aff), - disabledColor: Color(0xff005aff), + color: Color(0xFF4CAF50), + disabledColor:Color(0xFF4CAF50), +// disabledColor: Color(0xff005aff), ) // RaisedButton( // onPressed: isAgree 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 3a3eba23..19286b6a 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -20,6 +20,7 @@ class FooterWidget extends StatefulWidget { final int quantityLimit; final PharmacyProduct item; final Function addToCartFunction; + final Function addToShoppingCartFunction; final ProductDetailViewModel model; int quantity; @@ -30,6 +31,7 @@ class FooterWidget extends StatefulWidget { {this.quantity, this.isOverQuantity = false, this.addToCartFunction, + this.addToShoppingCartFunction, this.model}); @override @@ -217,7 +219,7 @@ class _FooterWidgetState extends State { widget.quantity > widget.quantityLimit || widget.item.rxMessage != null, onTap: () async { - await widget.addToCartFunction( + await widget.addToShoppingCartFunction( quantity: widget.quantity, itemID: widget.item.id, model: widget.model); diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index 83a76a19..4cee4ba3 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/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/compare-list.dart'; +import 'package:diplomaticquarterapp/pages/pharmacies/screens/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'; @@ -13,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; 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/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'availability_info.dart'; @@ -331,6 +333,7 @@ class __ProductDetailPageState extends State { quantity: quantity, isOverQuantity: isOverQuantity, addToCartFunction: addToCartFunction, + addToShoppingCartFunction: addToShoppingCartFunction, model: model, ), )); @@ -355,6 +358,18 @@ class __ProductDetailPageState extends State { await model.addToCartData(quantity, itemID); GifLoaderDialogUtils.hideDialog(context); } + + addToShoppingCartFunction( + {quantity, + itemID, + ProductDetailViewModel model}) async { + GifLoaderDialogUtils.showMyDialog(context); + await model.addToCartData(quantity, itemID); + GifLoaderDialogUtils.hideDialog(context); + Navigator.push( + context, + FadePage(page: CartOrderPage())); + } } diff --git a/lib/pages/pharmacies/widgets/home/GridViewButtons.dart b/lib/pages/pharmacies/widgets/home/GridViewButtons.dart index 5d979136..1a33ce74 100644 --- a/lib/pages/pharmacies/widgets/home/GridViewButtons.dart +++ b/lib/pages/pharmacies/widgets/home/GridViewButtons.dart @@ -1,6 +1,7 @@ import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart'; import 'package:diplomaticquarterapp/pages/landing/home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; +import 'package:diplomaticquarterapp/pages/search_products_page.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; @@ -44,6 +45,9 @@ class GridViewButtons extends StatelessWidget { hasColorFilter: false, child: GridViewCard(TranslationBase.of(context).medicationRefill, 'assets/images/pharmacy_module/medication_icon.png', () { + Navigator.push( + context, FadePage(page: HomePrescriptionsPage())); + // model.checkUserIsActivated().then((isActivated) { // if (isActivated) { // Navigator.push(context, FadePage(page: LakumMainPage())); @@ -71,7 +75,7 @@ class GridViewButtons extends StatelessWidget { child: GridViewCard( TranslationBase.of(context).searchAndScanMedication, 'assets/images/pharmacy_module/search_scan_icon.png', - () {}), + () {Navigator.push(context, FadePage(page: SearchProductsPage()));}), ), ], ),