From ff44521bce20b58d52837788715d25fe815dd535 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Sat, 20 Jun 2020 12:19:26 +0100
Subject: [PATCH] Fix issues with form validation when you have 'On behalf of
organisation' block on the contribution page
---
docs/releasenotes.md | 1 +
info.xml | 4 ++--
js/civicrm_stripe.js | 22 +++++++++++++++++++++-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/docs/releasenotes.md b/docs/releasenotes.md
index 83bf43ad..8fa8e3f0 100644
--- a/docs/releasenotes.md
+++ b/docs/releasenotes.md
@@ -28,6 +28,7 @@ Where:
* Add check for recommended SweetAlert extension.
* Fix [#208](https://lab.civicrm.org/extensions/stripe/issues/182) use window.alert if SweetAlert is not installed.
* Make sure we reset submitted flag if we are not able to submit the form.
+* Fix issues with form validation when you enable the "On behalf of Organisation" block on contribution pages - see https://lab.civicrm.org/extensions/stripe/-/issues/147#note_38994 and https://github.com/civicrm/civicrm-core/pull/17672.
## Release 6.4
**This release REQUIRES that you upgrade mjwshared to 0.7 and your Stripe API version must be 2019-12-03 or newer.**
diff --git a/info.xml b/info.xml
index 375f9cd8..7fc15aa1 100644
--- a/info.xml
+++ b/info.xml
@@ -14,8 +14,8 @@
<author>Matthew Wire (MJW Consulting)</author>
<email>mjw@mjwconsult.co.uk</email>
</maintainer>
- <releaseDate>2020-06-16</releaseDate>
- <version>6.4.1-beta4</version>
+ <releaseDate>2020-06-20</releaseDate>
+ <version>6.4.1-beta5</version>
<develStage>beta</develStage>
<compatibility>
<ver>5.24</ver>
diff --git a/js/civicrm_stripe.js b/js/civicrm_stripe.js
index ec7654a6..551da276 100644
--- a/js/civicrm_stripe.js
+++ b/js/civicrm_stripe.js
@@ -768,9 +768,29 @@ CRM.$(function($) {
$('div#priceset input[type="checkbox"]').each(function() {
$(this).attr('name', $(this).attr('name').split('[').shift());
});
+
+ // @todo remove once min version is 5.28 (https://github.com/civicrm/civicrm-core/pull/17672)
+ var is_for_organization = $('#is_for_organization');
+ if (is_for_organization.length) {
+ setValidateOnBehalfOfBlock();
+ is_for_organization.on('change', function() {
+ setValidateOnBehalfOfBlock();
+ });
+ }
+ function setValidateOnBehalfOfBlock() {
+ if (is_for_organization.is(':checked')) {
+ $('#onBehalfOfOrg select.crm-select2').removeClass('crm-no-validate');
+ }
+ else {
+ $('#onBehalfOfOrg select.crm-select2').addClass('crm-no-validate');
+ }
+ }
+
var validator = $(form).validate();
validator.settings.errorClass = 'crm-inline-error alert-danger';
- validator.settings.ignore = '.select2-offscreen, [readonly], :hidden:not(.crm-select2)';
+ validator.settings.ignore = '.select2-offscreen, [readonly], :hidden:not(.crm-select2), .crm-no-validate';
+ validator.settings.ignoreTitle = true;
+
// Default email validator accepts test@example but on test@example.org is valid (https://jqueryvalidation.org/jQuery.validator.methods/)
$.validator.methods.email = function( value, element ) {
// Regex from https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
--
GitLab