From 9c81666b384aa6903283bdc3977a63b7427c52bb Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Thu, 3 Jul 2025 00:00:43 +0200 Subject: [PATCH] Simplifying implementation of status switch --- .../Controllers/UIPaymentRequestController.cs | 35 +++++-------------- .../GetPaymentRequests.cshtml | 14 ++++---- BTCPayServer/wwwroot/main/site.js | 33 +++++------------ 3 files changed, 23 insertions(+), 59 deletions(-) diff --git a/BTCPayServer/Controllers/UIPaymentRequestController.cs b/BTCPayServer/Controllers/UIPaymentRequestController.cs index 88253eeae..76d0425d1 100644 --- a/BTCPayServer/Controllers/UIPaymentRequestController.cs +++ b/BTCPayServer/Controllers/UIPaymentRequestController.cs @@ -465,48 +465,31 @@ namespace BTCPayServer.Controllers return NotFound(); } - [HttpPost("{payReqId}/changestate/{newState}")] + [HttpPost("{payReqId}/complete")] [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyPaymentRequests)] - public async Task ChangePaymentRequestState(string payReqId, string newState) + public async Task TogglePaymentRequestCompleted(string payReqId) { - if (string.IsNullOrWhiteSpace(payReqId) || string.IsNullOrWhiteSpace(newState)) + if (string.IsNullOrWhiteSpace(payReqId)) { return BadRequest("Invalid parameters"); } var paymentRequest = await _PaymentRequestRepository.FindPaymentRequest(payReqId, GetUserId()); - var model = new PaymentRequestStateChangeModel(); if (paymentRequest == null) { - model.NotFound = true; - return NotFound(model); + return NotFound(); } - if (newState == "completed") + if (paymentRequest.Status != PaymentRequestStatus.Pending) { - 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 BadRequest("Invalid payment request status. Only pending payment requests can be marked as completed."); } - return Json(model); + await _PaymentRequestRepository.UpdatePaymentRequestStatus(payReqId, PaymentRequestStatus.Completed); + + 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 StoreData GetCurrentStore() => HttpContext.GetStoreData(); diff --git a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml index e7036a147..f9f998a1e 100644 --- a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml +++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml @@ -18,7 +18,7 @@ { private int CountArrayFilter(string type) => Model.Search.ContainsFilter(type) ? Model.Search.GetFilterArray(type).Length : 0; - + private bool HasArrayFilter(string type, string key = null) => Model.Search.ContainsFilter(type) && (key is null || Model.Search.GetFilterArray(type).Contains(key)); @@ -121,7 +121,9 @@ @item.Status
- +
+ +
} @@ -136,14 +138,14 @@
View -
  • Invoices
    • @@ -168,7 +170,3 @@ else There are no payment requests matching your criteria.

    } - - \ No newline at end of file diff --git a/BTCPayServer/wwwroot/main/site.js b/BTCPayServer/wwwroot/main/site.js index 41b9cded9..b17e85ecf 100644 --- a/BTCPayServer/wwwroot/main/site.js +++ b/BTCPayServer/wwwroot/main/site.js @@ -151,7 +151,7 @@ document.addEventListener("DOMContentLoaded", () => { }); setStickyHeaderHeight(); } - + // initialize timezone offset value if field is present in page const $timezoneOffset = document.getElementById("TimezoneOffset"); const timezoneOffset = new Date().getTimezoneOffset(); @@ -161,7 +161,7 @@ document.addEventListener("DOMContentLoaded", () => { formatDateTimes(); initLabelManagers(); - + function updateTimeAgo(){ var timeagoElements = $("[data-timeago-unixms]"); timeagoElements.each(function () { @@ -171,7 +171,7 @@ document.addEventListener("DOMContentLoaded", () => { setTimeout(updateTimeAgo, 1000); } updateTimeAgo(); - + // intializing date time pickers $(".flatdtpicker").each(function () { var element = $(this); @@ -259,7 +259,7 @@ document.addEventListener("DOMContentLoaded", () => { if (!!$button.innerHTML.match('#actions-hide')) $button.innerHTML = $button.innerHTML.replace('#actions-hide', '#actions-show'); } }) - + // Invoice Status delegate('click', '[data-invoice-state-badge] [data-invoice-id][data-new-state]', async e => { const $button = e.target @@ -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 = `
    ${statusString}
    ` - } else { - $badge.classList.remove('pe-none'); - alert("Payment request state update failed"); - } - }) - // Time Format delegate('click', '.switch-time-format', switchTimeFormat); @@ -319,7 +302,7 @@ document.addEventListener("DOMContentLoaded", () => { document.documentElement.setAttribute(SENSITIVE_INFO_DATA_ATTR, 'true'); } }); - + // Currency Selection: Remove the current input value once the element is focused, so that the user gets to // see the available options. If no selection or change is made, reset it to the previous value on blur. // Note: Use focusin/focusout instead of focus/blur, because the latter do not bubble up and delegate won't work. @@ -331,7 +314,7 @@ document.addEventListener("DOMContentLoaded", () => { if (!e.target.value) e.target.value = e.target.getAttribute('placeholder') e.target.removeAttribute('placeholder') }) - + // Offcanvas navigation const mainMenuToggle = document.getElementById('mainMenuToggle') if (mainMenuToggle) { @@ -342,7 +325,7 @@ document.addEventListener("DOMContentLoaded", () => { mainMenuToggle.setAttribute('aria-expanded', 'false') }) } - + // Menu collapses const mainNav = document.getElementById('mainNav') if (mainNav) { @@ -361,7 +344,7 @@ document.addEventListener("DOMContentLoaded", () => { window.localStorage.setItem(COLLAPSED_KEY, JSON.stringify(collapsed)) }) } - + // Mass Action Tables const updateSelectedCount = ($table) => { const selectedCount = document.querySelectorAll('.mass-action-select:checked').length;