Fix Bugs 05/04/2024

public/js/gf-giftaid-field-frontend.js

@@ -4,17 +4,25 @@ document.addEventListener('DOMContentLoaded', initGiftAid);
  * Updates the gift aid display, based on a chosen field changing.
  */
 function initGiftAid() {
-  const gravityForm = document.querySelector('.gform_wrapper');
+  const gravityForm = document.querySelector(".gform_wrapper");
   if (!(gravityForm instanceof HTMLElement)) {
     return;
   }
-  const totalSelector = totalFieldSelector(gravityForm, '.ginput_amount');
+  const totalSelector = totalFieldSelector(gravityForm, ".ginput_amount");
   if (!totalSelector) {
     return;
   }
-  window.gform.addAction('gform_input_change', function (elem) {
-      const donationValue = parseFloat(elem.value);
+  window.gform.addAction("gform_input_change", function (elem) {
+      if (!(elem instanceof HTMLInputElement) || !elem.closest(totalSelector) || !elem.value) {
+        return;
+      }
+      const regex = new RegExp('[^0-9.]', 'g');
+      const sanitizedValue = elem.value.replace(regex, '');
+      const donationValue = parseFloat(sanitizedValue);
       const giftAidValue = donationValue * 1.25;
+      if (!donationValue || !giftAidValue) {
+        return;
+      }
       const donationRounded = donationValue.toFixed(2);
       const giftAidRounded = giftAidValue.toFixed(2);
       if (!donationRounded || !giftAidRounded) {

src/GfGiftAidField.php

@@ -33,46 +33,78 @@ public static function addSelectedPriceFieldSetting(int $position, int $form_id)
         if (25 !== $position || empty($form_id)) {
             return;
         }
+        $exists = GFAPI::form_id_exists($form_id);
+        if (empty($exists)) {
+            return;
+        }
         $field_options = static::getFormFields($form_id);
         if (empty($field_options)) {
             return;
         }
+        $selected_value = static::getExistingFieldValue($form_id, 'selectedPriceField', 'gift_aid') ?? '';
+
         ?>
         <li class="selected_price_field_setting field_setting">
             <label for="selected_price_field_dropdown" class="section_label">
                 <?php esc_html_e('Price Field', 'itineris-gf-giftaid-field'); ?>
             </label>
 
             <select
-                name="donation_total"
-                id="selected_price_field_dropdown"
+                name="donation_total" id="selected_price_field_dropdown"
                 onchange="SetFieldProperty('selectedPriceField', this.value);"
             >
+                <option value="">--Please select a field--</option>
+
                 <?php foreach ($field_options as $field_id => $field_label) : ?>
                     <?php
                     if (empty($field_id) || empty($field_label)) {
                         continue;
                     }
                     ?>
 
-                    <option value="<?php echo esc_attr($field_id); ?>"><?php echo esc_html($field_label); ?></option>
+                    <option
+                        value="<?php echo esc_attr($field_id); ?>"
+                        <?php echo $selected_value === $field_id ? 'selected' : ''; ?>
+                    >
+                        <?php echo esc_html($field_label); ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
         </li>
         <?php
     }
 
+    /**
+     * Get the value of a field in a specific form by type.
+     */
+    public static function getExistingFieldValue(int $form_id, string $field_key, string $gf_field_type): mixed
+    {
+        $form = GFAPI::get_form($form_id);
+        if (empty($form) || !is_array($form)) {
+            return null;
+        }
+        $fields = GFAPI::get_fields_by_type($form, $gf_field_type);
+        if (empty($fields) || !is_array($fields)) {
+            return null;
+        }
+        $field = array_values($fields)[0] ?? null;
+        if (!($field instanceof GF_Field)) {
+            return null;
+        }
+        $chosen_field = $field[$field_key] ?? '';
+        if (empty($chosen_field)) {
+            return null;
+        }
+
+        return $chosen_field;
+    }
+
     /**
      * Get all the fields in a gravity form in the format:
      * ['field class' => 'field_label', ...]
      */
     public static function getFormFields(int $form_id): array
     {
-        $exists = GFAPI::form_id_exists($form_id);
-        if (empty($exists)) {
-            return [];
-        }
-
         $form = GFAPI::get_form($form_id);
         $fields = $form['fields'] ?? [];
         if (empty($fields) || !is_array($fields)) {