Merge branch 'haroon-new-design' into 'development_new_design_2.0'

Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!541

lib/pages/livecare/incoming_call.dart

@@ -46,6 +46,7 @@ class _IncomingCallState extends State<IncomingCall> with SingleTickerProviderSt
   Widget build(BuildContext context) {
     return AppScaffold(
       isShowAppBar: false,
+      isShowDecPage: false,
       body: SafeArea(
         child: Container(
             decoration: BoxDecoration(color: Colors.grey[700]),

lib/pages/pharmacies/screens/cart-page/select_address_widget.dart

@@ -189,9 +189,10 @@ class _SelectAddressWidgetState extends State<SelectAddressWidget> {
                             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),
                         ),

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<ProductDetailPage> {
                                       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<ProductDetailPage> {
 //                                                TranslationBase.of(context).noLocationAvailable,
 //                                              ),
 //                                            )
-                                          : Container(),
+                                      : Container(),
                         ],
                       ),
                     ),
@@ -374,5 +373,4 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
   notifyMeWhenAvailable({itemId, customerId, ProductDetailViewModel model}) async {
     await model.notifyMe(customerId, itemId);
   }
-
 }

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();
                           }

lib/pages/pharmacy/order/OrderDetails.dart

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