aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-22 14:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moving changing of the state option to view of payment request

Browse Source
This commit is contained in:
rockstardev
2025-07-03 00:22:18 +02:00
parent 9c81666b38
commit 2a98698550
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,23 +114,7 @@
@item.ReferenceId
</td>
<td>
@if (item.IsPending)
{
<div class="badge badge-@item.Status.ToLower() status-badge" data-payment-request-state-badge="@item.Id">
<span class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="cursor:pointer;">
@item.Status
</span>
<div class="dropdown-menu">
<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>
}
else
{
<span class="badge badge-@item.Status.ToLower() status-badge">@item.Status</span>
}
<span class="badge badge-@item.Status.ToLower() status-badge">@item.Status</span>
</td>
<td class="text-end">
<span data-sensitive>@item.AmountFormatted</span>

20
BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
View File

@@ -65,7 +65,7 @@
<div class="d-flex flex-column justify-content-center gap-4">
<partial name="_StoreHeader" model="(Model.Title, Model.StoreBranding)" />
<div class="text-center mt-n3">
Invoice from
Invoice from
@if (!string.IsNullOrEmpty(Model.StoreWebsite))
{
<a href="@Model.StoreWebsite" target="_blank" rel="noreferrer noopener">@Model.StoreName</a>
@@ -134,7 +134,7 @@
</div>
</div>
</dl>
<div class="buttons mt-3">
<template v-if="srvModel.formId && srvModel.formId !== 'None' && !srvModel.formSubmitted">
<a asp-action="ViewPaymentRequestForm" asp-route-payReqId="@Model.Id" class="btn btn-primary btn-lg" data-test="form-button">
@@ -210,7 +210,7 @@
}
</noscript>
</section>
@if (!string.IsNullOrEmpty(Model.Description) && Model.Description != "<br>")
{
<section class="tile">
@@ -218,7 +218,7 @@
<div id="InvoiceDescription" v-html="srvModel.description">@Safe.Raw(Model.Description)</div>
</section>
}
<section class="tile">
<h2 class="h4 mb-3" text-translate="true">Payment History</h2>
<template v-if="!srvModel.invoices || srvModel.invoices.length == 0">
@@ -316,11 +316,19 @@
</div>
</main>
<footer class="store-footer">
<p permission="@Policies.CanModifyStoreSettings" class="d-print-none">
<div permission="@Policies.CanModifyStoreSettings" class="d-print-none">
<a asp-controller="UIPaymentRequest" asp-action="EditPaymentRequest" asp-route-storeId="@Model.StoreId" asp-route-payReqId="@Model.Id" text-translate="true">
Edit payment request
</a>
</p>
</div>
@if (Model.IsPending && Model.AmountCollected > 0)
{
<div permission="@Policies.CanModifyPaymentRequests" class="d-print-none">
<form asp-action="TogglePaymentRequestCompleted" asp-route-payReqId="@Model.Id" asp-route-storeId="@Model.StoreId" method="post">
<button type="submit" class="dropdown-item lh-base">Mark as settled</button>
</form>
</div>
}
<a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
<span text-translate="true">Powered by</span> <partial name="_StoreFooterLogo" />
</a>