Skip to content

Commit 8a9d8ac

Browse files
Merge pull request #128 from eileenmcnaughton/validate
Add basic validation
2 parents d5abce6 + fd82f74 commit 8a9d8ac

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

Metadata/js/omnipay_PaypalRest.js

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,27 @@
55

66
function renderPaypal() {
77
paypal.Buttons({
8+
9+
10+
onInit: function(data, actions) {
11+
// Set up the buttons.
12+
if (form.valid()) {
13+
actions.enable()
14+
}
15+
else {
16+
actions.disable();
17+
}
18+
19+
form.on('blur keyup change', 'input', function (event) {
20+
if (form.valid()) {
21+
actions.enable()
22+
}
23+
else {
24+
actions.disable();
25+
}
26+
});
27+
},
28+
829
createBillingAgreement: function (data, actions) {
930

1031
var frequencyInterval = $('#frequency_interval').val() || 1;
@@ -65,7 +86,7 @@
6586
}
6687

6788
var paypalScriptURL = 'https://www.paypal.com/sdk/js?client-id=' + CRM.vars.omnipay.client_id + '&currency=' + CRM.vars.omnipay.currency + '&commit=false&vault=true';
68-
CRM.loadScript(paypalScriptURL, false)
69-
.done(renderPaypal);
89+
CRM.loadScript(paypalScriptURL, false).done(renderPaypal);
90+
7091

7192
})(CRM.$);

info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<url desc="Licensing">http://civicrm.org/licensing</url>
1616
</urls>
1717
<releaseDate>2019-07-07</releaseDate>
18-
<version>3.6</version>
18+
<version>3.7</version>
1919
<develStage>stable</develStage>
2020
<compatibility>
21-
<ver>5.13</ver>
21+
<ver>5.17</ver>
2222
</compatibility>
2323
<comments>This module integrates the omnipay library with CiviCRM. This release is for Omnipay 3.x and requires php 7.1. All new development will be here but 2.x series will continue to work.</comments>
2424
<civix>

omnipaymultiprocessor.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ function omnipaymultiprocessor_civicrm_alterSettingsFolders(&$metaDataFolders) {
101101

102102
function omnipaymultiprocessor_civicrm_preProcess($formName, &$form) {
103103
if ($formName === 'CRM_Contribute_Form_Contribution_Main') {
104+
$form->assign('isJsValidate', TRUE);
105+
CRM_Core_Resources::singleton()->addVars('form', ['suppressAlerts' => 1]);
104106
if (!empty($form->_values['is_recur'])) {
105107
$recurOptions = [
106108
'is_recur_interval' => $form->_values['is_recur_interval'],

0 commit comments

Comments
 (0)