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

Simplifying implementation of status switch

Browse Source
This commit is contained in:
rockstardev
2025-07-03 00:00:43 +02:00
parent bc1cebd2d1
commit 9c81666b38
3 changed files with 23 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
BTCPayServer/Controllers/UIPaymentRequestController.cs
View File

@@ -465,48 +465,31 @@ namespace BTCPayServer.Controllers
return NotFound(); return NotFound();
} }
[HttpPost("{payReqId}/changestate/{newState}")] [HttpPost("{payReqId}/complete")]
[Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyPaymentRequests)] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyPaymentRequests)]
public async Task<IActionResult> ChangePaymentRequestState(string payReqId, string newState) public async Task<IActionResult> TogglePaymentRequestCompleted(string payReqId)
{ {
if (string.IsNullOrWhiteSpace(payReqId) || string.IsNullOrWhiteSpace(newState)) if (string.IsNullOrWhiteSpace(payReqId))
{ {
return BadRequest("Invalid parameters"); return BadRequest("Invalid parameters");
} }
var paymentRequest = await _PaymentRequestRepository.FindPaymentRequest(payReqId, GetUserId()); var paymentRequest = await _PaymentRequestRepository.FindPaymentRequest(payReqId, GetUserId());
var model = new PaymentRequestStateChangeModel();
if (paymentRequest == null) if (paymentRequest == null)
{ {
model.NotFound = true; return NotFound();
return NotFound(model);
} }
if (newState == "completed") if (paymentRequest.Status != PaymentRequestStatus.Pending)
{ {
return BadRequest("Invalid payment request status. Only pending payment requests can be marked as completed.");
}
await _PaymentRequestRepository.UpdatePaymentRequestStatus(payReqId, PaymentRequestStatus.Completed); await _PaymentRequestRepository.UpdatePaymentRequestStatus(payReqId, PaymentRequestStatus.Completed);
model.StatusString = "Settled";
}
else if (newState == "expired")
{
await _PaymentRequestRepository.UpdatePaymentRequestStatus(payReqId, PaymentRequestStatus.Expired);
model.StatusString = "Expired";
}
else
{
return BadRequest($"Invalid state: {newState}");
}
return Json(model); return RedirectToAction("GetPaymentRequests", new { storeId = paymentRequest.StoreDataId });
} }
public class PaymentRequestStateChangeModel
{
public bool NotFound { get; set; }
public string? StatusString { get; set; }
}
private string GetUserId() => _UserManager.GetUserId(User); private string GetUserId() => _UserManager.GetUserId(User);
private StoreData GetCurrentStore() => HttpContext.GetStoreData(); private StoreData GetCurrentStore() => HttpContext.GetStoreData();

8
BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml
View File

@@ -121,7 +121,9 @@
@item.Status @item.Status
</span> </span>
<div class="dropdown-menu"> <div class="dropdown-menu">
<button type="button" class="dropdown-item lh-base" data-payment-request-id="@item.Id" data-new-state="completed">Mark as settled</button> <form asp-action="TogglePaymentRequestCompleted" asp-route-payReqId="@item.Id" method="post">
<button type="submit" class="dropdown-item lh-base">Mark as settled</button>
</form>
</div> </div>
</div> </div>
} }
@@ -168,7 +170,3 @@ else
There are no payment requests matching your criteria. There are no payment requests matching your criteria.
</p> </p>
} }
<script>
window.storeId = '@storeId';
</script>

17
BTCPayServer/wwwroot/main/site.js
View File

@@ -277,23 +277,6 @@ document.addEventListener("DOMContentLoaded", () => {
} }
}) })
// Payment Request Status
delegate('click', '[data-payment-request-state-badge] [data-payment-request-id][data-new-state]', async e => {
const $button = e.target
const $badge = $button.closest('[data-payment-request-state-badge]')
const { paymentRequestId, newState } = $button.dataset
$badge.classList.add('pe-none'); // disable further interaction
const response = await fetch(`${baseUrl}/payment-requests/${paymentRequestId}/changestate/${newState}`, { method: 'POST' })
if (response.ok) {
const { statusString } = await response.json()
$badge.outerHTML = `<div class="badge badge-${newState}" data-payment-request-state-badge="${paymentRequestId}">${statusString}</div>`
} else {
$badge.classList.remove('pe-none');
alert("Payment request state update failed");
}
})
// Time Format // Time Format
delegate('click', '.switch-time-format', switchTimeFormat); delegate('click', '.switch-time-format', switchTimeFormat);