From 2c198ed2246d5b29e7ddc4cc9c4b4c181cfe8751 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 21 Nov 2021 14:54:41 +0300 Subject: [PATCH 1/2] no message --- lib/pages/livecare/incoming_call.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pages/livecare/incoming_call.dart b/lib/pages/livecare/incoming_call.dart index 9e164c09..a463fc00 100644 --- a/lib/pages/livecare/incoming_call.dart +++ b/lib/pages/livecare/incoming_call.dart @@ -46,6 +46,7 @@ class _IncomingCallState extends State with SingleTickerProviderSt Widget build(BuildContext context) { return AppScaffold( isShowAppBar: false, + isShowDecPage: false, body: SafeArea( child: Container( decoration: BoxDecoration(color: Colors.grey[700]), From 816dfe4a12866f5fc90702c8be084cbe8d8f8afa Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 21 Nov 2021 15:38:08 +0300 Subject: [PATCH 2/2] Pharmacy fixes --- .../pharmacies/screens/cart-page/select_address_widget.dart | 3 ++- .../pharmacies/screens/product-details/product-detail.dart | 6 ++---- .../product-details/shared/product_details_app_bar.dart | 3 +-- lib/pages/pharmacy/order/OrderDetails.dart | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/pages/pharmacies/screens/cart-page/select_address_widget.dart b/lib/pages/pharmacies/screens/cart-page/select_address_widget.dart index a1634e21..bf51f8e5 100644 --- a/lib/pages/pharmacies/screens/cart-page/select_address_widget.dart +++ b/lib/pages/pharmacies/screens/cart-page/select_address_widget.dart @@ -189,9 +189,10 @@ class _SelectAddressWidgetState extends State { model.paymentCheckoutData.shippingOption == null ? "" : model.paymentCheckoutData.shippingOption.shippingRateComputationMethodSystemName == "Shipping.FixedOrByWeight" - ? "assets/images/pharmacy_module/payment/hmg_shipping_logo.png" + ? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png" : "assets/images/pharmacy_module/payment/aramex_shipping_logo.png", fit: BoxFit.contain, + width: 100, ), margin: EdgeInsets.symmetric(horizontal: 8), ), diff --git a/lib/pages/pharmacies/screens/product-details/product-detail.dart b/lib/pages/pharmacies/screens/product-details/product-detail.dart index 9eeef868..1f9dcc52 100644 --- a/lib/pages/pharmacies/screens/product-details/product-detail.dart +++ b/lib/pages/pharmacies/screens/product-details/product-detail.dart @@ -1,4 +1,3 @@ -import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; @@ -291,7 +290,7 @@ class __ProductDetailPageState extends State { previousModel: model, ) : isAvailability - //&& widget.product.stockAvailability != "Out of stock" + //&& widget.product.stockAvailability != "Out of stock" ? AvailabilityInfo(previousModel: model) // : isAvailability && widget.product.stockAvailability == "Out of stock" // ? Container( @@ -303,7 +302,7 @@ class __ProductDetailPageState extends State { // TranslationBase.of(context).noLocationAvailable, // ), // ) - : Container(), + : Container(), ], ), ), @@ -374,5 +373,4 @@ class __ProductDetailPageState extends State { notifyMeWhenAvailable({itemId, customerId, ProductDetailViewModel model}) async { await model.notifyMe(customerId, itemId); } - } 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 f58438cf..fb608953 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 @@ -156,8 +156,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget { await addToCartFunction( quantity: quantity, itemID: itemID, - model: model, - context: context); + model: model); Navigator.of(context).pop(); } diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart index 291a3413..fc4ae184 100644 --- a/lib/pages/pharmacy/order/OrderDetails.dart +++ b/lib/pages/pharmacy/order/OrderDetails.dart @@ -254,7 +254,6 @@ class _OrderDetailsPageState extends State { ? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png" : "assets/images/pharmacy_module/payment/aramex_shipping_logo.png", fit: BoxFit.contain, -// height: 100, width: 100, ), ),