Fixes redirecting within checkout may have displayed an incorrect URL in the browser

Author: mgesing

changelog.md

@@ -1,4 +1,4 @@
-# Release Notes
+# Release Notes
 
 ## SmartStore.NET 3.2
 
@@ -34,7 +34,8 @@
 * #1447 Checkout button payment methods (Amazon, PayPal Express) won't work in conjunction with mandatory checkout attributes
 * When creating a topic, the widget zone input shows System.String[]
 * Switching the language always redirected to the home page if SEO friendly URLs was deactivated.
-* Fixes file upload of a checkout attribute was not stored on cart page.
+* File upload of a checkout attribute was not stored on cart page.
+* Redirecting within checkout may have displayed an incorrect URL in the browser.
 
 
 ## SmartStore.NET 3.1.5

src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs

@@ -988,7 +988,9 @@ public PreProcessPaymentResult PreProcessPayment(ProcessPaymentRequest request)
 								{
 									// Must be redirected to checkout payment page.
 									_httpContext.Session["AmazonPayFailedPaymentReason"] = id;
-									_httpContext.Response.RedirectToRoute(new { Controller = "Checkout", Action = "PaymentMethod", Area = "" });
+
+                                    var urlHelper = new UrlHelper(_httpContext.Request.RequestContext);
+                                    _httpContext.Response.Redirect(urlHelper.Action("PaymentMethod", "Checkout", new { area = "" }));
 								}
 							}
 						}
@@ -1125,7 +1127,9 @@ public ProcessPaymentResult ProcessPayment(ProcessPaymentRequest request)
 						{
 							// Must be redirected to checkout payment page.
 							_httpContext.Session["AmazonPayFailedPaymentReason"] = reason;
-							_httpContext.Response.RedirectToRoute(new { Controller = "Checkout", Action = "PaymentMethod", Area = "" });
+
+                            var urlHelper = new UrlHelper(_httpContext.Request.RequestContext);
+                            _httpContext.Response.Redirect(urlHelper.Action("PaymentMethod", "Checkout", new { area = "" }));
 						}
 					}
 				}

src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Web;
+using System.Web.Mvc;
 using System.Web.Routing;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Orders;
@@ -102,7 +103,8 @@ public override ProcessPaymentResult ProcessPayment(ProcessPaymentRequest proces
                 result.AddError(T("Plugins.SmartStore.PayPal.SessionExpired"));
 
                 // Redirect to payment wall and create new payment (we need the payment id).
-                HttpContext.Response.RedirectToRoute(new { Controller = "Checkout", Action = "PaymentMethod", Area = "" });
+                var urlHelper = new UrlHelper(HttpContext.Request.RequestContext);
+                HttpContext.Response.Redirect(urlHelper.Action("PaymentMethod", "Checkout", new { area = "" }));
 
                 return result;
 			}