mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-25 09:23:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix install alert msg not showed, pw confirm id + js errors lang

Browse source 
js #retype-password to #password-confirm
This commit is contained in:
Thomas Ingles 2024-04-30 14:25:25 +02:00 committed by Alex Tselegidis
parent ff599e2c00
commit a04c0cafdf
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/views/pages/installation.php
View file

@ -39,7 +39,7 @@
</details></p> </details></p>
</div> </div>
<div class="alert d-none"></div> <div class="alert" hidden></div>
<div class="row"> <div class="row">
<div class="admin-settings col-12 col-sm-5"> <div class="admin-settings col-12 col-sm-5">

18
assets/js/pages/installation.js
View file

@ -25,7 +25,7 @@ App.Pages.Installation = (function () {
const $phoneNumber = $('#phone-number'); const $phoneNumber = $('#phone-number');
const $username = $('#username'); const $username = $('#username');
const $password = $('#password'); const $password = $('#password');
const $retypePassword = $('#retype-password'); const $passwordConfirm = $('#password-confirm');
const $companyName = $('#company-name'); const $companyName = $('#company-name');
const $companyEmail = $('#company-email'); const $companyEmail = $('#company-email');
const $companyLink = $('#company-link'); const $companyLink = $('#company-link');
@ -97,31 +97,31 @@ App.Pages.Installation = (function () {
}); });
if (missingRequired) { if (missingRequired) {
throw new Error('All the page fields are required.'); throw new Error(lang('fields_are_required'));
} }
// Validate Passwords // Validate Passwords
if ($password.val() !== $retypePassword.val()) { if ($password.val() !== $passwordConfirm.val()) {
$password.addClass('is-invalid'); $password.addClass('is-invalid');
$retypePassword.addClass('is-invalid'); $passwordConfirm.addClass('is-invalid');
throw new Error('Passwords do not match!'); throw new Error(lang('passwords_mismatch'));
} }
if ($password.val().length < MIN_PASSWORD_LENGTH) { if ($password.val().length < MIN_PASSWORD_LENGTH) {
$password.addClass('is-invalid'); $password.addClass('is-invalid');
$retypePassword.addClass('is-invalid'); $passwordConfirm.addClass('is-invalid');
throw new Error(`The password must be at least ${MIN_PASSWORD_LENGTH} characters long.`); throw new Error(lang('password_length_notice').replace('$number', MIN_PASSWORD_LENGTH));
} }
// Validate Email // Validate Email
if (!App.Utils.Validation.email($email.val())) { if (!App.Utils.Validation.email($email.val())) {
$email.addClass('is-invalid'); $email.addClass('is-invalid');
throw new Error('The email address is invalid!'); throw new Error(lang('invalid_email'));
} }
if (!App.Utils.Validation.email($companyEmail.val())) { if (!App.Utils.Validation.email($companyEmail.val())) {
$companyEmail.addClass('is-invalid'); $companyEmail.addClass('is-invalid');
throw new Error('The email address is invalid!'); throw new Error(lang('invalid_email'));
} }
return true; return true;