Pharmacy fixes

merge-update-with-lab-changes
haroon amjad 4 years ago
parent 2c198ed224
commit 816dfe4a12

@ -189,9 +189,10 @@ class _SelectAddressWidgetState extends State<SelectAddressWidget> {
model.paymentCheckoutData.shippingOption == null model.paymentCheckoutData.shippingOption == null
? "" ? ""
: model.paymentCheckoutData.shippingOption.shippingRateComputationMethodSystemName == "Shipping.FixedOrByWeight" : 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", : "assets/images/pharmacy_module/payment/aramex_shipping_logo.png",
fit: BoxFit.contain, fit: BoxFit.contain,
width: 100,
), ),
margin: EdgeInsets.symmetric(horizontal: 8), margin: EdgeInsets.symmetric(horizontal: 8),
), ),

@ -1,4 +1,3 @@
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
@ -291,7 +290,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
previousModel: model, previousModel: model,
) )
: isAvailability : isAvailability
//&& widget.product.stockAvailability != "Out of stock" //&& widget.product.stockAvailability != "Out of stock"
? AvailabilityInfo(previousModel: model) ? AvailabilityInfo(previousModel: model)
// : isAvailability && widget.product.stockAvailability == "Out of stock" // : isAvailability && widget.product.stockAvailability == "Out of stock"
// ? Container( // ? Container(
@ -303,7 +302,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
// TranslationBase.of(context).noLocationAvailable, // TranslationBase.of(context).noLocationAvailable,
// ), // ),
// ) // )
: Container(), : Container(),
], ],
), ),
), ),
@ -374,5 +373,4 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
notifyMeWhenAvailable({itemId, customerId, ProductDetailViewModel model}) async { notifyMeWhenAvailable({itemId, customerId, ProductDetailViewModel model}) async {
await model.notifyMe(customerId, itemId); await model.notifyMe(customerId, itemId);
} }
} }

@ -156,8 +156,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
await addToCartFunction( await addToCartFunction(
quantity: quantity, quantity: quantity,
itemID: itemID, itemID: itemID,
model: model, model: model);
context: context);
Navigator.of(context).pop(); Navigator.of(context).pop();
} }

@ -254,7 +254,6 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png" ? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png"
: "assets/images/pharmacy_module/payment/aramex_shipping_logo.png", : "assets/images/pharmacy_module/payment/aramex_shipping_logo.png",
fit: BoxFit.contain, fit: BoxFit.contain,
// height: 100,
width: 100, width: 100,
), ),
), ),

Loading…
Cancel
Save