minor fixes

Michael-Herzog · Michael-Herzog · commit 78b255e12bb5 · 2014-04-29T19:06:38.000+02:00
diff --git a/src/Libraries/SmartStore.Services/Messages/MessageTokenProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageTokenProvider.cs
@@ -169,6 +169,8 @@ protected virtual string ProductListToHtmlTable(Order order, int languageId)
                 //deliverytime
                 if (_shoppingCartSettings.ShowDeliveryTimes && product.DeliveryTime != null && product.IsShipEnabled)
                 {
+                    product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser);
+
                     sb.AppendLine("<br />");
 
                     sb.AppendLine("<div class=\"delivery-time\">");
diff --git a/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less b/src/Presentation/SmartStore.Web/Themes/Alpha/Content/site.less
@@ -2559,15 +2559,15 @@ table.cart .cart-item-row .qty-input {
 
 .checkout-confirm-page .order-summary-content form {
     border: 1px solid #bbb;
-    /*background: #efefef;*/
+    background: #efefef;
     border-bottom: none;
     margin: 0 !important;
     padding-bottom: 20px;
     .border-radius(@baseBlockRadius @baseBlockRadius 0 0);
 }
 .checkout-confirm-page .checkout-data > .confirm-order {
     border: 1px solid #bbb;
-    /*background: #efefef;*/
+    background: #efefef;
     border-top: none;
     padding: 20px;
     margin-bottom: 30px;

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,8 @@ protected virtual string ProductListToHtmlTable(Order order, int languageId)`
`169`	`169`	`//deliverytime`
`170`	`170`	`if (_shoppingCartSettings.ShowDeliveryTimes && product.DeliveryTime != null && product.IsShipEnabled)`
`171`	`171`	`{`
	`172`	`+ product.MergeWithCombination(orderItem.AttributesXml, _productAttributeParser);`
	`173`	`+`
`172`	`174`	`sb.AppendLine("<br />");`
`173`	`175`
`174`	`176`	`sb.AppendLine("<div class=\"delivery-time\">");`