From 397ca6ef0c36e05eb958f167ee627a6f96cb6aaf Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Wed, 8 Mar 2023 13:39:03 +0100
Subject: [PATCH] Checkout v2: Minor UI updates (#4734)

* Checkout v2: Minor copy change

* Allow copying of invoice ID and order ID on results page

* Add copy icons for payment details on results view

* Add missing powered by class to store footers
---
 .../Crowdfund/Public/ViewCrowdfund.cshtml     |  2 +-
 .../Shared/PointOfSale/Public/Cart.cshtml     |  2 +-
 .../Shared/PointOfSale/Public/Light.cshtml    |  2 +-
 .../Shared/PointOfSale/Public/Print.cshtml    |  2 +-
 .../Shared/PointOfSale/Public/Static.cshtml   |  2 +-
 BTCPayServer/Views/UIForms/View.cshtml        |  2 +-
 .../Views/UIInvoice/CheckoutV2.cshtml         | 48 ++++++++++---------
 .../Views/UIInvoice/InvoiceReceipt.cshtml     |  2 +-
 .../ViewPaymentRequest.cshtml                 |  2 +-
 .../UIPullPayment/ViewPullPayment.cshtml      |  2 +-
 BTCPayServer/wwwroot/locales/checkout/en.json |  4 +-
 11 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml b/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml
index 5f3b3dd05..b1b2e0014 100644
--- a/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml
+++ b/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml
@@ -270,7 +270,7 @@
     </b-modal>
 
     <footer class="store-footer">
-        <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+        <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
             Powered by <partial name="_StoreFooterLogo" />
         </a>
     </footer>
diff --git a/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml b/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml
index 70a7304a5..5bdaade37 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml
@@ -320,7 +320,7 @@
         </button>
 
         <footer class="store-footer">
-            <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+            <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
                 Powered by <partial name="_StoreFooterLogo" />
             </a>
         </footer>
diff --git a/BTCPayServer/Views/Shared/PointOfSale/Public/Light.cshtml b/BTCPayServer/Views/Shared/PointOfSale/Public/Light.cshtml
index 136e8b0aa..0ab0d5dae 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/Public/Light.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/Public/Light.cshtml
@@ -125,7 +125,7 @@
         <partial name="PointOfSale/Public/VueLight" model="Model" />
     }
     <footer class="store-footer">
-        <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+        <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
             Powered by <partial name="_StoreFooterLogo" />
         </a>
     </footer>
diff --git a/BTCPayServer/Views/Shared/PointOfSale/Public/Print.cshtml b/BTCPayServer/Views/Shared/PointOfSale/Public/Print.cshtml
index 339b7eeca..293957f76 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/Public/Print.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/Public/Print.cshtml
@@ -128,7 +128,7 @@ else
         </div>
     </main>
     <footer class="store-footer">
-        <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+        <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
             Powered by <partial name="_StoreFooterLogo" />
         </a>
     </footer>
diff --git a/BTCPayServer/Views/Shared/PointOfSale/Public/Static.cshtml b/BTCPayServer/Views/Shared/PointOfSale/Public/Static.cshtml
index 1f410789c..d8bf7f317 100644
--- a/BTCPayServer/Views/Shared/PointOfSale/Public/Static.cshtml
+++ b/BTCPayServer/Views/Shared/PointOfSale/Public/Static.cshtml
@@ -84,7 +84,7 @@
         </div>
     </main>
     <footer class="store-footer">
-        <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+        <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
             Powered by <partial name="_StoreFooterLogo" />
         </a>
     </footer>
diff --git a/BTCPayServer/Views/UIForms/View.cshtml b/BTCPayServer/Views/UIForms/View.cshtml
index ddbcfa9cc..49261b196 100644
--- a/BTCPayServer/Views/UIForms/View.cshtml
+++ b/BTCPayServer/Views/UIForms/View.cshtml
@@ -47,7 +47,7 @@
             </div>
         </main>
         <footer class="store-footer">
-            <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+            <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
                 Powered by <partial name="_StoreFooterLogo" />
             </a>
         </footer>
diff --git a/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml b/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
index da6aacbba..2300b1474 100644
--- a/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
@@ -107,17 +107,19 @@
                             <vc:icon symbol="payment-complete"/>
                         </span>
                         <h4 v-t="'invoice_paid'"></h4>
-                        <dl class="mb-0">
-                            <div>
-                                <dt v-t="'invoice_id'"></dt>
-                                <dd v-text="srvModel.invoiceId"></dd>
-                            </div>
-                            <div v-if="srvModel.orderId">
-                                <dt v-t="'order_id'"></dt>
-                                <dd v-text="srvModel.orderId"></dd>
-                            </div>
-                        </dl>
-                        <payment-details :srv-model="srvModel" :is-active="isActive" class="mb-5"></payment-details>
+                        <div id="PaymentDetails" class="payment-details">
+                            <dl class="mb-0">
+                                <div>
+                                    <dt v-t="'invoice_id'"></dt>
+                                    <dd v-text="srvModel.invoiceId" :data-clipboard="srvModel.invoiceId" :data-clipboard-confirm="$t('copy_confirm')"></dd>
+                                </div>
+                                <div v-if="srvModel.orderId">
+                                    <dt v-t="'order_id'"></dt>
+                                    <dd v-text="srvModel.orderId" :data-clipboard="srvModel.orderId" :data-clipboard-confirm="$t('copy_confirm')"></dd>
+                                </div>
+                            </dl>
+                            <payment-details :srv-model="srvModel" :is-active="isActive" class="mb-5"></payment-details>
+                        </div>
                     </div>
                     <div class="buttons">
                         <a v-if="srvModel.receiptLink" class="btn btn-primary rounded-pill w-100" :href="srvModel.receiptLink" :target="isModal ? '_top' : null" v-t="'view_receipt'" id="ReceiptLink"></a>
@@ -131,18 +133,18 @@
                             <vc:icon symbol="invoice-expired"/>
                         </span>
                         <h4 v-t="'invoice_expired'"></h4>
-                        <dl class="mb-0">
-                            <div>
-                                <dt v-t="'invoice_id'"></dt>
-                                <dd v-text="srvModel.invoiceId"></dd>
-                            </div>
-                            <div v-if="srvModel.orderId">
-                                <dt v-t="'order_id'"></dt>
-                                <dd v-text="srvModel.orderId"></dd>
-                            </div>
-                        </dl>
-                        <div id="PaymentDetails" class="payment-details" v-collapsible="displayPaymentDetails">
-                            <payment-details :srv-model="srvModel" :is-active="isActive"></payment-details>
+                        <div id="PaymentDetails" class="payment-details">
+                            <dl class="mb-0">
+                                <div>
+                                    <dt v-t="'invoice_id'"></dt>
+                                    <dd v-text="srvModel.invoiceId" :data-clipboard="srvModel.invoiceId" :data-clipboard-confirm="$t('copy_confirm')"></dd>
+                                </div>
+                                <div v-if="srvModel.orderId">
+                                    <dt v-t="'order_id'"></dt>
+                                    <dd v-text="srvModel.orderId" :data-clipboard="srvModel.orderId" :data-clipboard-confirm="$t('copy_confirm')"></dd>
+                                </div>
+                            </dl>
+                            <payment-details :srv-model="srvModel" :is-active="isActive" v-collapsible="displayPaymentDetails"></payment-details>
                         </div>
                         <button class="d-flex align-items-center gap-1 btn btn-link payment-details-button" type="button" :aria-expanded="displayPaymentDetails ? 'true' : 'false'" v-on:click="displayPaymentDetails = !displayPaymentDetails">
                             <span class="fw-semibold" v-t="'view_details'"></span>
diff --git a/BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml b/BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml
index c03c8bbc3..63cc6a33c 100644
--- a/BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml
+++ b/BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml
@@ -168,7 +168,7 @@
                     Admin details
                 </a>
             </p>
-            <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+            <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
                 Powered by <partial name="_StoreFooterLogo" />
             </a>
         </footer>
diff --git a/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
index 47d8d8d4a..edb40da67 100644
--- a/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
+++ b/BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml
@@ -375,7 +375,7 @@
                     Edit payment request
                 </a>
             </p>
-            <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+            <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
                 Powered by <partial name="_StoreFooterLogo" />
             </a>
         </footer>
diff --git a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
index 60bec013a..ea4c4aff1 100644
--- a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
@@ -215,7 +215,7 @@
                     Edit pull payment
                 </a>
             </p>
-            <a href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
+            <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
                 Powered by <partial name="_StoreFooterLogo" />
             </a>
         </footer>
diff --git a/BTCPayServer/wwwroot/locales/checkout/en.json b/BTCPayServer/wwwroot/locales/checkout/en.json
index 839279253..4ffedd15a 100644
--- a/BTCPayServer/wwwroot/locales/checkout/en.json
+++ b/BTCPayServer/wwwroot/locales/checkout/en.json
@@ -28,11 +28,11 @@
   "payment_link": "Payment Link",
   "invoice_paid": "Invoice Paid",
   "invoice_expired": "Invoice Expired",
-  "invoice_expired_body": "An invoice is only valid for {{minutes}} minutes.\n\nReturn to {{storeName}} if you like to resubmit a payment.",
+  "invoice_expired_body": "An invoice is only valid for {{minutes}} minutes.\n\nReturn to {{storeName}} if you would like to resubmit a payment.",
   "view_receipt": "View receipt",
   "return_to_store": "Return to {{storeName}}",
   "copy": "Copy",
   "copy_confirm": "Copied",
   "powered_by": "Powered by",
   "conversion_body": "This service is provided by 3rd party. Please keep in mind that we have no control over how providers will forward your funds. Invoice will only be marked paid once funds are received on {{cryptoCode}} Blockchain."
-}
\ No newline at end of file
+}