Add soft phone number validation (#820).

application/language/arabic/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/bulgarian/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/catalan/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/chinese/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/czech/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/danish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/dutch/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/english/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/finnish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/french/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/greek/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/hebrew/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/hindi/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/hungarian/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/italian/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/japanese/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/luxembourgish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/marathi/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/polish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/portuguese-br/translations_lang.php

@@ -337,4 +337,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/portuguese/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/romanian/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/russian/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/slovak/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/spanish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/swedish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

application/language/turkish/translations_lang.php

@@ -338,4 +338,5 @@ $lang['display'] = 'Display';
 $lang['require'] = 'Require';
 $lang['color'] = 'Color';
 $lang['matomo_analytics_url_hint'] = 'Add the URL to your own Matomo installation to enable Matomo tracking on the booking pages.';
+$lang['invalid_phone'] = 'Invalid phone number.';
 // End

assets/js/pages/admins.js

@@ -292,6 +292,22 @@ App.Pages.Admins = (function () {
                 throw new Error(lang('invalid_email'));
             }
 
+            // Validate phone number.
+            const phoneNumber = $phoneNumber.val();
+
+            if (phoneNumber && !App.Utils.Validation.phone(phoneNumber)) {
+                $phoneNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
+            // Validate mobile number.
+            const mobileNumber = $mobileNumber.val();
+
+            if (mobileNumber && !App.Utils.Validation.phone(mobileNumber)) {
+                $mobileNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
             // Check if username exists
             if ($username.attr('already-exists') === 'true') {
                 $username.addClass('is-invalid');

assets/js/pages/booking.js

@@ -552,6 +552,14 @@ App.Pages.Booking = (function () {
                 throw new Error(lang('invalid_email'));
             }
 
+            // Validate phone number.
+            const phoneNumber = $phoneNumber.val();
+
+            if (phoneNumber && !App.Utils.Validation.phone(phoneNumber)) {
+                $phoneNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
             return true;
         } catch (error) {
             $('#form-message').text(error.message);

assets/js/pages/customers.js

@@ -213,11 +213,21 @@ App.Pages.Customers = (function () {
             }
 
             // Validate email address.
-            if (!App.Utils.Validation.email($email.val())) {
+            const email = $email.val();
+
+            if (email && !App.Utils.Validation.email(email)) {
                 $email.addClass('is-invalid');
                 throw new Error(lang('invalid_email'));
             }
 
+            // Validate phone number.
+            const phoneNumber = $phoneNumber.val();
+
+            if (phoneNumber && !App.Utils.Validation.phone(phoneNumber)) {
+                $phoneNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
             return true;
         } catch (error) {
             $formMessage.addClass('alert-danger').text(error.message).show();

assets/js/pages/providers.js

@@ -300,6 +300,22 @@ App.Pages.Providers = (function () {
                 throw new Error(lang('invalid_email'));
             }
 
+            // Validate phone number.
+            const phoneNumber = $phoneNumber.val();
+
+            if (phoneNumber && !App.Utils.Validation.phone(phoneNumber)) {
+                $phoneNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
+            // Validate mobile number.
+            const mobileNumber = $mobileNumber.val();
+
+            if (mobileNumber && !App.Utils.Validation.phone(mobileNumber)) {
+                $mobileNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
             // Check if username exists
             if ($username.attr('already-exists') === 'true') {
                 $username.addClass('is-invalid');

assets/js/pages/secretaries.js

@@ -305,6 +305,22 @@ App.Pages.Secretaries = (function () {
                 throw new Error('Invalid email address!');
             }
 
+            // Validate phone number.
+            const phoneNumber = $phoneNumber.val();
+
+            if (phoneNumber && !App.Utils.Validation.phone(phoneNumber)) {
+                $phoneNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
+            // Validate mobile number.
+            const mobileNumber = $mobileNumber.val();
+
+            if (mobileNumber && !App.Utils.Validation.phone(mobileNumber)) {
+                $mobileNumber.addClass('is-invalid');
+                throw new Error(lang('invalid_phone'));
+            }
+
             // Check if username exists
             if ($username.attr('already-exists') === 'true') {
                 $username.addClass('is-invalid');

assets/js/utils/validation.js

@@ -29,7 +29,21 @@ window.App.Utils.Validation = (function () {
         return re.test(value);
     }
 
+    /**
+     * Validate the provided phone.
+     *
+     * @param {String} value
+     *
+     * @return {Boolean}
+     */
+    function phone(value) {
+        const re = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im;
+
+        return re.test(value);
+    }
+
     return {
-        email
+        email,
+        phone
     };
 })();