Merge pull request #531 from Kukks/patch-2

fix merge bug
This commit is contained in:
Nicolas Dorier
2019-01-16 15:58:29 +09:00
committed by GitHub

View File

@@ -256,8 +256,7 @@ namespace BTCPayServer.Controllers
BuyerEmail = email, BuyerEmail = email,
OrderId = orderId, OrderId = orderId,
NotificationURL = notificationUrl, NotificationURL = notificationUrl,
RedirectURL = redirectUrl, RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
// RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
FullNotifications = true, FullNotifications = true,
}, store, HttpContext.Request.GetAbsoluteRoot()); }, store, HttpContext.Request.GetAbsoluteRoot());
return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id }); return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });