Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added Spaces to IBAN for IBAN View in Address View and Form.php

Browse Source
This commit is contained in:
Luca Haid
2024-04-16 09:03:21 +02:00
parent 0913240593
commit 6ed26c9055
1 changed files with 154 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Address/Form.php
+7 -28
View File
@@ -549,29 +549,6 @@
return false; return false;
} }
$('#addressForm').submit(function(e) {
$("#error").hide();
$("#bank-error").hide();
if($('#billing_type').val() == "sepa") {
console.log("bankdata_valid (1): " + bankdata_valid);
if(bankdata_valid) {
return true;
}
if(!validateIbanFormat($("#bank_account_iban").val())) {
$("#error").show();
console.log("nope");
}
console.log("bankdata_valid: " + bankdata_valid);
if($("#bank_account_iban").val() != "<?=$address->bank_account_iban?>" || $("#bank_account_bic").val() != "<?=$address->bank_account_bic?>") {
validateIbanBic($("#bank_account_iban").val(), $("#bank_account_bic").val());
} else {
return true;
}
// Format IBAN with Spaces
function formatIBAN(input) { function formatIBAN(input) {
let iban = input.value.replace(/\s/g, ''); let iban = input.value.replace(/\s/g, '');
@@ -595,6 +572,7 @@
$('#addressForm').submit(function(e) { $('#addressForm').submit(function(e) {
$("#error").hide(); $("#error").hide();
$("#bank-error").hide(); $("#bank-error").hide();
$("#bbank_account_iban").val($("#bank_account_iban").val().replace(/\s/g, ''));
if($('#billing_type').val() == "sepa") { if($('#billing_type').val() == "sepa") {
console.log("bankdata_valid (1): " + bankdata_valid); console.log("bankdata_valid (1): " + bankdata_valid);
@@ -602,26 +580,27 @@
return true; return true;
} }
if (!validateIbanFormat($("#bank_account_iban").val().replace(/\s/g, ''))) { if(!validateIbanFormat($("#bank_account_iban").val())) {
$("#error").show(); $("#error").show();
console.log("nope"); console.log("nope");
} }
console.log("bankdata_valid: " + bankdata_valid); console.log("bankdata_valid: " + bankdata_valid);
if ($("#bank_account_iban").val().replace(/\s/g, '') != "<?=$address->bank_account_iban?>" || $("#bank_account_bic").val() != "<?=$address->bank_account_bic?>") { if($("#bank_account_iban").val() != "<?=$address->bank_account_iban?>" || $("#bank_account_bic").val() != "<?=$address->bank_account_bic?>") {
validateIbanBic($("#bank_account_iban").val().replace(/\s/g, ''), $("#bank_account_bic").val()); validateIbanBic($("#bank_account_iban").val(), $("#bank_account_bic").val());
} else { } else {
return true; return true;
} }
$("#bank_account_iban").val($("#bank_account_iban").val().replace(/\s/g, ''));
e.preventDefault(); e.preventDefault();
return false; return false;
} }
}); });
/* /*
* link autocomplete * link autocomplete
*/ */