Skip to content

Commit ca2bb92

Browse files
Minor improvements
1 parent cdb630a commit ca2bb92

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

src/Libraries/SmartStore.Services/Messages/MessageTokenProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ public virtual void AddCustomerTokens(IList<Token> tokens, Customer customer)
875875

876876
//note: we do not use SEO friendly URLS because we can get errors caused by having .(dot) in the URL (from the emauk address)
877877
//TODO add a method for getting URL (use routing because it handles all SEO friendly URLs)
878-
string passwordRecoveryUrl = string.Format("{0}passwordrecovery/confirm?token={1}&email={2}", _webHelper.GetStoreLocation(),
878+
string passwordRecoveryUrl = string.Format("{0}customer/passwordrecovery/confirm?token={1}&email={2}", _webHelper.GetStoreLocation(),
879879
customer.GetAttribute<string>(SystemCustomerAttributeNames.PasswordRecoveryToken), HttpUtility.UrlEncode(customer.Email));
880880

881881
string accountActivationUrl = string.Format("{0}customer/activation?token={1}&email={2}", _webHelper.GetStoreLocation(),

src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ public void OnActionExecuting(ActionExecutingContext filterContext)
6161
//delete property for backward navigation
6262
_httpContext.GetCheckoutState().CustomProperties.Remove("PayPalExpressButtonUsed");
6363

64-
filterContext.Result = new RedirectResult("~/Checkout/Confirm/");
64+
filterContext.Result = new RedirectToRouteResult(
65+
new RouteValueDictionary {
66+
{ "Controller", "Checkout" },
67+
{ "Action", "Confirm" },
68+
{ "area", null }
69+
});
6570
}
6671
}
6772

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//
2+
// Customize the theme here with css overrides
3+
// or new selectors
4+
// --------------------------------------------------
5+
6+
7+
.block.block-bordered .block-title a {
8+
color: #fff;
9+
}

0 commit comments

Comments
 (0)