CIVIEWAY-183 When adding a new Credit Card Contribution, a Red block …

…appears before the "Please be sure to click RETURN TO MERCHANT after adding a credit card."
agileware · Mar 18, 2021 · f4e1f28 · f4e1f28
1 parent 4f5b589
commit f4e1f28
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/au_com_agileware_ewayrecurring.class.php b/au_com_agileware_ewayrecurring.class.php
@@ -116,10 +116,10 @@ function getPaymentFormFieldsMetadata() {
           'class' => 'eway_credit_card_field',
         ],
         'description' =>
-          '<div><span class="description">' . E::ts(
+          '<span class="description">' . E::ts(
             'Credit card details are entered directly into eWAY and not stored in CiviCRM. %1',
             [1 => '<a href="https://www.eway.com.au/about-eway/technology-security/pci-dss/" target="_blank">' . E::ts('Learn more on eWAY\'s PCI DSS page') . '</a>']
-          ) . '</span></div><script>CRM.$(function ($) {CRM.eway.paymentTokenInitialize();});</script>',
+          ) . '</span><script>CRM.$(function ($) {CRM.eway.paymentTokenInitialize();});</script>',
       ],
       'add_credit_card' => [
         'htmlType' => 'button',
@@ -131,7 +131,7 @@ function getPaymentFormFieldsMetadata() {
           'class' => 'eway_credit_card_field',
         ],
         'description' => ts(
-          '<div><span id="add_credit_card_notification" class="crm-error"></span></div><span class="description">' . E::ts('Please be sure to click <b>RETURN TO MERCHANT</b> after adding a credit card.') . '</span>'
+          '<span class="description">' . E::ts('Please be sure to click <b>RETURN TO MERCHANT</b> after adding a credit card.') . '</span><div><span id="add_credit_card_notification"></span></div></div>'
         )
       ]
     ];

diff --git a/info.xml b/info.xml
@@ -16,8 +16,8 @@
         <email>[email protected]</email>
     </maintainer>
     <develStage>stable</develStage>
-    <releaseDate>2020-12-14</releaseDate>
-    <version>2.3.5</version>
+    <releaseDate>2021-03-18</releaseDate>
+    <version>2.3.6</version>
     <compatibility>
         <ver>5.0</ver>
     </compatibility>

diff --git a/js/eway.js b/js/eway.js
@@ -63,9 +63,11 @@ CRM.eway.updateOptions = function (result) {
 CRM.eway.toggleCreditCardFields = function () {
     CRM.$('select.eway_credit_card_field').prop('disabled', function (i, v) {
         if (CRM.eway.contact_id === 0) {
+            CRM.$('#add_credit_card_notification').addClass('crm-error');
             CRM.$('#add_credit_card_notification').text('No contact selected');
             return true;
         }
+        CRM.$('#add_credit_card_notification').removeClass('crm-error');
         CRM.$('#add_credit_card_notification').text('');
         return false;
     });
@@ -84,13 +86,14 @@ CRM.eway.toggleCreditCardFields = function () {
             for (const required of requiredFields) {
                 if (field.name.includes(required)) {
                     if (field.value.length === 0) {
+                        CRM.$('#add_credit_card_notification').addClass('crm-error');
                         CRM.$('#add_credit_card_notification').text('The Billing Details section must be completed before a Credit Card can be added');
                         return true;
                     }
                 }
             }
         }
-
+        CRM.$('#add_credit_card_notification').removeClass('crm-error');
         CRM.$('#add_credit_card_notification').text('');
         return false;
     });