Closes smartstore#559 Paypal Express: checkout button should be hidden if min. order amount is not reached

Michael-Herzog · Michael-Herzog · commit 5e5b56e5e0c0 · 2014-12-19T17:00:49.000+01:00
diff --git a/src/Plugins/SmartStore.PayPal/Views/PayPalExpress/PaymentInfo.cshtml b/src/Plugins/SmartStore.PayPal/Views/PayPalExpress/PaymentInfo.cshtml
@@ -1,6 +1,6 @@
 ﻿@{
     Layout = "";
-    Html.AddCssFileParts(true, "~/Plugins/SmartStore.PayPal/Content/smartstore.paypal.css");
+    Html.AddCssFileParts(true, Url.Content("~/Plugins/SmartStore.PayPal/Content/smartstore.paypal.css"));
 }
 @model SmartStore.PayPal.Models.PayPalExpressPaymentInfoModel
 @using SmartStore.Web.Framework;
diff --git a/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml b/src/Presentation/SmartStore.Web/Views/ShoppingCart/OrderSummary.cshtml
@@ -367,27 +367,29 @@
 
 				@if (Model.IsEditable)
 				{
-					<div class="checkout-buttons">
-						@if (String.IsNullOrEmpty(Model.MinOrderSubtotalWarning))
-						{
-							<button type="button" 
-									class="btn btn-primary btn-large pull-right checkout-button" 
-									id="checkout" 
-									name="checkout"
-									onclick="$('#startcheckout').trigger('click'); return false;">
-								@T("Checkout.Button")&nbsp;
-								<i class="fa fa-arrow-right" style="font-size: 18px"></i>
-							</button>
-						}
-					</div>
+                    if (String.IsNullOrEmpty(Model.MinOrderSubtotalWarning))
+					{
+					    <div class="checkout-buttons">
+						
+							    <button type="button" 
+									    class="btn btn-primary btn-large pull-right checkout-button" 
+									    id="checkout" 
+									    name="checkout"
+									    onclick="$('#startcheckout').trigger('click'); return false;">
+								    @T("Checkout.Button")&nbsp;
+								    <i class="fa fa-arrow-right" style="font-size: 18px"></i>
+							    </button>
+						
+					    </div>
                     
-					<div class="addon-buttons">
-						@*Payment method buttons (e.g. GoogleCheckoutButton, Paypal Express, Pay with Amazon)*@
-						@foreach(var item in Model.ButtonPaymentMethods.Items)
-						{
-							@Html.Action(item.ActionName, item.ControllerName, item.RouteValues)
-						}
-					</div>
+					    <div class="addon-buttons">
+						    @*Payment method buttons (e.g. GoogleCheckoutButton, Paypal Express, Pay with Amazon)*@
+						    @foreach(var item in Model.ButtonPaymentMethods.Items)
+						    {
+							    @Html.Action(item.ActionName, item.ControllerName, item.RouteValues)
+						    }
+					    </div>
+                    }
 				}
 			</div>
 		</div>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`@{`
`2`	`2`	`Layout = "";`
`3`		`- Html.AddCssFileParts(true, "~/Plugins/SmartStore.PayPal/Content/smartstore.paypal.css");`
	`3`	`+ Html.AddCssFileParts(true, Url.Content("~/Plugins/SmartStore.PayPal/Content/smartstore.paypal.css"));`
`4`	`4`	`}`
`5`	`5`	`@model SmartStore.PayPal.Models.PayPalExpressPaymentInfoModel`
`6`	`6`	`@using SmartStore.Web.Framework;`