From bb21bfdddaf55bbe00881b6d5798fd07772f3d4c Mon Sep 17 00:00:00 2001
From: Lalo Sanchez <eduardourias@stellarwp.com>
Date: Mon, 19 Feb 2024 22:12:36 -0600
Subject: [PATCH 1/7] Check if number field is required

---
 includes/assets/js/kb-advanced-form-block.min.js |  2 +-
 src/assets/js/kb-advanced-form-block.js          | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/includes/assets/js/kb-advanced-form-block.min.js b/includes/assets/js/kb-advanced-form-block.min.js
index c215431a7..4e867b5fa 100644
--- a/includes/assets/js/kb-advanced-form-block.min.js
+++ b/includes/assets/js/kb-advanced-form-block.min.js
@@ -1 +1 @@
-(function(){"use strict";window.kadenceAdvancedForm={error_item:1,clearForm(a){a.reset()},insertAfter(a,b){b.parentNode.insertBefore(a,b.nextSibling)},markError(a,b,c){var d="";if(c.classList.contains("kb-adv-form-has-error")||c.classList.add("kb-adv-form-has-error"),a.classList.add("has-error"),b){switch(b){case"required":const c=a.getAttribute("data-kb-required-message");if(c&&""!==c){d=c;break}d=a.getAttribute("data-required-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b]);break;case"mismatch":d=a.getAttribute("data-mismatch-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b]);break;case"validation":d=a.getAttribute("data-validation-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b])}var e=a.parentNode.querySelector(".kb-adv-form-error-msg");e&&e.remove();var f=a.getAttribute("name")+"-error";a.setAttribute("aria-describedby",f),a.setAttribute("aria-invalid","true");var g=document.createElement("div");g.id=f,g.classList.add("kb-adv-form-error-msg"),g.classList.add("kb-adv-form-message"),g.classList.add("kb-adv-form-warning"),g.setAttribute("role","alert"),g.innerHTML=window.kadenceAdvancedForm.strip_tags(d,"<div><a><b><i><u><p><ol><ul>"),a.classList.contains("kb-accept-field")?a.parentNode.parentNode.append(g):a.classList.contains("kb-checkbox-field")||a.classList.contains("kb-radio-field")?a.parentNode.append(g):window.kadenceAdvancedForm.insertAfter(g,a)}1===window.kadenceAdvancedForm.error_item&&a.focus(),window.kadenceAdvancedForm.error_item++},addErrorNotice(a){var b=a.getAttribute("data-error-message");b&&""!==b&&void 0!==b||(b=kb_adv_form_params.error_message);var c=document.createElement("div");c.classList.add("kb-adv-form-message"),c.classList.add("kb-adv-form-warning"),c.innerHTML=window.kadenceAdvancedForm.strip_tags(b,"<div><a><b><i><u><p><ol><ul>"),window.kadenceAdvancedForm.insertAfter(c,a)},isValidEmail(a){var b=new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);return b.test(a)},isValidURL(a){return /^(http:\/\/www.|https:\/\/www.|ftp:\/\/www.|www.|http:\/\/|https:\/\/){1}([0-9A-Za-z]+.)/.test(a)},isValidTel(a){return /\/^[+]?[(]?[0-9]{3}[)]?[-s.]?[0-9]{3}[-s.]?[0-9]{4,6}$\/im/.test(a)},removeErrors(a){a.classList.contains("kb-adv-form-has-error")&&a.classList.remove("kb-adv-form-has-error");var b=a.querySelectorAll(".has-error");if(b.length)for(var c=0;c<b.length;c++){b[c].classList.remove("has-error"),b[c].removeAttribute("aria-describedby"),b[c].removeAttribute("aria-invalid");var d=b[c].parentNode.querySelector(".kb-adv-form-error-msg");d&&d.remove()}var e=document.querySelectorAll(".kb-adv-form-message");if(e.length)for(var c=0;c<e.length;c++)e[c].remove();var f=a.querySelectorAll(".kb-adv-form-errors");if(f.length)for(var c=0;c<f.length;c++)f[c].remove()},serialize(a){var b={};for(var[c,d]of a)void 0===b[c]?b[c]=d:(Array.isArray(b[c])||(b[c]=[b[c]]),b[c].push(d));return b},validateForm(a){var b=!1,c="";window.kadenceAdvancedForm.removeErrors(a);var d=a.querySelectorAll("[data-required=\"yes\"]:not([disabled])");if(d.length)for(var e=0;e<d.length;e++){var f=d[e].getAttribute("data-type"),g="";switch(f){case"textarea":case"text":g=d[e].value.trim(),""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"tel":g=d[e].value.trim(),""!==g||""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"accept":!1==d[e].checked&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"select":g=d[e].value,d[e].multiple?(null===g||0===g.length)&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):(!g||"-1"===g)&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"radio":var h=d[e].querySelector("input:checked");h||(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"checkbox":var h=d[e].querySelector("input:checked");h||(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"email":var g=d[e].value.trim();""===g?""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):!window.kadenceAdvancedForm.isValidEmail(g)&&(b=!0,c="validation",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"url":var g=d[e].value.trim();""===g?""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):!window.kadenceAdvancedForm.isValidURL(g)&&(b=!0,c="validation",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"file":g=d[e].value.trim(),""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a))}}if(b)return window.kadenceAdvancedForm.addErrorNotice(a),!1;var i=new FormData(a);return i.set("_kb_form_verify",kb_adv_form_params.nonce),i},strip_tags(a,b){b=(((b||"")+"").toLowerCase().match(/<[a-z][a-z0-9]*>/g)||[]).join("");return a.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi,"").replace(/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,function(a,c){return-1<b.indexOf("<"+c.toLowerCase()+">")?a:""})},createElementFromHTML(a){var b=document.createElement("div");return b.innerHTML=window.kadenceAdvancedForm.strip_tags(a,"<div><a><b><i><u><p><ol><ul>"),b.firstChild},submit(a,b){a.preventDefault();var c=new Event("kb-adv-form-start-submit");window.document.body.dispatchEvent(c);var d=b.querySelector(".kb-adv-form-submit-button"),e=window.kadenceAdvancedForm.validateForm(b);if(e){var f=document.createElement("div");f.classList.add("kb-adv-form-loading"),f.innerHTML="<div class=\"kb-adv-form-loading-spin\"><div></div><div></div><div></div><div></div></div>",b.append(f),d.setAttribute("disabled","disabled"),d.classList.add("button-primary-disabled");fetch(kb_adv_form_params.ajaxurl,{method:"POST",body:e}).then(a=>{if(b.querySelector(".g-recaptcha")&&grecaptcha.reset(),d.removeAttribute("disabled"),d.classList.remove("button-primary-disabled"),b.querySelector(".kb-adv-form-loading").remove(),200<=a.status&&400>a.status)return a.json()}).then(a=>{var c=a;if(c.success){const a=c?.submissionResults;var d=new CustomEvent("kb-advanced-form-success",{detail:{uniqueId:b.querySelector("input[name=\"_kb_adv_form_id\"]")?b.querySelector("input[name=\"_kb_adv_form_id\"]").value:"",submissionResults:a}});window.document.body.dispatchEvent(d),window.kadenceAdvancedForm.event("submitted",b),c.redirect?window.location.replace(c.redirect):(window.kadenceAdvancedForm.insertAfter(window.kadenceAdvancedForm.createElementFromHTML(c.html),b),window.kadenceAdvancedForm.clearForm(b),c?.hide&&b.remove())}else c.data&&(window.kadenceAdvancedForm.event("failed",b),window.kadenceAdvancedForm.insertAfter(window.kadenceAdvancedForm.createElementFromHTML(c.data.html),b),c.data.required&&b.querySelector("[name=\""+c.data.required+"\"]")&&window.kadenceAdvancedForm.markError(b.querySelector("[name=\""+c.data.required+"\"]"),"required",b))}).catch(function(){console.log("Connection error")})}},event(a,b){if("yes"===b.getAttribute("data-kb-events")){let c=new FormData;c.set("action","kadence_adv_form_event"),c.set("type",a),c.set("_kb_form_verify",kb_adv_form_params.nonce),c.set("_kb_adv_form_post_id",b.querySelector("input[name=\"_kb_adv_form_post_id\"]").value);fetch(kb_adv_form_params.ajaxurl,{method:"POST",body:c}).then(a=>{if(200<=a.status&&400>a.status)return a.json()}).then(()=>{}).catch(function(){console.log("Connection error")})}},initForms(){var a=document.querySelectorAll("form.kb-advanced-form");if(a.length)for(var b=function(a){return function(){window.kadenceAdvancedForm.event("started",a)}},c=function(a){return function(b){window.kadenceAdvancedForm.submit(b,a)}},d=0;d<a.length;d++)window.kadenceAdvancedForm.event("viewed",a[d]),a[d].addEventListener("change",b(a[d]),{once:!0}),a[d].addEventListener("submit",c(a[d]))},initFloatingLabels(){var a=document.querySelectorAll(".kb-adv-form-label-style-float .kb-adv-form-text-type-input input, .kb-adv-form-label-style-float .kb-adv-form-text-type-input textarea");if(a.length)for(var b=function(a){return function(){a.parentNode.classList.add("kb-form-field-focus")}},c=function(a){return function(){a.value||a.parentNode.classList.remove("kb-form-field-focus")}},d=0;d<a.length;d++)a[d].value&&a[d].parentNode.classList.add("kb-form-field-focus"),a[d].addEventListener("focus",b(a[d])),a[d].addEventListener("blur",c(a[d]))},init:function(){return"undefined"!=typeof kb_adv_form_params&&void(window.kadenceAdvancedForm.initForms(),window.kadenceAdvancedForm.initFloatingLabels())}},"loading"===document.readyState?document.addEventListener("DOMContentLoaded",window.kadenceAdvancedForm.init):window.kadenceAdvancedForm.init()})();
\ No newline at end of file
+(function(){"use strict";window.kadenceAdvancedForm={error_item:1,clearForm(a){a.reset()},insertAfter(a,b){b.parentNode.insertBefore(a,b.nextSibling)},markError(a,b,c){var d="";if(c.classList.contains("kb-adv-form-has-error")||c.classList.add("kb-adv-form-has-error"),a.classList.add("has-error"),b){switch(b){case"required":const c=a.getAttribute("data-kb-required-message");if(c&&""!==c){d=c;break}d=a.getAttribute("data-required-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b]);break;case"mismatch":d=a.getAttribute("data-mismatch-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b]);break;case"validation":d=a.getAttribute("data-validation-message"),d&&""!==d&&void 0!==d||(d=a.getAttribute("data-label"),(!d||""===d||void 0===d)&&(d=kb_adv_form_params.item),d=d+" "+kb_adv_form_params[b])}var e=a.parentNode.querySelector(".kb-adv-form-error-msg");e&&e.remove();var f=a.getAttribute("name")+"-error";a.setAttribute("aria-describedby",f),a.setAttribute("aria-invalid","true");var g=document.createElement("div");g.id=f,g.classList.add("kb-adv-form-error-msg"),g.classList.add("kb-adv-form-message"),g.classList.add("kb-adv-form-warning"),g.setAttribute("role","alert"),g.innerHTML=window.kadenceAdvancedForm.strip_tags(d,"<div><a><b><i><u><p><ol><ul>"),a.classList.contains("kb-accept-field")?a.parentNode.parentNode.append(g):a.classList.contains("kb-checkbox-field")||a.classList.contains("kb-radio-field")?a.parentNode.append(g):window.kadenceAdvancedForm.insertAfter(g,a)}1===window.kadenceAdvancedForm.error_item&&a.focus(),window.kadenceAdvancedForm.error_item++},addErrorNotice(a){var b=a.getAttribute("data-error-message");b&&""!==b&&void 0!==b||(b=kb_adv_form_params.error_message);var c=document.createElement("div");c.classList.add("kb-adv-form-message"),c.classList.add("kb-adv-form-warning"),c.innerHTML=window.kadenceAdvancedForm.strip_tags(b,"<div><a><b><i><u><p><ol><ul>"),window.kadenceAdvancedForm.insertAfter(c,a)},isValidEmail(a){var b=new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);return b.test(a)},isValidURL(a){return /^(http:\/\/www.|https:\/\/www.|ftp:\/\/www.|www.|http:\/\/|https:\/\/){1}([0-9A-Za-z]+.)/.test(a)},isValidTel(a){return /\/^[+]?[(]?[0-9]{3}[)]?[-s.]?[0-9]{3}[-s.]?[0-9]{4,6}$\/im/.test(a)},removeErrors(a){a.classList.contains("kb-adv-form-has-error")&&a.classList.remove("kb-adv-form-has-error");var b=a.querySelectorAll(".has-error");if(b.length)for(var c=0;c<b.length;c++){b[c].classList.remove("has-error"),b[c].removeAttribute("aria-describedby"),b[c].removeAttribute("aria-invalid");var d=b[c].parentNode.querySelector(".kb-adv-form-error-msg");d&&d.remove()}var e=document.querySelectorAll(".kb-adv-form-message");if(e.length)for(var c=0;c<e.length;c++)e[c].remove();var f=a.querySelectorAll(".kb-adv-form-errors");if(f.length)for(var c=0;c<f.length;c++)f[c].remove()},serialize(a){var b={};for(var[c,d]of a)void 0===b[c]?b[c]=d:(Array.isArray(b[c])||(b[c]=[b[c]]),b[c].push(d));return b},validateForm(a){var b=!1,c="";window.kadenceAdvancedForm.removeErrors(a);var d=a.querySelectorAll("[data-required=\"yes\"]:not([disabled])");if(d.length)for(var e=0;e<d.length;e++){var f=d[e].getAttribute("data-type"),g="";switch(f){case"textarea":case"text":g=d[e].value.trim(),""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"tel":g=d[e].value.trim(),""!==g||""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"accept":!1==d[e].checked&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"select":g=d[e].value,d[e].multiple?(null===g||0===g.length)&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):(!g||"-1"===g)&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"radio":var h=d[e].querySelector("input:checked");h||(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"checkbox":var h=d[e].querySelector("input:checked");h||(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"email":var g=d[e].value.trim();""===g?""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):!window.kadenceAdvancedForm.isValidEmail(g)&&(b=!0,c="validation",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"url":var g=d[e].value.trim();""===g?""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a)):!window.kadenceAdvancedForm.isValidURL(g)&&(b=!0,c="validation",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"file":g=d[e].value.trim(),""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a));break;case"number":g=d[e].value.trim(),""===g&&(b=!0,c="required",window.kadenceAdvancedForm.markError(d[e],c,a))}}if(b)return window.kadenceAdvancedForm.addErrorNotice(a),!1;var i=new FormData(a);return i.set("_kb_form_verify",kb_adv_form_params.nonce),i},strip_tags(a,b){b=(((b||"")+"").toLowerCase().match(/<[a-z][a-z0-9]*>/g)||[]).join("");return a.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi,"").replace(/<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,function(a,c){return-1<b.indexOf("<"+c.toLowerCase()+">")?a:""})},createElementFromHTML(a){var b=document.createElement("div");return b.innerHTML=window.kadenceAdvancedForm.strip_tags(a,"<div><a><b><i><u><p><ol><ul>"),b.firstChild},submit(a,b){a.preventDefault();var c=new Event("kb-adv-form-start-submit");window.document.body.dispatchEvent(c);var d=b.querySelector(".kb-adv-form-submit-button"),e=window.kadenceAdvancedForm.validateForm(b);if(e){var f=document.createElement("div");f.classList.add("kb-adv-form-loading"),f.innerHTML="<div class=\"kb-adv-form-loading-spin\"><div></div><div></div><div></div><div></div></div>",b.append(f),d.setAttribute("disabled","disabled"),d.classList.add("button-primary-disabled");fetch(kb_adv_form_params.ajaxurl,{method:"POST",body:e}).then(a=>{if(b.querySelector(".g-recaptcha")&&grecaptcha.reset(),d.removeAttribute("disabled"),d.classList.remove("button-primary-disabled"),b.querySelector(".kb-adv-form-loading").remove(),200<=a.status&&400>a.status)return a.json()}).then(a=>{var c=a;if(c.success){const a=c?.submissionResults;var d=new CustomEvent("kb-advanced-form-success",{detail:{uniqueId:b.querySelector("input[name=\"_kb_adv_form_id\"]")?b.querySelector("input[name=\"_kb_adv_form_id\"]").value:"",submissionResults:a}});window.document.body.dispatchEvent(d),window.kadenceAdvancedForm.event("submitted",b),c.redirect?window.location.replace(c.redirect):(window.kadenceAdvancedForm.insertAfter(window.kadenceAdvancedForm.createElementFromHTML(c.html),b),window.kadenceAdvancedForm.clearForm(b),c?.hide&&b.remove())}else c.data&&(window.kadenceAdvancedForm.event("failed",b),window.kadenceAdvancedForm.insertAfter(window.kadenceAdvancedForm.createElementFromHTML(c.data.html),b),c.data.required&&b.querySelector("[name=\""+c.data.required+"\"]")&&window.kadenceAdvancedForm.markError(b.querySelector("[name=\""+c.data.required+"\"]"),"required",b))}).catch(function(){console.log("Connection error")})}},event(a,b){if("yes"===b.getAttribute("data-kb-events")){let c=new FormData;c.set("action","kadence_adv_form_event"),c.set("type",a),c.set("_kb_form_verify",kb_adv_form_params.nonce),c.set("_kb_adv_form_post_id",b.querySelector("input[name=\"_kb_adv_form_post_id\"]").value);fetch(kb_adv_form_params.ajaxurl,{method:"POST",body:c}).then(a=>{if(200<=a.status&&400>a.status)return a.json()}).then(()=>{}).catch(function(){console.log("Connection error")})}},initForms(){var a=document.querySelectorAll("form.kb-advanced-form");if(a.length)for(var b=function(a){return function(){window.kadenceAdvancedForm.event("started",a)}},c=function(a){return function(b){window.kadenceAdvancedForm.submit(b,a)}},d=0;d<a.length;d++)window.kadenceAdvancedForm.event("viewed",a[d]),a[d].addEventListener("change",b(a[d]),{once:!0}),a[d].addEventListener("submit",c(a[d]))},initFloatingLabels(){var a=document.querySelectorAll(".kb-adv-form-label-style-float .kb-adv-form-text-type-input input, .kb-adv-form-label-style-float .kb-adv-form-text-type-input textarea");if(a.length)for(var b=function(a){return function(){a.parentNode.classList.add("kb-form-field-focus")}},c=function(a){return function(){a.value||a.parentNode.classList.remove("kb-form-field-focus")}},d=0;d<a.length;d++)a[d].value&&a[d].parentNode.classList.add("kb-form-field-focus"),a[d].addEventListener("focus",b(a[d])),a[d].addEventListener("blur",c(a[d]))},init:function(){return"undefined"!=typeof kb_adv_form_params&&void(window.kadenceAdvancedForm.initForms(),window.kadenceAdvancedForm.initFloatingLabels())}},"loading"===document.readyState?document.addEventListener("DOMContentLoaded",window.kadenceAdvancedForm.init):window.kadenceAdvancedForm.init()})();
\ No newline at end of file
diff --git a/src/assets/js/kb-advanced-form-block.js b/src/assets/js/kb-advanced-form-block.js
index 2d5777ae4..1a7d56fa6 100644
--- a/src/assets/js/kb-advanced-form-block.js
+++ b/src/assets/js/kb-advanced-form-block.js
@@ -52,7 +52,7 @@
 							}
 							error_string = error_string + ' ' + kb_adv_form_params[error_type];
 						}
-						break
+						break;
 				}
 				var next = item.parentNode.querySelector( '.kb-adv-form-error-msg' );
 				if ( next ) {
@@ -300,7 +300,17 @@
 								window.kadenceAdvancedForm.markError( required[n], error_type, self );
 							}
 							break;
+						case 'number':
+							val = required[n].value.trim();
 
+							if ( val === '' ) {
+								error = true;
+								error_type = 'required';
+							
+								// mark the error in the field.
+								window.kadenceAdvancedForm.markError( required[n], error_type, self );
+							}
+							break;
 					};
 				}
 

From 39e2a3989df41c1426702e4f38d7d4a09f9acfd4 Mon Sep 17 00:00:00 2001
From: Lalo Sanchez <eduardourias@stellarwp.com>
Date: Mon, 19 Feb 2024 22:30:32 -0600
Subject: [PATCH 2/7] Process number field including zero as value

---
 includes/advanced-form/advanced-form-ajax.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/includes/advanced-form/advanced-form-ajax.php b/includes/advanced-form/advanced-form-ajax.php
index 5fa7f52c1..79d8e41b9 100644
--- a/includes/advanced-form/advanced-form-ajax.php
+++ b/includes/advanced-form/advanced-form-ajax.php
@@ -261,7 +261,13 @@ public function process_fields( $fields ) {
 			$value = $this->sanitize_field( $field['type'], isset( $_POST[ $expected_field ] ) ? $_POST[ $expected_field ] : '', empty( $field['multiSelect'] ) ? false : $field['multiSelect'] );
 
 			// Fail if this field is empty and is required.
-			if ( empty( $value ) && ! empty( $field['required'] ) && $field['required'] && $field['type'] !== 'file' ) {
+			if ( empty( $value ) && ! empty( $field['required'] ) && $field['required'] && $field['type'] !== 'file' && $field['type'] !== 'number') {
+				$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
+				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
+			}
+
+			// Fail if this field is number and value is not numeric.
+			if(!isset($value) && !is_numeric($value) && $field['type'] === 'number') {
 				$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
 			}

From 237f49907b10530fe3bc18693891fedeafcd25b0 Mon Sep 17 00:00:00 2001
From: Lalo Sanchez <eduardourias@stellarwp.com>
Date: Mon, 11 Mar 2024 06:15:37 -0600
Subject: [PATCH 3/7] Add conditionals

---
 .vscode/settings.json                         | 6 ++++++
 includes/advanced-form/advanced-form-ajax.php | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..6a90ffd41
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "files.autoSave": "onFocusChange",
+    "editor.formatOnPaste": true,
+    "editor.formatOnSave": true
+}
\ No newline at end of file
diff --git a/includes/advanced-form/advanced-form-ajax.php b/includes/advanced-form/advanced-form-ajax.php
index 79d8e41b9..b0bb57ba1 100644
--- a/includes/advanced-form/advanced-form-ajax.php
+++ b/includes/advanced-form/advanced-form-ajax.php
@@ -266,8 +266,8 @@ public function process_fields( $fields ) {
 				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
 			}
 
-			// Fail if this field is number and value is not numeric.
-			if(!isset($value) && !is_numeric($value) && $field['type'] === 'number') {
+			// Fail if this field is number and required and value is not numeric.
+			if(! empty( $field['required'] ) && $field['required'] && !is_numeric($value) && $field['type'] === 'number') {
 				$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
 			}

From 5827d6555ee6bfd10332097f788fa44d5bff6fdb Mon Sep 17 00:00:00 2001
From: Josh Oakes <josh@joshoak.es>
Date: Tue, 12 Mar 2024 10:36:38 -0500
Subject: [PATCH 4/7] Apply formatting & gitignore

---
 .gitignore                              |   2 +-
 src/assets/js/kb-advanced-form-block.js | 464 ++++++++++++------------
 2 files changed, 230 insertions(+), 236 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7eb474478..602ae5da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ dist/
 zip/
 bin/strauss.phar
 .idea
-.vscode
+.vscode/
 /vendor/
 /vendor-prefixed/
 bin/pup.phar
diff --git a/src/assets/js/kb-advanced-form-block.js b/src/assets/js/kb-advanced-form-block.js
index fb55400ac..94e7b2205 100644
--- a/src/assets/js/kb-advanced-form-block.js
+++ b/src/assets/js/kb-advanced-form-block.js
@@ -1,186 +1,183 @@
 /* global kadence_blocks_advanced_form_params */
-( function () {
+(function () {
 	'use strict';
 	window.kadenceAdvancedForm = {
 		error_item: 1,
-		clearForm( form ) {
+		clearForm(form) {
 			form.reset();
 		},
-		insertAfter( newNode, referenceNode ) {
-			referenceNode.parentNode.insertBefore( newNode, referenceNode.nextSibling );
+		insertAfter(newNode, referenceNode) {
+			referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
 		},
-		markError( item, error_type, form ) {
+		markError(item, error_type, form) {
 			let error_string = '';
-			if ( ! form.classList.contains( 'kb-adv-form-has-error' ) ) {
-				form.classList.add( 'kb-adv-form-has-error' );
+			if (!form.classList.contains('kb-adv-form-has-error')) {
+				form.classList.add('kb-adv-form-has-error');
 			}
-			item.classList.add( 'has-error' );
-			if ( error_type ) {
-				switch ( error_type ) {
+			item.classList.add('has-error');
+			if (error_type) {
+				switch (error_type) {
 					case 'required':
 						// Check for user provided required message
-						const manual_error_string = item.getAttribute( 'data-kb-required-message' );
-						if ( manual_error_string && '' !== manual_error_string ) {
+						const manual_error_string = item.getAttribute('data-kb-required-message');
+						if (manual_error_string && '' !== manual_error_string) {
 							error_string = manual_error_string;
 							break;
 						}
-						error_string = item.getAttribute( 'data-required-message' );
-						if ( ! error_string || '' === error_string || undefined === error_string ) {
-							error_string = item.getAttribute( 'data-label' );
-							if ( ! error_string || '' === error_string || undefined === error_string ) {
+						error_string = item.getAttribute('data-required-message');
+						if (!error_string || '' === error_string || undefined === error_string) {
+							error_string = item.getAttribute('data-label');
+							if (!error_string || '' === error_string || undefined === error_string) {
 								error_string = kb_adv_form_params.item;
 							}
-							error_string = error_string + ' ' + kb_adv_form_params[ error_type ];
+							error_string = error_string + ' ' + kb_adv_form_params[error_type];
 						}
 						break;
 					case 'mismatch':
-						error_string = item.getAttribute( 'data-mismatch-message' );
-						if ( ! error_string || '' === error_string || undefined === error_string ) {
-							error_string = item.getAttribute( 'data-label' );
-							if ( ! error_string || '' === error_string || undefined === error_string ) {
+						error_string = item.getAttribute('data-mismatch-message');
+						if (!error_string || '' === error_string || undefined === error_string) {
+							error_string = item.getAttribute('data-label');
+							if (!error_string || '' === error_string || undefined === error_string) {
 								error_string = kb_adv_form_params.item;
 							}
-							error_string = error_string + ' ' + kb_adv_form_params[ error_type ];
+							error_string = error_string + ' ' + kb_adv_form_params[error_type];
 						}
 						break;
 					case 'validation':
-						error_string = item.getAttribute( 'data-validation-message' );
-						if ( ! error_string || '' === error_string || undefined === error_string ) {
-							error_string = item.getAttribute( 'data-label' );
-							if ( ! error_string || '' === error_string || undefined === error_string ) {
+						error_string = item.getAttribute('data-validation-message');
+						if (!error_string || '' === error_string || undefined === error_string) {
+							error_string = item.getAttribute('data-label');
+							if (!error_string || '' === error_string || undefined === error_string) {
 								error_string = kb_adv_form_params.item;
 							}
-							error_string = error_string + ' ' + kb_adv_form_params[ error_type ];
+							error_string = error_string + ' ' + kb_adv_form_params[error_type];
 						}
 						break;
 				}
-				const next = item.parentNode.querySelector( '.kb-adv-form-error-msg' );
-				if ( next ) {
+				const next = item.parentNode.querySelector('.kb-adv-form-error-msg');
+				if (next) {
 					next.remove();
 				}
-				const error_id = item.getAttribute( 'name' ) + '-error';
-				item.setAttribute( 'aria-describedby', error_id );
-				item.setAttribute( 'aria-invalid', 'true' );
-				const el = document.createElement( 'div' );
+				const error_id = item.getAttribute('name') + '-error';
+				item.setAttribute('aria-describedby', error_id);
+				item.setAttribute('aria-invalid', 'true');
+				const el = document.createElement('div');
 				el.id = error_id;
-				el.classList.add( 'kb-adv-form-error-msg' );
-				el.classList.add( 'kb-adv-form-message' );
-				el.classList.add( 'kb-adv-form-warning' );
-				el.setAttribute( 'role', 'alert' );
-				el.innerHTML = window.kadenceAdvancedForm.strip_tags( error_string, '<div><a><b><i><u><p><ol><ul>' );
-				if ( item.classList.contains( 'kb-accept-field' ) ) {
-					item.parentNode.parentNode.append( el );
-				} else if (
-					item.classList.contains( 'kb-checkbox-field' ) ||
-					item.classList.contains( 'kb-radio-field' )
-				) {
-					item.parentNode.append( el );
+				el.classList.add('kb-adv-form-error-msg');
+				el.classList.add('kb-adv-form-message');
+				el.classList.add('kb-adv-form-warning');
+				el.setAttribute('role', 'alert');
+				el.innerHTML = window.kadenceAdvancedForm.strip_tags(error_string, '<div><a><b><i><u><p><ol><ul>');
+				if (item.classList.contains('kb-accept-field')) {
+					item.parentNode.parentNode.append(el);
+				} else if (item.classList.contains('kb-checkbox-field') || item.classList.contains('kb-radio-field')) {
+					item.parentNode.append(el);
 				} else {
-					window.kadenceAdvancedForm.insertAfter( el, item );
+					window.kadenceAdvancedForm.insertAfter(el, item);
 				}
 			}
-			if ( 1 === window.kadenceAdvancedForm.error_item ) {
+			if (1 === window.kadenceAdvancedForm.error_item) {
 				item.focus();
 			}
 			window.kadenceAdvancedForm.error_item++;
 		},
-		addErrorNotice( form ) {
-			let error_message = form.getAttribute( 'data-error-message' );
-			if ( ! error_message || '' === error_message || undefined === error_message ) {
+		addErrorNotice(form) {
+			let error_message = form.getAttribute('data-error-message');
+			if (!error_message || '' === error_message || undefined === error_message) {
 				error_message = kb_adv_form_params.error_message;
 			}
-			const el = document.createElement( 'div' );
-			el.classList.add( 'kb-adv-form-message' );
-			el.classList.add( 'kb-adv-form-warning' );
-			el.innerHTML = window.kadenceAdvancedForm.strip_tags( error_message, '<div><a><b><i><u><p><ol><ul>' );
-			window.kadenceAdvancedForm.insertAfter( el, form );
+			const el = document.createElement('div');
+			el.classList.add('kb-adv-form-message');
+			el.classList.add('kb-adv-form-warning');
+			el.innerHTML = window.kadenceAdvancedForm.strip_tags(error_message, '<div><a><b><i><u><p><ol><ul>');
+			window.kadenceAdvancedForm.insertAfter(el, form);
 		},
-		isValidEmail( email ) {
+		isValidEmail(email) {
 			const pattern = new RegExp(
 				/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i
 			);
-			return pattern.test( email );
+			return pattern.test(email);
 		},
-		isValidURL( url ) {
+		isValidURL(url) {
 			const urlregex = new RegExp(
 				'^(http://www.|https://www.|ftp://www.|www.|http://|https://){1}([0-9A-Za-z]+.)'
 			);
-			return urlregex.test( url );
+			return urlregex.test(url);
 		},
-		isValidTel( tel ) {
-			const telregex = new RegExp( '/^[+]?[(]?[0-9]{3}[)]?[-s.]?[0-9]{3}[-s.]?[0-9]{4,6}$/im' );
-			return telregex.test( tel );
+		isValidTel(tel) {
+			const telregex = new RegExp('/^[+]?[(]?[0-9]{3}[)]?[-s.]?[0-9]{3}[-s.]?[0-9]{4,6}$/im');
+			return telregex.test(tel);
 		},
-		removeErrors( item ) {
-			if ( item.classList.contains( 'kb-adv-form-has-error' ) ) {
-				item.classList.remove( 'kb-adv-form-has-error' );
+		removeErrors(item) {
+			if (item.classList.contains('kb-adv-form-has-error')) {
+				item.classList.remove('kb-adv-form-has-error');
 			}
-			const errors = item.querySelectorAll( '.has-error' );
-			if ( errors.length ) {
-				for ( var n = 0; n < errors.length; n++ ) {
-					errors[ n ].classList.remove( 'has-error' );
-					errors[ n ].removeAttribute( 'aria-describedby' );
-					errors[ n ].removeAttribute( 'aria-invalid' );
-					const next = errors[ n ].parentNode.querySelector( '.kb-adv-form-error-msg' );
-					if ( next ) {
+			const errors = item.querySelectorAll('.has-error');
+			if (errors.length) {
+				for (var n = 0; n < errors.length; n++) {
+					errors[n].classList.remove('has-error');
+					errors[n].removeAttribute('aria-describedby');
+					errors[n].removeAttribute('aria-invalid');
+					const next = errors[n].parentNode.querySelector('.kb-adv-form-error-msg');
+					if (next) {
 						next.remove();
 					}
 				}
 			}
-			const message = document.querySelectorAll( '.kb-adv-form-message' );
-			if ( message.length ) {
-				for ( var n = 0; n < message.length; n++ ) {
-					message[ n ].remove();
+			const message = document.querySelectorAll('.kb-adv-form-message');
+			if (message.length) {
+				for (var n = 0; n < message.length; n++) {
+					message[n].remove();
 				}
 			}
-			const notices = item.querySelectorAll( '.kb-adv-form-errors' );
-			if ( notices.length ) {
-				for ( var n = 0; n < notices.length; n++ ) {
-					notices[ n ].remove();
+			const notices = item.querySelectorAll('.kb-adv-form-errors');
+			if (notices.length) {
+				for (var n = 0; n < notices.length; n++) {
+					notices[n].remove();
 				}
 			}
 		},
-		serialize( data ) {
+		serialize(data) {
 			const obj = {};
-			for ( const [ key, value ] of data ) {
-				if ( obj[ key ] !== undefined ) {
-					if ( ! Array.isArray( obj[ key ] ) ) {
-						obj[ key ] = [ obj[ key ] ];
+			for (const [key, value] of data) {
+				if (obj[key] !== undefined) {
+					if (!Array.isArray(obj[key])) {
+						obj[key] = [obj[key]];
 					}
-					obj[ key ].push( value );
+					obj[key].push(value);
 				} else {
-					obj[ key ] = value;
+					obj[key] = value;
 				}
 			}
 			return obj;
 		},
-		validateForm( self ) {
+		validateForm(self) {
 			let error = false,
 				error_type = '';
 			// remove all initial errors if any.
-			window.kadenceAdvancedForm.removeErrors( self );
+			window.kadenceAdvancedForm.removeErrors(self);
 			// ===== Validate: Text and Textarea ========
-			const required = self.querySelectorAll( '[data-required="yes"]:not([disabled])' );
-			if ( required.length ) {
-				for ( let n = 0; n < required.length; n++ ) {
-					var data_type = required[ n ].getAttribute( 'data-type' ),
+			const required = self.querySelectorAll('[data-required="yes"]:not([disabled])');
+			if (required.length) {
+				for (let n = 0; n < required.length; n++) {
+					var data_type = required[n].getAttribute('data-type'),
 						val = '';
-					switch ( data_type ) {
+					switch (data_type) {
 						case 'textarea':
 						case 'text':
-							val = required[ n ].value.trim();
+							val = required[n].value.trim();
 
-							if ( val === '' ) {
+							if (val === '') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 						case 'tel':
-							val = required[ n ].value.trim();
-							if ( val !== '' ) {
+							val = required[n].value.trim();
+							if (val !== '') {
 								//run the validation
 								// if( ! window.kadenceAdvancedForm.isValidTel( val ) ) {
 								// 	error = true;
@@ -188,128 +185,128 @@
 								// 	// mark the error in the field.
 								// 	window.kadenceAdvancedForm.markError( required[n], error_type, self );
 								// }
-							} else if ( val === '' ) {
+							} else if (val === '') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 						case 'accept':
-							if ( required[ n ].checked == false ) {
+							if (required[n].checked == false) {
 								error = true;
 								error_type = 'required';
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 
 						case 'select':
-							val = required[ n ].value;
+							val = required[n].value;
 							//console.log(val );
-							if ( required[ n ].multiple ) {
-								if ( val === null || val.length === 0 ) {
+							if (required[n].multiple) {
+								if (val === null || val.length === 0) {
 									error = true;
 									error_type = 'required';
 
 									// mark the error in the field.
-									window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+									window.kadenceAdvancedForm.markError(required[n], error_type, self);
 								}
-							} else if ( ! val || val === '-1' ) {
+							} else if (!val || val === '-1') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 
 						case 'radio':
-							var length = required[ n ].querySelector( 'input:checked' );
+							var length = required[n].querySelector('input:checked');
 
-							if ( ! length ) {
+							if (!length) {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 
 						case 'checkbox':
-							var length = required[ n ].querySelector( 'input:checked' );
+							var length = required[n].querySelector('input:checked');
 
-							if ( ! length ) {
+							if (!length) {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 
 						case 'email':
-							var val = required[ n ].value.trim();
+							var val = required[n].value.trim();
 
-							if ( val !== '' ) {
+							if (val !== '') {
 								//run the validation
-								if ( ! window.kadenceAdvancedForm.isValidEmail( val ) ) {
+								if (!window.kadenceAdvancedForm.isValidEmail(val)) {
 									error = true;
 									error_type = 'validation';
 
 									// mark the error in the field.
-									window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+									window.kadenceAdvancedForm.markError(required[n], error_type, self);
 								}
-							} else if ( val === '' ) {
+							} else if (val === '') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 						case 'url':
-							var val = required[ n ].value.trim();
+							var val = required[n].value.trim();
 
-							if ( val !== '' ) {
+							if (val !== '') {
 								//run the validation
-								if ( ! window.kadenceAdvancedForm.isValidURL( val ) ) {
+								if (!window.kadenceAdvancedForm.isValidURL(val)) {
 									error = true;
 									error_type = 'validation';
 
 									// mark the error in the field.
-									window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+									window.kadenceAdvancedForm.markError(required[n], error_type, self);
 								}
-							} else if ( val === '' ) {
+							} else if (val === '') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 						case 'file':
-							val = required[ n ].value.trim();
+							val = required[n].value.trim();
 
-							if ( val === '' ) {
+							if (val === '') {
 								error = true;
 								error_type = 'required';
 
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[ n ], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 
 						case 'number':
 							val = required[n].value.trim();
 
-							if ( val === '' ) {
+							if (val === '') {
 								error = true;
 								error_type = 'required';
-							
+
 								// mark the error in the field.
-								window.kadenceAdvancedForm.markError( required[n], error_type, self );
+								window.kadenceAdvancedForm.markError(required[n], error_type, self);
 							}
 							break;
 					}
@@ -317,209 +314,206 @@
 			}
 
 			// if already some error found, bail out
-			if ( error ) {
+			if (error) {
 				// add error notice
-				window.kadenceAdvancedForm.addErrorNotice( self );
+				window.kadenceAdvancedForm.addErrorNotice(self);
 
 				return false;
 			}
 			//var form_data = self.serialize();
-			const form_data = new FormData( self );
-			form_data.set( '_kb_form_verify', kb_adv_form_params.nonce );
+			const form_data = new FormData(self);
+			form_data.set('_kb_form_verify', kb_adv_form_params.nonce);
 			//form_data = window.kadenceAdvancedForm.serialize( form_data );
 			// form_data = new URLSearchParams(form_data);
 			//form_data = form_data + '&_kb_form_verify=' + kb_adv_form_params.nonce;
 			return form_data;
 		},
-		strip_tags( input, allowed ) {
-			allowed = ( ( ( allowed || '' ) + '' ).toLowerCase().match( /<[a-z][a-z0-9]*>/g ) || [] ).join( '' ); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
+		strip_tags(input, allowed) {
+			allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
 			const tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
 				commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-			return input.replace( commentsAndPhpTags, '' ).replace( tags, function ( $0, $1 ) {
-				return allowed.indexOf( '<' + $1.toLowerCase() + '>' ) > -1 ? $0 : '';
-			} );
+			return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
+				return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
+			});
 		},
-		createElementFromHTML( htmlString ) {
-			const div = document.createElement( 'div' );
-			div.innerHTML = window.kadenceAdvancedForm.strip_tags( htmlString, '<div><a><b><i><u><p><ol><ul><li>' );
+		createElementFromHTML(htmlString) {
+			const div = document.createElement('div');
+			div.innerHTML = window.kadenceAdvancedForm.strip_tags(htmlString, '<div><a><b><i><u><p><ol><ul><li>');
 
 			// Change this to div.childNodes to support multiple top-level nodes
 			return div.firstChild;
 		},
-		submit( e, form ) {
+		submit(e, form) {
 			e.preventDefault();
-			const event = new Event( 'kb-adv-form-start-submit' );
+			const event = new Event('kb-adv-form-start-submit');
 			// Dispatch the event.
-			window.document.body.dispatchEvent( event );
-			const submitButton = form.querySelector( '.kb-adv-form-submit-button' );
-			const form_data = window.kadenceAdvancedForm.validateForm( form );
-			if ( form_data ) {
-				const el = document.createElement( 'div' );
-				el.classList.add( 'kb-adv-form-loading' );
+			window.document.body.dispatchEvent(event);
+			const submitButton = form.querySelector('.kb-adv-form-submit-button');
+			const form_data = window.kadenceAdvancedForm.validateForm(form);
+			if (form_data) {
+				const el = document.createElement('div');
+				el.classList.add('kb-adv-form-loading');
 				el.innerHTML =
 					'<div class="kb-adv-form-loading-spin"><div></div><div></div><div></div><div></div></div>';
-				form.append( el );
-				submitButton.setAttribute( 'disabled', 'disabled' );
-				submitButton.classList.add( 'button-primary-disabled' );
+				form.append(el);
+				submitButton.setAttribute('disabled', 'disabled');
+				submitButton.classList.add('button-primary-disabled');
 
 				const fetchOptions = {
 					method: 'POST',
 					body: form_data,
 				};
 
-				fetch( kb_adv_form_params.ajaxurl, fetchOptions )
-					.then( ( response ) => {
-						if ( form.querySelector( '.g-recaptcha' ) ) {
+				fetch(kb_adv_form_params.ajaxurl, fetchOptions)
+					.then((response) => {
+						if (form.querySelector('.g-recaptcha')) {
 							grecaptcha.reset();
 						}
-						submitButton.removeAttribute( 'disabled' );
-						submitButton.classList.remove( 'button-primary-disabled' );
-						form.querySelector( '.kb-adv-form-loading' ).remove();
+						submitButton.removeAttribute('disabled');
+						submitButton.classList.remove('button-primary-disabled');
+						form.querySelector('.kb-adv-form-loading').remove();
 
-						if ( response.status >= 200 && response.status < 400 ) {
+						if (response.status >= 200 && response.status < 400) {
 							return response.json();
 						}
-					} )
-					.then( ( body ) => {
+					})
+					.then((body) => {
 						const response = body;
 
-						if ( response.success ) {
+						if (response.success) {
 							const submissionResults = response?.submissionResults;
-							const event = new CustomEvent( 'kb-advanced-form-success', {
+							const event = new CustomEvent('kb-advanced-form-success', {
 								detail: {
-									uniqueId: form.querySelector( 'input[name="_kb_adv_form_id"]' )
-										? form.querySelector( 'input[name="_kb_adv_form_id"]' ).value
+									uniqueId: form.querySelector('input[name="_kb_adv_form_id"]')
+										? form.querySelector('input[name="_kb_adv_form_id"]').value
 										: '',
 									submissionResults,
 								},
-							} );
+							});
 							// Dispatch the event.
-							window.document.body.dispatchEvent( event );
-							window.kadenceAdvancedForm.event( 'submitted', form );
-							if ( response.redirect ) {
-								window.location.replace( response.redirect );
+							window.document.body.dispatchEvent(event);
+							window.kadenceAdvancedForm.event('submitted', form);
+							if (response.redirect) {
+								window.location.replace(response.redirect);
 							} else {
 								window.kadenceAdvancedForm.insertAfter(
-									window.kadenceAdvancedForm.createElementFromHTML( response.html ),
+									window.kadenceAdvancedForm.createElementFromHTML(response.html),
 									form
 								);
-								window.kadenceAdvancedForm.clearForm( form );
-								if ( response?.hide ) {
+								window.kadenceAdvancedForm.clearForm(form);
+								if (response?.hide) {
 									form.remove();
 								}
 							}
-						} else if ( response.data ) {
-							window.kadenceAdvancedForm.event( 'failed', form );
+						} else if (response.data) {
+							window.kadenceAdvancedForm.event('failed', form);
 							window.kadenceAdvancedForm.insertAfter(
-								window.kadenceAdvancedForm.createElementFromHTML( response.data.html ),
+								window.kadenceAdvancedForm.createElementFromHTML(response.data.html),
 								form
 							);
-							if ( response.data.required ) {
-								if ( form.querySelector( '[name="' + response.data.required + '"]' ) ) {
+							if (response.data.required) {
+								if (form.querySelector('[name="' + response.data.required + '"]')) {
 									window.kadenceAdvancedForm.markError(
-										form.querySelector( '[name="' + response.data.required + '"]' ),
+										form.querySelector('[name="' + response.data.required + '"]'),
 										'required',
 										form
 									);
 								}
 							}
 						}
-					} )
-					.catch( function ( error ) {
-						console.log( 'Connection error' );
-					} );
+					})
+					.catch(function (error) {
+						console.log('Connection error');
+					});
 			}
 		},
-		event( type, form ) {
-			if ( form.getAttribute( 'data-kb-events' ) === 'yes' ) {
+		event(type, form) {
+			if (form.getAttribute('data-kb-events') === 'yes') {
 				const event_data = new FormData();
-				event_data.set( 'action', 'kadence_adv_form_event' );
-				event_data.set( 'type', type );
-				event_data.set( '_kb_form_verify', kb_adv_form_params.nonce );
-				event_data.set(
-					'_kb_adv_form_post_id',
-					form.querySelector( 'input[name="_kb_adv_form_post_id"]' ).value
-				);
+				event_data.set('action', 'kadence_adv_form_event');
+				event_data.set('type', type);
+				event_data.set('_kb_form_verify', kb_adv_form_params.nonce);
+				event_data.set('_kb_adv_form_post_id', form.querySelector('input[name="_kb_adv_form_post_id"]').value);
 				const fetchOptions = {
 					method: 'POST',
 					body: event_data,
 				};
-				fetch( kb_adv_form_params.ajaxurl, fetchOptions )
-					.then( ( response ) => {
+				fetch(kb_adv_form_params.ajaxurl, fetchOptions)
+					.then((response) => {
 						//console.log( 'event_response', response );
-						if ( response.status >= 200 && response.status < 400 ) {
+						if (response.status >= 200 && response.status < 400) {
 							return response.json();
 						}
-					} )
-					.then( ( body ) => {
+					})
+					.then((body) => {
 						//console.log( 'event_body', body );
-					} )
-					.catch( function ( error ) {
-						console.log( 'Connection error' );
-					} );
+					})
+					.catch(function (error) {
+						console.log('Connection error');
+					});
 			}
 		},
 		initForms() {
-			const forms = document.querySelectorAll( 'form.kb-advanced-form' );
-			if ( ! forms.length ) {
+			const forms = document.querySelectorAll('form.kb-advanced-form');
+			if (!forms.length) {
 				return;
 			}
-			const start_function = function ( form ) {
-				return function curried_func( e ) {
-					window.kadenceAdvancedForm.event( 'started', form );
+			const start_function = function (form) {
+				return function curried_func(e) {
+					window.kadenceAdvancedForm.event('started', form);
 				};
 			};
-			const click_function = function ( form ) {
-				return function curried_func( e ) {
-					window.kadenceAdvancedForm.submit( e, form );
+			const click_function = function (form) {
+				return function curried_func(e) {
+					window.kadenceAdvancedForm.submit(e, form);
 				};
 			};
-			for ( let n = 0; n < forms.length; n++ ) {
-				window.kadenceAdvancedForm.event( 'viewed', forms[ n ] );
-				forms[ n ].addEventListener( 'change', start_function( forms[ n ] ), { once: true } );
-				forms[ n ].addEventListener( 'submit', click_function( forms[ n ] ) );
+			for (let n = 0; n < forms.length; n++) {
+				window.kadenceAdvancedForm.event('viewed', forms[n]);
+				forms[n].addEventListener('change', start_function(forms[n]), { once: true });
+				forms[n].addEventListener('submit', click_function(forms[n]));
 			}
 		},
 		initFloatingLabels() {
 			const inputs = document.querySelectorAll(
 				'.kb-adv-form-label-style-float .kb-adv-form-text-type-input input, .kb-adv-form-label-style-float .kb-adv-form-text-type-input textarea'
 			);
-			if ( ! inputs.length ) {
+			if (!inputs.length) {
 				return;
 			}
-			const focus_function = function ( input ) {
-				return function curried_func( e ) {
-					input.parentNode.classList.add( 'kb-form-field-focus' );
+			const focus_function = function (input) {
+				return function curried_func(e) {
+					input.parentNode.classList.add('kb-form-field-focus');
 				};
 			};
-			const blur_function = function ( input ) {
-				return function curried_func( e ) {
-					if ( ! input.value ) {
-						input.parentNode.classList.remove( 'kb-form-field-focus' );
+			const blur_function = function (input) {
+				return function curried_func(e) {
+					if (!input.value) {
+						input.parentNode.classList.remove('kb-form-field-focus');
 					}
 				};
 			};
-			for ( let n = 0; n < inputs.length; n++ ) {
-				if ( inputs[ n ].value ) {
-					inputs[ n ].parentNode.classList.add( 'kb-form-field-focus' );
+			for (let n = 0; n < inputs.length; n++) {
+				if (inputs[n].value) {
+					inputs[n].parentNode.classList.add('kb-form-field-focus');
 				}
-				inputs[ n ].addEventListener( 'focus', focus_function( inputs[ n ] ) );
-				inputs[ n ].addEventListener( 'blur', blur_function( inputs[ n ] ) );
+				inputs[n].addEventListener('focus', focus_function(inputs[n]));
+				inputs[n].addEventListener('blur', blur_function(inputs[n]));
 			}
 		},
 		init() {
-			if ( typeof kb_adv_form_params === 'undefined' ) {
+			if (typeof kb_adv_form_params === 'undefined') {
 				return false;
 			}
 			window.kadenceAdvancedForm.initForms();
 			window.kadenceAdvancedForm.initFloatingLabels();
 		},
 	};
-	if ( 'loading' === document.readyState ) {
+	if ('loading' === document.readyState) {
 		// The DOM has not yet been loaded.
-		document.addEventListener( 'DOMContentLoaded', window.kadenceAdvancedForm.init );
+		document.addEventListener('DOMContentLoaded', window.kadenceAdvancedForm.init);
 	} else {
 		// The DOM has already been loaded.
 		window.kadenceAdvancedForm.init();
 	}
-} )();
+})();

From db8a0c0d9b167205f53bbb239459b2b528f16885 Mon Sep 17 00:00:00 2001
From: Josh Oakes <josh@joshoak.es>
Date: Tue, 12 Mar 2024 10:37:42 -0500
Subject: [PATCH 5/7] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 602ae5da5..7fb418b98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ dist/
 zip/
 bin/strauss.phar
 .idea
-.vscode/
+/.vscode/
 /vendor/
 /vendor-prefixed/
 bin/pup.phar

From d770d36f8eb30657e45a12d4f4140c48d6a39bdc Mon Sep 17 00:00:00 2001
From: Josh Oakes <josh@joshoak.es>
Date: Tue, 12 Mar 2024 10:39:02 -0500
Subject: [PATCH 6/7] Delete settings.json

---
 .vscode/settings.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 6a90ffd41..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "files.autoSave": "onFocusChange",
-    "editor.formatOnPaste": true,
-    "editor.formatOnSave": true
-}
\ No newline at end of file

From e6d7e657b0ac12ee61599c8ee5cb25789197de3a Mon Sep 17 00:00:00 2001
From: Josh Oakes <josh@joshoak.es>
Date: Tue, 12 Mar 2024 13:23:42 -0500
Subject: [PATCH 7/7] Create unit tests for advanced form ajax submissions

KAD-2342
---
 includes/advanced-form/advanced-form-ajax.php |   8 +
 .../advanced-form/AdvancedFormAjaxTest.php    | 149 ++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 tests/wpunit/advanced-form/AdvancedFormAjaxTest.php

diff --git a/includes/advanced-form/advanced-form-ajax.php b/includes/advanced-form/advanced-form-ajax.php
index b0bb57ba1..7baf89c83 100644
--- a/includes/advanced-form/advanced-form-ajax.php
+++ b/includes/advanced-form/advanced-form-ajax.php
@@ -252,6 +252,7 @@ public function process_fields( $fields ) {
 					} else {
 						$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 						$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
+						break;
 					}
 				} else {
 					continue;
@@ -264,12 +265,14 @@ public function process_fields( $fields ) {
 			if ( empty( $value ) && ! empty( $field['required'] ) && $field['required'] && $field['type'] !== 'file' && $field['type'] !== 'number') {
 				$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
+				break;
 			}
 
 			// Fail if this field is number and required and value is not numeric.
 			if(! empty( $field['required'] ) && $field['required'] && !is_numeric($value) && $field['type'] === 'number') {
 				$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 				$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
+				break;
 			}
 
 			// If field is file, verify and process the file.
@@ -286,6 +289,7 @@ public function process_fields( $fields ) {
 						$max_count  = ! empty( $field['multipleLimit'] ) ? absint( $field['multipleLimit'] ) : 5;
 						if ( isset( $field['multiple'] ) && $field['multiple'] && $file_count > $max_count ) {
 							$this->process_bail( __( 'Submission Failed. Trying to include too many files.', 'kadence-blocks' ), __( 'Too many files', 'kadence-blocks' ) );
+							break;
 						}
 						foreach ( $post_file as $file ) {
 							$file_name_array[] = $file['name'];
@@ -293,6 +297,7 @@ public function process_fields( $fields ) {
 								$required_message = ! empty( $field['required_message'] ) ? $field['required_message'] : __( 'Missing a required field', 'kadence-blocks' );
 
 								$this->process_bail( __( 'Submission Failed', 'kadence-blocks' ), $required_message );
+								break;
 							} else if ( empty( $file['size'] ) ) {
 								continue;
 							}
@@ -303,10 +308,12 @@ public function process_fields( $fields ) {
 							// Is file too big.
 							if ( $file['size'] > $max_upload_size_bytes ) {
 								$this->process_bail( __( 'Submission Failed. File too large', 'kadence-blocks' ), __( 'File too large', 'kadence-blocks' ) );
+								break;
 							}
 
 							if ( ! is_uploaded_file( $file['tmp_name'] ) ) {
 								$this->process_bail( __( 'Submission Failed. File could not be uploaded', 'kadence-blocks' ), __( 'File was not uploaded', 'kadence-blocks' ) );
+								break;
 							}
 
 							$allowed_file_categories = empty( $field['allowedTypes'] ) ? array( 'images' ) : $field['allowedTypes'];
@@ -322,6 +329,7 @@ public function process_fields( $fields ) {
 								$space = get_upload_space_available();
 								if ( $space < $file_size || upload_is_user_over_quota( false ) ) {
 									$this->process_bail( __( 'Submission Failed. Not enough disk quota on this website.', 'kadence-blocks' ), __( 'Not enough disk quota on this website.', 'kadence-blocks' ) );
+									break;
 								}
 							}
 							if ( ! function_exists( 'wp_handle_upload' ) ) {
diff --git a/tests/wpunit/advanced-form/AdvancedFormAjaxTest.php b/tests/wpunit/advanced-form/AdvancedFormAjaxTest.php
new file mode 100644
index 000000000..cba0ba86f
--- /dev/null
+++ b/tests/wpunit/advanced-form/AdvancedFormAjaxTest.php
@@ -0,0 +1,149 @@
+<?php
+
+class AdvancedFormAjaxTest extends \Codeception\Test\Unit {
+	/**
+	 * @var \WpunitTester
+	 */
+	protected $tester;
+
+	/**
+	 * @var \KB_Ajax_Advanced_Form
+	 */
+	protected $adv_form_ajax;
+
+	protected function _before() {
+		$this->adv_form_ajax = new KB_Ajax_Advanced_Form();
+	}
+
+	protected function _after() {
+	}
+
+	public function testActionWasAdded() {
+		$this->assertIsInt( has_action( 'wp_ajax_kb_process_advanced_form_submit', array( $this->adv_form_ajax, 'process_ajax' ) ) );
+		$this->assertIsInt( has_action( 'wp_ajax_nopriv_kb_process_advanced_form_submit', array( $this->adv_form_ajax, 'process_ajax' ) ) );
+	}
+
+
+	public function testProcessMissingRequiredField() {
+		$mockedForm = $this->getMockBuilder( KB_Ajax_Advanced_Form::class )
+		                   ->onlyMethods( [ 'process_bail' ] )
+		                   ->getMock();
+
+		$fields = [
+			[
+				'inputName' => 'field1',
+				'uniqueID'  => 1,
+				'required'  => true,
+			]
+		];
+		$_POST  = array(); // $_POST doesn't contain required field
+
+		$mockedForm->expects( $this->once() )
+		           ->method( 'process_bail' )->with(
+				$this->equalTo( 'Submission Failed' ),
+				$this->equalTo( 'Missing a required field' )
+			);
+
+		$mockedForm->process_fields( $fields );
+	}
+
+	public function testProcessMissingRequiredFieldWithCustomRequireMessage() {
+		$mockedForm = $this->getMockBuilder( KB_Ajax_Advanced_Form::class )
+		                   ->onlyMethods( [ 'process_bail' ] )
+		                   ->getMock();
+
+		$fields = [
+			[
+				'inputName'        => 'field1',
+				'uniqueID'         => 1,
+				'required'         => true,
+				'required_message' => 'My custom require message'
+			]
+		];
+		$_POST  = array(); // $_POST doesn't contain required field
+
+		$mockedForm->expects( $this->once() )
+		           ->method( 'process_bail' )->with(
+				$this->equalTo( 'Submission Failed' ),
+				$this->equalTo( 'My custom require message' )
+			);
+
+		$mockedForm->process_fields( $fields );
+	}
+
+	public function testAllowMissingRequiredFieldIfConditional() {
+		$mockedForm = $this->getMockBuilder( KB_Ajax_Advanced_Form::class )
+		                   ->onlyMethods( [ 'process_bail' ] )
+		                   ->getMock();
+
+		$fields = [
+			[
+				'inputName'               => 'field1',
+				'uniqueID'                => 1,
+				'required'                => true,
+				'kadenceFieldConditional' => array(
+					'conditionalData' => array(
+						'enable' => true,
+					)
+				)
+			]
+		];
+		$_POST  = array(); // $_POST doesn't contain required field
+
+		$mockedForm->expects( $this->never() )->method( 'process_bail' );
+
+		$mockedForm->process_fields( $fields );
+	}
+
+	public function testFailIfRequiredAndSanitizedValueIsEmpty() {
+		$mockedForm = $this->getMockBuilder( KB_Ajax_Advanced_Form::class )
+		                   ->onlyMethods( [ 'process_bail' ] )
+		                   ->getMock();
+
+		$fields = [
+			[
+				'inputName'               => 'field1',
+				'uniqueID'                => 1,
+				'type'					=> 'text',
+				'required'                => true,
+			]
+		];
+		$_POST  = array(
+			'field1' => '<h1></h1>' // Sanitized value will be ''
+		);
+
+		$mockedForm->expects( $this->once() )
+		           ->method( 'process_bail' )->with(
+				$this->equalTo( 'Submission Failed' ),
+				$this->equalTo( 'Missing a required field' )
+			);
+
+		$mockedForm->process_fields( $fields );
+	}
+
+	public function testFailIfRequireNumberIsNotNumeric() {
+		$mockedForm = $this->getMockBuilder( KB_Ajax_Advanced_Form::class )
+		                   ->onlyMethods( [ 'process_bail' ] )
+		                   ->getMock();
+
+		$fields = [
+			[
+				'inputName'               => 'field1',
+				'uniqueID'                => 1,
+				'type'					=> 'number',
+				'required'                => true,
+			]
+		];
+		$_POST  = array(
+			'field1' => 'test'
+		);
+
+		$mockedForm->expects( $this->once() )
+		           ->method( 'process_bail' )->with(
+				$this->equalTo( 'Submission Failed' ),
+				$this->equalTo( 'Missing a required field' )
+			);
+
+		$mockedForm->process_fields( $fields );
+	}
+}