This commit is contained in:
Ricardo (XenGi) Band 2026-01-06 14:26:34 +01:00
commit f9bcfcb7a6
No known key found for this signature in database
3 changed files with 64 additions and 41 deletions

View file

@ -2,4 +2,3 @@
- only validate and decorate purpose field when value.length > 0
- only validate and decorate bic field when value.length > 0
- always format amount as #.##

View file

@ -126,7 +126,7 @@
<div id="amount" class="field">
<label for="input-amount" class="label" data-i18n="amount"></label>
<div class="control has-icons-left has-icons-right">
<input id="input-amount" class="input" type="number" min="0.00" step="0.01" value="0.00" pattern="[0-9]+.[0-9]{2}" placeholder="0.00" required>
<input id="input-amount" class="input" type="number" min="0" step="1" value="0" pattern="[0-9]+.[0-9]{2}" placeholder="0.00" required>
<span class="icon is-small is-left"><b>&euro;</b></span>
<span class="icon is-small is-right"></span>
</div>

View file

@ -95,24 +95,29 @@ const validateName = (target) => {
}
const validateBic = (target) => {
if (target.value.length == 0) return
const re = /^[a-z]{6}[2-9a-z][0-9a-np-z]([a-z0-9]{3}|x{3})?$/i;
if (re.test(target.value)) {
target.classList.remove("is-danger")
document.querySelector("#bic div span").innerHTML = "&#x2705;";
if (document.querySelector("#bic p")) {
document.querySelector("#bic p").remove();
if (target.value.length > 0) {
const re = /^[a-z]{6}[2-9a-z][0-9a-np-z]([a-z0-9]{3}|x{3})?$/i;
if (re.test(target.value)) {
target.classList.remove("is-danger")
document.querySelector("#bic div span").innerHTML = "&#x2705;";
if (document.querySelector("#bic p")) {
document.querySelector("#bic p").remove();
}
} else {
target.classList.add("is-danger")
document.querySelector("#bic div span").innerHTML = "&#x274C;";
if (!document.querySelector("#bic p")) {
const help = document.createElement("p");
help.classList.add("help", "is-danger");
help.textContent = "BIC is invalid";
document.querySelector("#bic").appendChild(help);
}
}
} else {
target.classList.add("is-danger")
document.querySelector("#bic div span").innerHTML = "&#x274C;";
if (!document.querySelector("#bic p")) {
const help = document.createElement("p");
help.classList.add("help", "is-danger");
help.textContent = "BIC is invalid";
document.querySelector("#bic").appendChild(help);
target.classList.remove("is-danger");
document.querySelector("#bic div span").innerHTML = "";
if (document.querySelector("#bic p")) {
document.querySelector("#bic p").remove();
}
}
}
@ -153,36 +158,49 @@ const validateIban = (target) => {
}
const validateAmount = (target) => {
if (target.value == 0) return
if (parseFloat(target.value) > 0 && target.value.toString() === parseFloat(target.value).toFixed(2).toString()) {
target.value = parseFloat(target.value).toFixed(2);
target.classList.remove("is-danger")
document.querySelector("#amount div span.is-right").innerHTML = "&#x2705;";
console.log(`${target.value} = ${parseFloat(target.value.replace(",", ".")).toFixed(2)}`);
if (target.value.length > 0) {
const val = parseFloat(target.value.replace(",", "."))
if (val.toFixed(2) == val && val >= 0) {
target.classList.remove("is-danger");
document.querySelector("#amount div span.is-right").innerHTML = "&#x2705;";
} else {
target.classList.add("is-danger");
document.querySelector("#amount div span.is-right").innerHTML = "&#x274C;";
}
} else {
target.classList.add("is-danger")
document.querySelector("#amount div span.is-right").innerHTML = "&#x274C;";
target.classList.remove("is-danger");
document.querySelector("#amount div span.is-right").innerHTML = "";
if (document.querySelector("#amount p")) {
document.querySelector("#amount p").remove();
}
}
}
const validatePurpose = (target) => {
if (target.value.length == 0) return
const re = /[a-zA-Z0-9\/?:().,'+\- ]{1,140}/i;
if (re.test(target.value)) {
target.classList.remove("is-danger")
document.querySelector("#purpose div span").innerHTML = "&#x2705;";
if (document.querySelector("#purpose p")) {
document.querySelector("#purpose p").remove();
if (target.value.length > 0) {
const re = /[a-z0-9\/?:().,'+\- ]{1,140}/i;
if (re.test(target.value)) {
target.classList.remove("is-danger")
document.querySelector("#purpose div span").innerHTML = "&#x2705;";
if (document.querySelector("#purpose p")) {
document.querySelector("#purpose p").remove();
}
} else {
target.classList.add("is-danger")
document.querySelector("#purpose div span").innerHTML = "&#x274C;";
if (!document.querySelector("#purpose p")) {
const help = document.createElement("p");
help.classList.add("help", "is-danger");
help.textContent = "Purpose can only have 140 characters and only include A-Z, a-z, 0-9, /?:().,'+- and spaces.";
document.querySelector("#purpose").appendChild(help);
}
}
} else {
target.classList.add("is-danger")
document.querySelector("#purpose div span").innerHTML = "&#x274C;";
if (!document.querySelector("#purpose p")) {
const help = document.createElement("p");
help.classList.add("help", "is-danger");
help.textContent = "Purpose can only have 140 characters and only include A-Z, a-z, 0-9, /?:().,'+- and spaces.";
document.querySelector("#purpose").appendChild(help);
target.classList.remove("is-danger");
document.querySelector("#purpose div span.is-right").innerHTML = "";
if (document.querySelector("#purpose p")) {
document.querySelector("#purpose p").remove();
}
}
}
@ -203,6 +221,12 @@ document.querySelector("#bic input").addEventListener("input", (event) => {
});
document.querySelector("#amount input").addEventListener("input", (event) => {
// Remove invalid characters
//event.target.value = event.target.value.replace(/[^0-9.]/g, '');
if (event.target.value.length > 0 && !isNaN(parseFloat(event.target.value))) {
event.target.value = parseFloat(event.target.value).toFixed(2);
}
validateAmount(event.target);
regenerate();
});