aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix status message of PaymentRequest

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-07 16:19:36 +09:00
parent 892d906ac7
commit b85667a191
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BTCPayServer/Controllers/PaymentRequestController.cs
View File

@@ -66,13 +66,12 @@ namespace BTCPayServer.Controllers
[HttpGet] [HttpGet]
[Route("")] [Route("")]
[BitpayAPIConstraint(false)] [BitpayAPIConstraint(false)]
public async Task<IActionResult> GetPaymentRequests(int skip = 0, int count = 50, string statusMessage = null) public async Task<IActionResult> GetPaymentRequests(int skip = 0, int count = 50)
{ {
var result = await _PaymentRequestRepository.FindPaymentRequests(new PaymentRequestQuery() var result = await _PaymentRequestRepository.FindPaymentRequests(new PaymentRequestQuery()
{ {
UserId = GetUserId(), Skip = skip, Count = count UserId = GetUserId(), Skip = skip, Count = count
}); });
TempData[WellKnownTempData.SuccessMessage] = statusMessage;
return View(new ListPaymentRequestsViewModel() return View(new ListPaymentRequestsViewModel()
{ {
Skip = skip, Skip = skip,
@@ -84,7 +83,7 @@ namespace BTCPayServer.Controllers
[HttpGet] [HttpGet]
[Route("edit/{id?}")] [Route("edit/{id?}")]
public async Task<IActionResult> EditPaymentRequest(string id, string statusMessage = null) public async Task<IActionResult> EditPaymentRequest(string id)
{ {
SelectList stores = null; SelectList stores = null;
var data = await _PaymentRequestRepository.FindPaymentRequest(id, GetUserId()); var data = await _PaymentRequestRepository.FindPaymentRequest(id, GetUserId());
@@ -168,7 +167,8 @@ namespace BTCPayServer.Controllers
PaymentRequestId = data.Id, PaymentRequestId = data.Id,
}); });
return RedirectToAction("EditPaymentRequest", new {id = data.Id, StatusMessage = "Saved"}); TempData[WellKnownTempData.SuccessMessage] = "Saved";
return RedirectToAction("EditPaymentRequest", new {id = data.Id});
} }
[HttpGet] [HttpGet]
@@ -199,17 +199,13 @@ namespace BTCPayServer.Controllers
var result = await _PaymentRequestRepository.RemovePaymentRequest(id, GetUserId()); var result = await _PaymentRequestRepository.RemovePaymentRequest(id, GetUserId());
if (result) if (result)
{ {
return RedirectToAction("GetPaymentRequests", TempData[WellKnownTempData.SuccessMessage] = "Payment request successfully removed";
new {StatusMessage = "Payment request successfully removed"}); return RedirectToAction("GetPaymentRequests");
} }
else else
{ {
return RedirectToAction("GetPaymentRequests", TempData[WellKnownTempData.ErrorMessage] = "Payment request could not be removed. Any request that has generated invoices cannot be removed.";
new return RedirectToAction("GetPaymentRequests");
{
StatusMessage =
"Error: Payment request could not be removed. Any request that has generated invoices cannot be removed."
});
} }
} }