From 636224d0c8fee26dc6406953624dc7676a2255ad Mon Sep 17 00:00:00 2001 From: lepipele Date: Fri, 16 Mar 2018 22:46:30 -0500 Subject: [PATCH] Checkout html and js cleanup --- BTCPayServer/Views/Invoice/Checkout.cshtml | 112 ++++++++++----------- BTCPayServer/wwwroot/js/core.js | 25 ++--- 2 files changed, 66 insertions(+), 71 deletions(-) diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml index 0e3336193..26d9e68ba 100644 --- a/BTCPayServer/Views/Invoice/Checkout.cshtml +++ b/BTCPayServer/Views/Invoice/Checkout.cshtml @@ -178,19 +178,6 @@
-
-
- - - -
-
- - Open in wallet - - -
-
@@ -215,7 +202,7 @@ - +
@@ -223,6 +210,59 @@
+
+
+ + + +
+
+ + Open in wallet + + +
+
+
+
+ To complete your payment, please send {{ srvModel.btcDue }} {{ srvModel.cryptoCode }} to the address below. +
+
+
+
Amount
+ +
+ {{srvModel.btcDue}} {{ srvModel.cryptoCode }} +
+ Copied +
+
+ +
+
+
+
+
+
+
Address
+ +
+
+ +
{{srvModel.btcAddress}}
+
+
+ Copied +
+
+ +
+
+
+
+
-
-
- To complete your payment, please send {{ srvModel.btcDue }} {{ srvModel.cryptoCode }} to the address below. -
-
-
-
Amount
- -
- {{srvModel.btcDue}} {{ srvModel.cryptoCode }} -
- Copied -
-
- -
-
-
-
-
-
-
Address
- -
-
- -
{{srvModel.btcAddress}}
-
-
- Copied -
-
- -
-
-
-
-
+ -
@@ -615,8 +615,6 @@
- -
diff --git a/BTCPayServer/wwwroot/js/core.js b/BTCPayServer/wwwroot/js/core.js index 56628fbb6..ef701dd4f 100644 --- a/BTCPayServer/wwwroot/js/core.js +++ b/BTCPayServer/wwwroot/js/core.js @@ -144,21 +144,24 @@ $(document).ready(function () { contentType: "application/json; charset=utf-8" }).done(function () { hideEmailForm(); + }).fail(function (jqXHR, textStatus, errorThrown) { + }) - .fail(function (jqXHR, textStatus, errorThrown) { - - }) - .always(function () { - $("#emailAddressForm .input-wrapper bp-loading-button .action-button").removeClass("loading"); - }); + .always(function () { + $("#emailAddressForm .input-wrapper bp-loading-button .action-button").removeClass("loading"); + }); } else { - $("#emailAddressForm").addClass("ng-touched ng-dirty ng-submitted ng-invalid"); - } }); } + // Validate Email address + function validateEmail(email) { + var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + return re.test(email); + } + /* =============== Even listeners =============== */ // Email @@ -245,12 +248,6 @@ $(document).ready(function () { // function to load contents in different language should go there }); - // Validate Email address - function validateEmail(email) { - var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - return re.test(email); - } - // Expand Line-Items $(".buyerTotalLine").click(function () { $("line-items").toggleClass("expanded");