Setting to display weight in shopping cart

Michael-Herzog · Michael-Herzog · commit 1304e9901b35 · 2014-09-16T13:10:09.000+02:00
diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs b/src/Libraries/SmartStore.Core/Domain/Orders/ShoppingCartSettings.cs
@@ -142,6 +142,11 @@ public ShoppingCartSettings()
         /// </summary>
         public bool ShowShortDesc { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to show the product weight in the order summary
+        /// </summary>
+        public bool ShowWeight { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether to show the product short description in the order summary
         /// </summary>
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs
@@ -64,6 +64,9 @@ public class ShoppingCartSettingsModel
         [SmartResourceDisplayName("Admin.Configuration.Settings.ShoppingCart.ShowShortDesc")]
         public bool ShowShortDesc { get; set; }
 
+        [SmartResourceDisplayName("Admin.Configuration.Settings.ShoppingCart.ShowWeight")]
+        public bool ShowWeight { get; set; }
+
         [SmartResourceDisplayName("Admin.Configuration.Settings.ShoppingCart.ShowBasePrice")]
         public bool ShowBasePrice { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/ShoppingCart.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/ShoppingCart.cshtml
@@ -186,6 +186,15 @@
                 @Html.ValidationMessageFor(model => model.ShowBasePrice)
             </td>
         </tr>
+        <tr>
+            <td class="adminTitle">
+                @Html.SmartLabelFor(model => model.ShowWeight)
+            </td>
+            <td class="adminData">
+                @Html.SettingEditorFor(model => model.ShowWeight)
+                @Html.ValidationMessageFor(model => model.ShowWeight)
+            </td>
+        </tr>
         <tr>
             <td class="adminTitle">
                 @Html.SmartLabelFor(model => model.ShowLinkedAttributeValueQuantity)
diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -232,7 +232,8 @@ private ShoppingCartModel.ShoppingCartItemModel PrepareShoppingCartItemModel(Org
 				IsShipEnabled = product.IsShipEnabled,
 				ShortDesc = product.GetLocalized(x => x.ShortDescription),
 				ProductType = product.ProductType,
-                BasePrice = product.GetBasePriceInfo(_localizationService, _priceFormatter)
+                BasePrice = product.GetBasePriceInfo(_localizationService, _priceFormatter),
+                Weight = product.Weight
 			};
 
 			if (item.BundleItem != null)
@@ -589,6 +590,7 @@ protected void PrepareShoppingCartModel(ShoppingCartModel model,
             model.DisplayDeliveryTime = _shoppingCartSettings.ShowDeliveryTimes;
             model.DisplayShortDesc = _shoppingCartSettings.ShowShortDesc;
             model.DisplayBasePrice = _shoppingCartSettings.ShowBasePrice;
+            model.DisplayWeight = _shoppingCartSettings.ShowWeight;
             model.IsEditable = isEditable;
             model.ShowProductImages = _shoppingCartSettings.ShowProductImagesOnShoppingCart;
 			model.ShowProductBundleImages = _shoppingCartSettings.ShowProductBundleImagesOnShoppingCart;
@@ -1848,7 +1850,16 @@ public ActionResult OrderTotals(bool isEditable)
             model.IsEditable = isEditable;
 
             if (cart.Count > 0)
-            {              
+            {             
+ 
+                //weight
+                model.Weight = decimal.Zero;
+
+                foreach (var sci in cart) 
+                {
+                    model.Weight += sci.Item.Product.Weight * sci.Item.Quantity;
+                }
+
                 //subtotal
                 decimal subtotalBase = decimal.Zero;
                 decimal orderSubTotalDiscountAmountBase = decimal.Zero;
@@ -1941,6 +1952,8 @@ public ActionResult OrderTotals(bool isEditable)
                 model.DisplayTaxRates = displayTaxRates;
                 model.DisplayTax = displayTax;
 
+                model.DisplayWeight = _shoppingCartSettings.ShowWeight;
+
                 //total
                 decimal orderTotalDiscountAmountBase = decimal.Zero;
                 Discount orderTotalAppliedDiscount = null;
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/OrderTotalsModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/OrderTotalsModel.cs
@@ -27,15 +27,16 @@ public OrderTotalsModel()
         public IList<TaxRate> TaxRates { get; set; }
         public bool DisplayTax { get; set; }
         public bool DisplayTaxRates { get; set; }
-
-
+        public bool DisplayWeight { get; set; }
+        
         public IList<GiftCard> GiftCards { get; set; }
 
         public string OrderTotalDiscount { get; set; }
         public bool AllowRemovingOrderTotalDiscount { get; set; }
         public int RedeemedRewardPoints { get; set; }
         public string RedeemedRewardPointsAmount { get; set; }
         public string OrderTotal { get; set; }
+        public decimal Weight { get; set; }
 
         #region Nested classes
 
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs
@@ -43,6 +43,7 @@ public ShoppingCartModel()
 		public int BundleThumbSize { get; set; }
         public bool DisplayDeliveryTime { get; set; }
         public bool DisplayShortDesc { get; set; }
+        public bool DisplayWeight { get; set; }
         public bool DisplayBasePrice { get; set; }
 
 		public ButtonPaymentMethodModel ButtonPaymentMethods { get; set; }
@@ -91,14 +92,16 @@ public ShoppingCartItemModel()
 
             public IList<string> Warnings { get; set; }
 
+            public decimal Weight { get; set; }
+
             public bool IsShipEnabled { get; set; }
 
             public string DeliveryTimeName { get; set; }
             
             public string DeliveryTimeHexValue { get; set; }
 
             public string ShortDesc { get; set; }
-
+            
             public string BasePrice { get; set; }
 
 			public bool BundlePerItemPricing { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml
@@ -75,6 +75,13 @@
 				</div>
 			}
 		</td>
+
+        @if (Model.DisplayWeight)
+		{
+        <td class="weight nobr">
+            <span class="product-weight">@((item.Weight * item.Quantity).ToString("N2")) kg</span>
+        </td>
+        }
 		<td class="unit-price nobr">
 			<span class="product-unit-price">@item.UnitPrice</span>
 		</td>
@@ -267,6 +274,13 @@
 					<th>
 						@T("ShoppingCart.Product(s)")
 					</th>
+
+                    @if (Model.DisplayWeight)
+					{
+                    <th>
+                        @T("ShoppingCart.Weight")
+                    </th>
+                    }
 					<th class="unit-price">
 						@T("ShoppingCart.UnitPrice")
 					</th>
diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderTotals.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderTotals.cshtml
@@ -4,6 +4,17 @@
 <div class="total-info">
     <table class="cart-total table">
         <tbody>
+            @if (Model.DisplayWeight)
+		    {
+            <tr>
+                <td class="cart-total-left">
+                    <span class="nobr">@T("ShoppingCart.Totals.Weight"):</span>
+                </td>
+                <td class="cart-total-right">
+                    <span class="product-weight">@(Model.Weight.ToString("N2")) kg</span>
+                </td>
+            </tr>
+            }
             <tr>
                 <td class="cart-total-left">
                     <span class="nobr">@T("ShoppingCart.Totals.SubTotal"):</span>
