Changeset 3211366

Timestamp:

12/21/2024 04:43:52 AM (12 months ago)

Author:

anthonyeden

Message:

Version 2.5.0

Location:

profiler-donations-gravityforms

Files:

• tags/2.5.0 (copied) (copied from profiler-donations-gravityforms/trunk)
• tags/2.5.0/LICENSE.md (copied) (copied from profiler-donations-gravityforms/trunk/LICENSE.md)
• tags/2.5.0/README.md (copied) (copied from profiler-donations-gravityforms/trunk/README.md) (1 diff)
• tags/2.5.0/cacert.pem (copied) (copied from profiler-donations-gravityforms/trunk/cacert.pem)
• tags/2.5.0/cardprocess.js (copied) (copied from profiler-donations-gravityforms/trunk/cardprocess.js)
• tags/2.5.0/cardprocess.php (copied) (copied from profiler-donations-gravityforms/trunk/cardprocess.php)
• tags/2.5.0/class-profilercommon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilercommon.php) (21 diffs)
• tags/2.5.0/class-profilerdonate-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerdonate-gfaddon.php) (27 diffs)
• tags/2.5.0/class-profilerevents-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerevents-gfaddon.php)
• tags/2.5.0/class-profilerinteraction-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerinteraction-gfaddon.php)
• tags/2.5.0/class-profilerlists-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerlists-gfaddon.php)
• tags/2.5.0/class-profilerlistsbasic-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerlistsbasic-gfaddon.php)
• tags/2.5.0/class-profilermembership-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilermembership-gfaddon.php) (2 diffs)
• tags/2.5.0/class-profilerpostdonate-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerpostdonate-gfaddon.php) (6 diffs)
• tags/2.5.0/class-profilerupdate-gfaddon.php (copied) (copied from profiler-donations-gravityforms/trunk/class-profilerupdate-gfaddon.php)
• tags/2.5.0/index.php (copied) (copied from profiler-donations-gravityforms/trunk/index.php) (2 diffs)
• tags/2.5.0/readme.txt (copied) (copied from profiler-donations-gravityforms/trunk/readme.txt) (1 diff)
• tags/2.5.0/shortcodes.php (copied) (copied from profiler-donations-gravityforms/trunk/shortcodes.php)
• tags/2.5.0/states_australia.php (copied) (copied from profiler-donations-gravityforms/trunk/states_australia.php)
• tags/2.5.0/sync_orgtype.php (copied) (copied from profiler-donations-gravityforms/trunk/sync_orgtype.php)
• tags/2.5.0/sync_users.php (copied) (copied from profiler-donations-gravityforms/trunk/sync_users.php) (1 diff)
• tags/2.5.0/woocommerce (copied) (copied from profiler-donations-gravityforms/trunk/woocommerce)
• tags/2.5.0/woocommerce/integration.php (copied) (copied from profiler-donations-gravityforms/trunk/woocommerce/integration.php) (8 diffs)
• trunk/README.md (modified) (1 diff)
• trunk/class-profilercommon.php (modified) (21 diffs)
• trunk/class-profilerdonate-gfaddon.php (modified) (27 diffs)
• trunk/class-profilermembership-gfaddon.php (modified) (2 diffs)
• trunk/class-profilerpostdonate-gfaddon.php (modified) (6 diffs)
• trunk/index.php (modified) (2 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/sync_users.php (modified) (1 diff)
• trunk/woocommerce/integration.php (modified) (8 diffs)

profiler-donations-gravityforms/tags/2.5.0/README.md

@@ -15 +15 @@
 *   [Gravity Forms](http://www.gravityforms.com)
 *   Payment Gateway integration with Gravity Forms (must be pre-existing and use standard Gravity Forms payment hooks and database fields)
-  * For Australian non-profits, we recommend the official Gravity Forms Stripe plugin
+  * We recommend the official Gravity Forms Stripe plugin
 *   Full administrative access to Profiler
 *   CURL and XML Enabled on Web Server

profiler-donations-gravityforms/tags/2.5.0/class-profilercommon.php

@@ -7 +7 @@
     protected $_title = "Profiler / Gravity Forms - Integration Feed";
 
+    protected $api_type = "form"; // form or json
+    protected $api_domain = "profilersystem.com";
     protected $apifield_apikey = "apikey";
     protected $apifield_apipass = "apipass";
@@ -27 +29 @@
         add_filter('gform_stripe_charge_description',       array($this, 'stripe_payment_description'), 10, 5);
         add_filter('gform_stripe_payment_element_initial_payment_information', array($this, 'stripe_elements_setup'), 10, 3);
-    }
+
+        // Metabox for Profiler Logs
+        add_filter('gform_entry_detail_meta_boxes',         array($this, 'meta_box_entry'), 10, 3);
+    }
+
+    public function get_menu_icon() {
+        //return 'dashicons-admin-generic';
+        return plugins_url('icon-profiler.png', __FILE__);
+    }
 
     public function feed_settings_fields() {
@@ -65 +75 @@
             "name" => "profiler".$this->gffield_legacyname."_instancedomainname",
             "required" => true,
-            "tooltip" => "Your Instance Domain Name can be found in your login URL: e.g. 'https://instance.profiler.net.au/' is 'instance.profiler.net.au'",
-        );
-        
-        $fields[] = array(
-            "label" => 'Profiler Database Name',
-            "type" => "text",
-            "name" => "profiler".$this->gffield_legacyname."_dbname",
-            "required" => true,
-        );
+            "tooltip" => "Your Instance Domain Name can be found in your login URL: e.g. 'https://instance.profilersystem.com/' is 'instance.profilesystem.com'",
+        );
+        
+        if($this->api_type !== 'json') {
+            $fields[] = array(
+                "label" => 'Profiler Database Name',
+                "type" => "text",
+                "name" => "profiler".$this->gffield_legacyname."_dbname",
+                "required" => true,
+            );
+        }
         
         $fields[] = array(
@@ -138 +150 @@
                     // Loop over mailing list fields
     
+                    if($this->api_type !== 'json') {
+                        $fields[] = array(
+                            "label" => 'Mailing List #'.$i.': UDF',
+                            "type" => "select",
+                            "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf",
+                            "required" => false,
+                            "tooltip" => "Pick the Profiler User Defined Field you wish to use for this mailing",
+                            "choices" => $userdefinedfields,
+                        );
+                    }
+
                     $fields[] = array(
-                        "label" => 'Mailing List #'.$i.': UDF',
-                        "type" => "select",
-                        "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf",
-                        "required" => false,
-                        "tooltip" => "Pick the Profiler User Defined Field you wish to use for this mailing",
-                        "choices" => $userdefinedfields,
-                    );
-    
-                    $fields[] = array(
-                        "label" => 'Mailing List #'.$i.': UDF Text',
+                        "label" => ($this->api_type == 'json' ? 'Mailing List #'.$i.': Mailing Type Code' : 'Mailing List #'.$i.': UDF Text'),
                         "type" => "text",
                         "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udftext",
                         "required" => false,
-                        "tooltip" => "Enter the string Profiler is expecting in this UDF",
+                        "tooltip" => ($this->api_type == 'json' ? "Enter the Profiler Mailing Type Code" : "Enter the string Profiler is expecting in this UDF") . ". This field also accept post meta merge fields in this format: {postmeta:meta_field_name}",
                     );
-    
+
                     $fields[] = array(
                         "label" => 'Mailing List #'.$i.': Field',
@@ -161 +175 @@
                         "tooltip" => 'Link it to a checkbox field - when checked, the mailing will be sent',
                         "required" => false,
-                        "choices" => $checkboxFields
+                        "choices" => array_merge($checkboxRadioFields, array(array("value" => "always", "label" => "Always Subscribe"))),
                     );
                 }
@@ -203 +217 @@
 
         $fields[] = array(
-            "label" => 'Profiler Logs',
-            "type" => "select",
-            "name" => "profiler".$this->gffield_legacyname."_logs",
-            "tooltip" => 'Link it to a Hidden field that will hold Profiler Response Logs',
-            "required" => false,
-            "choices" => $hiddenFields
-        );
-        
-        $fields[] = array(
             "label" => 'SSL Mode',
             "type" => "select",
@@ -259 +264 @@
         $postData = array();
 
-        $postData['DB'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_dbname'];
+        if($this->api_type !== 'json') {
+            $postData['DB'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_dbname'];
+        }
         $postData[$this->apifield_apikey] = $feed['meta']['profiler'.$this->gffield_legacyname.'_apikey'];
         $postData[$this->apifield_apipass] = $feed['meta']['profiler'.$this->gffield_legacyname.'_apipass'];
@@ -265 +272 @@
         if(empty($feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname']) && !empty($feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'])) {
             // Respect the setting from when we only accepted the first part of the domain name
-            $feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'] . ".profiler.net.au";
+            $feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'] . ".profilersystem.com";
         }
 
@@ -282 +289 @@
             if(isset($field['pf_apifield']) && $this->get_field_value($form, $entry, $feed['meta'][$field['name']]) != '') {
                 $postData[$field['pf_apifield']] = trim($this->get_field_value($form, $entry, $feed['meta'][$field['name']]));
+
+                // Auto formatting for phone fields
+                if(isset($field['auto_format']) && $field['auto_format'] == "phone") {
+                    $postData[$field['pf_apifield']] = $this->auto_format_phone($postData[$field['pf_apifield']]);
+                }
             }
         }
@@ -301 +313 @@
         if($this->apifield_formurl === true && !empty($feed['meta']['profiler'.$this->gffield_legacyname.'_userdefined_formurl'])) {
             $postData['userdefined' . $feed['meta']['profiler'.$this->gffield_legacyname.'_userdefined_formurl']] = $entry['source_url'];
+        } else if($this->apifield_formurl !== false) {
+            $postData[$this->apifield_formurl] = $entry['source_url'];
         }
 
@@ -322 +336 @@
             }
 
-            if($feed['meta']['profilerdonation_userdefined_gatewaycustomerid'] !== "" && isset($payment_intent)) {
+            if(isset($payment_intent)) {
                 // Gateway Customer ID
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycustomerid']] = $payment_intent->customer;
-            }
-
-            if($feed['meta']['profilerdonation_userdefined_gatewaycardtoken'] !== "" && isset($payment_intent)) {
+                $postData['paymentGatewayCustomerId'] = $payment_intent->customer;
+            }
+
+            if(isset($payment_intent)) {
                 // Gateway Card Token
                 try {
-                    $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycardtoken']] = $payment_intent->charges->data[0]->payment_method;
+                    $postData['gatewayCardToken'] = $payment_intent->charges->data[0]->payment_method;
                 } catch(Exception $e) {
                     error_log("STRIPE/PROFILER CARD TOKEN ERROR: " . print_r($e, true));
@@ -338 +352 @@
 
         // PayFURL-supplied Gateway Token
-        if($feed['meta']['profilerdonation_userdefined_gatewaycardtoken'] !== "" && isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'])) {
+        if(isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'])) {
             $payfurl_provider_token = $_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'];
-            
+
             if(!empty($payfurl_provider_token)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycardtoken']] = $payfurl_provider_token;
+                $postData['gatewayCardToken'] = $payfurl_provider_token;
             }
         }
@@ -349 +363 @@
         if($this->supports_custom_fields === true && !empty($feed['meta']['profiler_customfields_count'])) {
             for($i = 1; $i <= $feed['meta']['profiler_customfields_count']; $i++) {
-                $postData["userdefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+
+                $value = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+
+                if($this->api_type == 'json') {
+                    if(!isset($postData['userDefinedFields'])) {
+                        $postData['userDefinedFields'] = array();
+                    }
+
+                    $postData['userDefinedFields']["userDefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = $value;
+
+                } else {
+                    $postData["userdefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = $value;
+                }
+
+                
             }
         }
@@ -358 +386 @@
                 // Loop over mailing list fields
                 $mailingFieldValue = $this->get_field_value($form, $entry, $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"]);
-                $udf = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf"];
                 $udfText = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udftext"];
 
-                if(!empty($udf) && !empty($udfText) && !empty($mailingFieldValue)) {
-                    $postData['userdefined' . $udf] = $udfText;
-                }
-
+                // Allow merging post meta fields into $udfText
+                if(isset($entry['post_id']) && !empty($entry['post_id'])) {
+                    $post_id = $entry['post_id'];
+                } else {
+                    global $post;
+                    if(isset($post)) {
+                        $post_id = $post->ID;
+                    }
+                }
+
+                if(isset($post_id)) {
+                    preg_match_all("/{postmeta:(.*?)}/", $udfText, $matches);
+
+                    if(is_array($matches) && isset($matches[1])) {
+                        foreach($matches[1] as $match) {
+                            $post_meta = get_post_meta($post_id, $match, true);
+                            $udfText = str_replace("{postmeta:".$match."}", $post_meta, $udfText);
+                        }
+                    }
+                }
+
+                if($this->api_type == 'json') {
+
+                    if(!isset($postData['mailingList'])) {
+                        $postData['mailingList'] = '';
+                    }
+
+                    if(!empty($udfText) && (!empty($mailingFieldValue) || $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"] == 'always')) {
+                        $postData['mailingList'] .= (!empty($postData['mailingList']) ? ',' : '') . $udfText;
+                    }
+
+                } else {
+                    $udf = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf"];
+
+                    if(!empty($udf) && !empty($udfText) && (!empty($mailingFieldValue) || $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"] == 'always')) {
+                        $postData['userdefined' . $udf] = $udfText;
+                    }
+                }
             }
         }
@@ -386 +447 @@
         $postData = apply_filters('profiler_integration_api_request_data', $postData, $form, $entry, $this->apifield_endpoint);
 
+        // Update URL for newer APIs
+        if($this->api_domain !== 'profilersystem.com') {
+            $API_URL = str_replace(".profilersystem.com", "." . $this->api_domain, $API_URL);
+        }
+
         // Send data to Profiler
         $pfResponse = $this->sendDataToProfiler($API_URL, $postData, $feed['meta']['profiler'.$this->gffield_legacyname.'_sslmode']);
@@ -391 +457 @@
         if($fromValidatorProcessPFGateway === false) {
             // Save Profiler response data back to the form entry
-            $logsToStore = json_encode($pfResponse);
+            $logsToStore = json_encode($pfResponse, JSON_PRETTY_PRINT);
             $logsToStore = str_replace($postData['cardnumber'], "--REDACTED--", $logsToStore);
             $logsToStore = str_replace($postData[$this->apifield_apikey], "--REDACTED--", $logsToStore);
             $logsToStore = str_replace($postData[$this->apifield_apipass], "--REDACTED--", $logsToStore);
-            $entry[$feed['meta']['profiler'.$this->gffield_legacyname.'_logs']] = htmlentities($logsToStore);
-            GFAPI::update_entry($entry);
+            gform_add_meta($entry["id"], "profiler_logs", $logsToStore, $form['id']);
 
             if(method_exists($this, 'process_feed_success')) {
                 $this->process_feed_success($feed, $entry, $form, $pfResponse, $postData);
-            }   
+            }
+
         } else {
             return $pfResponse;
@@ -651 +717 @@
         }
 
+        if(isset($profiler_query['DB'])) {
+            $url .= '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit'));
+        }
+
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url . '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit')));
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        
+
         if($ssl_mode == "bundled_ca") {
             // Use the CA Cert bundled with this plugin
@@ -669 +737 @@
         }
 
+        if($this->api_type === 'json') {
+            // JSON POST
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($profiler_query));
+            curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+
+        } else {
+            // FORM POST
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
+        }
+
         $result = curl_exec($ch);
         $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        
+
         if(curl_error($ch)) {
             $cURL_error = curl_error($ch);
@@ -677 +756 @@
             $cURL_error = null;
         }
-        
+
         curl_close($ch);
-        
+
+        if($this->api_type === 'json') {
+            $data_decoded = json_decode($result, true);
+        } else {
+            $data_decoded = json_decode(json_encode((array)simplexml_load_string($result)), true);
+        }
+
         return array(
             "httpstatus" => $status_code,
+            "url" => $url,
             "dataSent" => $profiler_query,
             "data" => $result,
-            "dataXML" => simplexml_load_string($result),
-            "dataArray" => json_decode(json_encode((array)simplexml_load_string($result)), 1),
+            "dataArray" => $data_decoded,
             "cURLError" => $cURL_error,
             "cURL_SSL_Mode" => $ssl_mode,
+            "api_type" => $this->api_type,
         );
     }
@@ -707 +793 @@
 
         foreach($pfResponse['dataSent'] as $key => $val) {
-            if($key == "apikey" || $key == "apipass" || $key == "cardnumber" || $key == "api_user" || $key == "api_pass" || $key == $this->apifield_apikey || $key == $this->apifield_apipass) {
+            if($key == "apikey" || $key == "apipass" || $key == "apipassword" || $key == "cardnumber" || $key == "api_user" || $key == "api_pass" || $key == $this->apifield_apikey || $key == $this->apifield_apipass) {
                 $val = "--REDACTED--";
             }
@@ -1023 +1109 @@
 
     }
+
+    public function meta_box_entry($meta_boxes, $entry, $form) {
+        // Custom Metabox
+
+        if($this->get_active_feeds($form['id'])) {
+
+            $profiler_logs_meta = gform_get_meta($entry['id'], 'profiler_logs');
+
+            if(!empty($profiler_logs_meta)) {
+                $meta_boxes[$this->_slug] = array(
+                    'title'    => 'Profiler API',
+                    'callback' => array($this, 'meta_box_entry_render'),
+                    'context'  => 'side',
+                    'callback_args' => array($entry, $form),
+                );
+            }
+        }
+
+        return $meta_boxes;
+    }
+
+    public function meta_box_entry_render($data) {
+        // Render the Custom Metabox
+        $html = '';
+
+        $meta_fields = array(
+            "profiler_integrationid" => "Integration ID",
+            "profiler_integration_guid" => "Integration GUID",
+            "profiler_logs" => "Profiler API Logs",
+        );
+
+        foreach($meta_fields as $field_name => $field_title) {
+
+            $meta_value = gform_get_meta($data['entry']['id'], $field_name);
+
+            if(!empty($meta_value)) {
+                $html .= '<p><strong>'.$field_title.'</strong>:<br /><pre style="width: 100%; overflow-x: scroll;">'.esc_html($meta_value).'</pre></p>';
+            }
+        }
+
+        echo $html;
+    }
+
+    private function auto_format_phone($phone_number_original) {
+        // This function auto-formats a phone number into an Australian format (0000 000 000 or 00 0000 0000)
+
+        // Remove certain characters
+        $phone_number = str_replace(array(" ", "-", "(", ")"), array("", "", "", ""), $phone_number_original);
+
+        // Remove +61 prefix
+        if(substr($phone_number, 0, 3) == "+61") {
+            $phone_number = substr($phone_number, 3);
+
+            if(strlen($phone_number) === 9) {
+                $phone_number = "0" . $phone_number;
+            }
+        }
+
+        // International number. Return as-is
+        if(substr($phone_number, 0, 1) == "+") {
+            return $phone_number;
+        }
+
+        // Probably an Australian number
+        if(strlen($phone_number) == 10) {
+            // 0000 000 000
+            if(substr($phone_number, 0, 2) == "04") {
+                $phone_number = substr($phone_number, 0, 4) . " " . substr($phone_number, 4, 3) . " " . substr($phone_number, 7);
+                return $phone_number;
+            }
+
+            // 00 0000 0000
+            $phone_number = substr($phone_number, 0, 2) . " " . substr($phone_number, 2, 4) . " " . substr($phone_number, 6);
+            return $phone_number;
+        }
+
+        // Probably Australian landline with no area prefix
+        if(strlen($phone_number) == 8) {
+            // Adjust to 0000 0000 format
+            $phone_number = substr($phone_number, 0, 4) . " " . substr($phone_number, 4);
+        }
+
+        return $phone_number;
+    }
 }
 

profiler-donations-gravityforms/tags/2.5.0/class-profilerdonate-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/Legacy/";
-    protected $apifield_apikey = "apikey";
-    protected $apifield_apipass = "apipass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "donation";
     protected $supports_custom_fields = true;
@@ -129 +131 @@
             "required" => false,
             "choices" => $field_settings,
-            "tooltip" => "The value of this field must be set to 'monthly' or 'yearly'. This field will be used if 'Donation Type' is set to 'regular'."
+            "tooltip" => "The value of this field must be set to 'weekly', 'monthly' or 'yearly'. This field will be used if 'Donation Type' is set to 'regular'."
         );
         
@@ -139 +141 @@
             "choices" => $product_field_settings,
             "tooltip" => "This amount field will be used if Donation Type is set to 'regular'.",
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Pledge Type ID',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgetypeid",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the Pledge Type ID to be sent to",
-            "choices" => $userdefinedfields,
         );
 
@@ -182 +175 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "firstname",
+            "pf_apifield" => "firstName",
         );
         
@@ -193 +186 @@
             "pf_apifield" => "surname",
         );
+
+        $fields[] = array(
+            "label" => 'Client: Gender',
+            "type" => "select",
+            "name" => "profilerdonation_clientgender",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "clientGender",
+            "tooltip" => "Gender values are defined in Profiler in Setup > Client > Gender.",
+        );
         
         $fields[] = array(
@@ -263 +266 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phoneah",
-        );
-        
+            "pf_apifield" => "phoneAH",
+        );
+
         $fields[] = array(
             "label" => 'Client: Business Phone',
@@ -272 +275 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phonebus",
-        );
-        
+            "pf_apifield" => "phoneBus",
+            "auto_format" => "phone",
+        );
+
         $fields[] = array(
             "label" => 'Client: Mobile Phone',
@@ -281 +285 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phonemobile",
-        );
-        
+            "pf_apifield" => "phoneMobile",
+            "auto_format" => "phone",
+        );
+
+        $fields[] = array(
+            "label" => 'Client: Phone',
+            "type" => "select",
+            "name" => "profilerdonation_clientphonemobile",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "phoneMobile",
+            "auto_format" => "phone",
+        );
+
         $fields[] = array(
             "label" => 'Client: Website',
@@ -323 +338 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "comments",
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Receipt Name',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_receiptname",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation receipt name to be sent to",
-            "choices" => $userdefinedfields,
+        );
+
+        $fields[] = array(
+            "label" => 'Extra Comments Text',
+            "type" => "textarea",
+            "name" => "profilerdonation_commentsextra",
+            "required" => false,
+            "class" => "merge-tag-support",
+            "tooltip" => "This is extra text to be sent to Profiler in the Comments field. Youc an include Gravity Forms Merge Fields in this textarea to accept additional user input.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Type',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_type",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionType",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Type here, and your Interaction Text below. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Text',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionText",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text here, and your Interaction Type above. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Tag',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_tag",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionTag",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text and Interaction Type above, and your Interaction Tag here. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Sub-Tag',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_subtag",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionSubTag",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text and Interaction Type above, and your Interaction Sub-Tag here. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Role: Add Role By Role Name',
+            "type" => "select",
+            "name" => "profilerdonation_role_name",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "roleName",
+            "tooltip" => "If you wish to add a Role to a Client by Role Name, enter the Role Name here.",
+        );
+
+        $fields[] = array(
+            "label" => 'Role: Add Role By Role ID',
+            "type" => "select",
+            "name" => "profilerdonation_role_id",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "roleId",
+            "tooltip" => "If you wish to add a Role to a Client by Role ID, enter the Role ID here.",
         );
 
@@ -341 +415 @@
             "required" => false,
             "choices" => $field_settings,
-        );
-        
-        $fields[] = array(
-            "label" => 'UDF: Donation Source Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_sourcecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation source code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+            "pf_apifield" => "receiptName",
+        );
+
         $fields[] = array(
             "label" => 'Donation Source Code - Default Value',
@@ -374 +440 @@
                 + self::$_instance->formFields("Form Field: "),
         );
-        
-        $fields[] = array(
-            "label" => 'UDF: Pledge Source Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgesourcecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the pledge source code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+
         $fields[] = array(
             "label" => 'Pledge Source Code - Default Value',
@@ -406 +463 @@
                 + self::$_instance->formFields("Form Field: "),
         );
-        
-        $fields[] = array(
-            "label" => 'UDF: Pledge Acquisition Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgeacquisitioncode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the pledge acquisition code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+
         $fields[] = array(
             "label" => 'Pledge Acquisition Code - Default Value',
@@ -425 +473 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Acquisition',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientacquisitioncode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client acquisition code to be sent to.",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Client Acquisition Field',
             "type" => "select",
@@ -441 +480 @@
             "choices" => $field_settings
         );
-
-        $fields[] = array(
-            "label" => 'UDF: Donation Purpose',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_donationpurposecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation's purpose code to be sent to",
-            "choices" => $userdefinedfields,
-        );
         
         $fields[] = array(
@@ -461 +491 @@
 
         $fields[] = array(
-            "label" => 'UDF: Donation Tag',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_donationtagcode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation's tag code to be sent to. Do not set this up if you use Tag Automation within Profiler.",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Donation Tag Field',
             "type" => "select",
@@ -479 +500 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Preferred Contact Method',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientpreferredcontactmethod",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's preferred contact method to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+            "label" => 'Interaction: Membership/Regular Mapping Text',
+            "type" => "select",
+            "name" => "profilerdonation_membership_mapping_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "membershipMappingText",
+            "tooltip" => "If you configure a 'Membership/Regular Type Map' in Profiler, you can use this field to perform the Mapping.",
+        );
+
+        $fields[] = array(
+            "label" => 'Payment Split-Out Text',
+            "type" => "select",
+            "name" => "profilerdonation_payment_split_out_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "splitOutText",
+            "tooltip" => "In Profiler, you can setup a text mapping for a Split / Breakdown Payment. If configured, it uses the text in this field to perform the split. For example, a Payment comes in for 100 and split is setup in Profiler for word POSTAGE, the payment recorded in Profiler will have separate amounts for two source codes.",
+        );
+
         $fields[] = array(
             "label" => 'Client Preferred Contact Method Field',
@@ -497 +529 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Privacy Preference',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientprivacypreference",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's privacy preference (true/false) to be sent to",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Client Privacy Preference Field',
             "type" => "select",
@@ -512 +535 @@
             "tooltip" => "If this checkbox is true, this client will be marked as 'private'.",
             "choices" => $checkboxFields
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Client IP Address',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientip",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's IP address to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
-        $fields[] = array(
-            "label" => 'UDF: Gateway Transaction ID / Gateway Response',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_gatewaytransactionid",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the gateway transaction ID to be sent to (certain gateways only)",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Payment Gateway ID Used',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_paymentgatewayidused",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the payment gateway ID to be sent to",
-            "choices" => $userdefinedfields,
         );
 
@@ -558 +554 @@
             "choices" => $field_settings
         );
-
-        if(function_exists('gf_stripe') || class_exists('GF_PayFURL')) {
-            // Stripe & PayFURL only fields
-            $fields[] = array(
-                "label" => 'UDF: Payment Gateway Card Token',
-                "type" => "select",
-                "name" => "profilerdonation_userdefined_gatewaycardtoken",
-                "required" => false,
-                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Card Token to",
-                "choices" => $userdefinedfields,
-            );
-        }
-    
-        if(function_exists('gf_stripe')) {
-            // Stripe only fields
-            $fields[] = array(
-                "label" => 'UDF: Payment Gateway Customer ID',
-                "type" => "select",
-                "name" => "profilerdonation_userdefined_gatewaycustomerid",
-                "required" => false,
-                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Customer ID to",
-                "choices" => $userdefinedfields,
-            );
-        }
 
 
@@ -620 +592 @@
         } else {
             // Profiler will just record integration data
-            $postData['method'] = "integration.send";
-            $postData['datatype'] = "OLDON";
+            $postData['dataType'] = "OLDON";
         }
 
@@ -634 +605 @@
             $postData['pledgeamount'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_amount']);
         }
-
-        $postData['clientname'] = $postData['firstname'] . ' ' . $postData['surname'];
 
         // Credit card fields:
@@ -645 +614 @@
         $postData['ccv'] = $cardDetails['ccv'];
 
-        if($feed['meta']['profilerdonation_userdefined_receiptname'] !== "") {
-            // Receipt Name
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_receiptname']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_receiptname']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_paymentgatewayidused'] !== "") {
-            // Payment Gateway ID Used
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentgatewayidused']);
-
-            if(empty($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']])) {
-                // Use default value
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']] = $feed['meta']['profilerdonation_paymentgatewayidused_default'];
-            }
-        }
-
+        // Payment Gateway ID Used
+        $postData['paymentGatewayIdUsed'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentgatewayidused']);
+
+        if(empty($postData['paymentGatewayIdUsed'])) {
+            // Use default value
+            $postData['paymentGatewayIdUsed'] = $feed['meta']['profilerdonation_paymentgatewayidused_default'];
+        }
 
         // Source codes
@@ -671 +632 @@
         }
 
-        $postData['sourcecode'] = $donationSourceCode;
-
-        if($feed['meta']['profilerdonation_userdefined_sourcecode'] !== "") {
-            // Donation Source Code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']] = $donationSourceCode;
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_pledgesourcecode'] !== "") {
-            // Pledge Source Code
-
-            if(isset($feed['meta']['profilerdonation_pledgesourcecodemode']) && $feed['meta']['profilerdonation_pledgesourcecodemode'] !== "normal") {
-                // The source code is a value of a specified field
-                $pledgeSourceCode = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgesourcecodemode']);
-
-            } else {
-                // Regular behaviour
-                $pledgeSourceCode = $this->getDonationCode($feed, 'pledgesourcecode', $form);
-            }
-
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgesourcecode']] = $pledgeSourceCode;
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode'] !== "") {
-            // Pledge Acqusition code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode']] = $this->getDonationCode($feed, 'pledgeacquisitioncode', $form);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_pledgetypeid'] !== "") {
-            // Pledge Type ID
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgetypeid']);
-
-            if(empty($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']])) {
-                // Default value if above field is empty
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']] = $feed['meta']['profilerdonation_pledgetypeid_default'];
-            }
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_clientacquisitioncode'] !== "" && $feed['meta']['profilerdonation_clientacquisitioncode'] !== "") {
+        $postData['donationSourceCode'] = $donationSourceCode;
+        
+        // Pledge Source Code
+
+        if(isset($feed['meta']['profilerdonation_pledgesourcecodemode']) && $feed['meta']['profilerdonation_pledgesourcecodemode'] !== "normal") {
+            // The source code is a value of a specified field
+            $pledgeSourceCode = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgesourcecodemode']);
+
+        } else {
+            // Regular behaviour
+            $pledgeSourceCode = $this->getDonationCode($feed, 'pledgesourcecode', $form);
+        }
+
+        $postData['regularSourceCode'] = $pledgeSourceCode;
+
+        // Pledge Acqusition code
+        $postData['regularAcquiredReason'] = $this->getDonationCode($feed, 'pledgeacquisitioncode', $form);
+
+        // Pledge Type ID
+        $postData['regularType'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgetypeid']);
+
+        if(empty($postData['regularType'])) {
+            // Default value if above field is empty
+            $postData['regularType'] = $feed['meta']['profilerdonation_pledgetypeid_default'];
+        }
+
+        if($feed['meta']['profilerdonation_clientacquisitioncode'] !== "") {
             // Client Acqusition code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientacquisitioncode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientacquisitioncode']);
-
-        } else if ($feed['meta']['profilerdonation_userdefined_clientacquisitioncode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientacquisitioncode']] = $this->getDonationCode($feed, 'clientacquisitioncode', $form);
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_donationpurposecode'] !== "" && $feed['meta']['profilerdonation_donationpurposecode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_donationpurposecode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationpurposecode']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_donationtagcode'] !== "" && $feed['meta']['profilerdonation_donationtagcode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_donationtagcode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtagcode']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_gatewaytransactionid'] !== "" && isset($entry['transaction_id'])) {
+            $postData['clientAcquiredReason'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientacquisitioncode']);
+
+        } else {
+            $postData['clientAcquiredReason'] = $this->getDonationCode($feed, 'clientacquisitioncode', $form);
+        }
+        
+        if($feed['meta']['profilerdonation_donationpurposecode'] !== "") {
+            $postData['paymentPupose'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationpurposecode']);
+        }
+
+        if($feed['meta']['profilerdonation_donationtagcode'] !== "") {
+            $postData['paymentTag'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtagcode']);
+        }
+
+        if(isset($entry['transaction_id'])) {
             // Gateway transaction id
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaytransactionid']] = $entry['transaction_id'];
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_gatewaytransactionid'] !== "" && isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'])) {
+            $postData['gatewayResponseId'] = $entry['transaction_id'];
+        }
+
+        if(isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'])) {
             // PayFURL-supplied Gateway Response
             $payfurl_gateway_response = $_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'];
 
             if(!empty($payfurl_gateway_response)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaytransactionid']] = $payfurl_gateway_response;
+                $postData['gatewayResponseId'] = $payfurl_gateway_response;
             }
         }
@@ -743 +693 @@
         }
 
-        if($feed['meta']['profilerdonation_userdefined_clientpreferredcontactmethod'] !== "") {
-            // Client Preferred Contact Method
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientpreferredcontactmethod']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientpreferredcontactmethod']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_clientprivacypreference'] !== "") {
-            // Client Privacy Preference
-
-            $privacy_field_value = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientprivacypreference']);
-
-            if(!empty($privacy_field_value)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientprivacypreference']] = 'true';
-            }
-        }
+        // Client Preferred Contact Method
+        $postData['clientPreferredContactMethod'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientpreferredcontactmethod']);
+
+        // Client Privacy Preference
+        $privacy_field_value = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientprivacypreference']);
+        if(!empty($privacy_field_value)) {
+            $postData['clientPrivacyPreference'] = 'true';
+        }
+
+        // Comments field
+        $comments = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_comments']);
+
+        if(!empty($feed['meta']['profilerdonation_commentsextra'])) {
+            // Extra text to append to comments field
+            $comments .= GFCommon::replace_variables($feed['meta']['profilerdonation_commentsextra'], $form, $entry, false, true, false, 'text');
+        }
+
+        $comments = html_entity_decode($comments);
+
+        // Only allow ASCII printable characters.
+        // This is a work-around to the API endpoint not allowing some characters
+        $comments = preg_replace('/[^\x20-\x7E]/','', $comments);
+
+        // Comments
+        $postData['comments'] = $comments;
 
         if($this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtype']) == "regular") {
             // Recurring donation
-            $postData['datatype'] = "PLG";
-            $postData['pledgetype'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgefreq']);
-
-            if(empty($postData['pledgetype'])) {
+            $postData['dataType'] = "PLG";
+            $postData['pledgeType'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgefreq']);
+
+            if(empty($postData['pledgeType'])) {
                 // We assume a monthly pledge if no frequency is specified
-                $postData['pledgetype'] = "monthly";
+                $postData['pledgeType'] = "monthly";
             }
 
-            if($feed['meta']['profilerdonation_userdefined_sourcecode'] !== "") {
-                // If it's recurring, the donation gets the pledge source code instead of the donation code
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']] = $this->getDonationCode($feed, 'pledgesourcecode', $form);
-            }
+            // If it's recurring, the donation gets the pledge source code instead of the donation code
+            $postData['donationSourceCode'] = $this->getDonationCode($feed, 'pledgesourcecode', $form);
 
             // Store the donation type
-            gform_add_meta($entry["id"], "profiler_type", "regular", $form_id);
+            gform_add_meta($entry["id"], "profiler_type", "regular", $form['id']);
 
         } elseif($useAsGateway == false) {
@@ -786 +745 @@
 
             unset($postData['pledgeamount']);
-            unset($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode']]);
-            unset($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgesourcecode']]);
+            unset($postData['regularAcquiredReason']);
+            unset($postData['regularSourceCode']);
 
         } else {
@@ -810 +769 @@
             unset($postData['cardexpiry']);
 
-            $postData['bankaccountname'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountname"]);
-            $postData['bankbsb'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_bsb"]);
-            $postData['bankaccountnumber'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountnumber"]);
+            $postData['bsbAccName'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountname"]);
+            $postData['bsb'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_bsb"]);
+            $postData['bsbAccNum'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountnumber"]);
             
         } elseif($this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentmethod']) == "paypal") {
@@ -829 +788 @@
     public function process_feed_success($feed, $entry, $form, $pfResponse, $postData) {
 
-        if(!isset($pfResponse['dataArray']['status']) || $pfResponse['dataArray']['status'] != "Pass") {
+        if(isset($pfResponse['dataArray']['success']) && $pfResponse['dataArray']['success'] === true) {
+            // Store the Integration ID as meta so we can use it later
+            if(isset($pfResponse['dataArray']['integrationId'])) {
+                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['integrationId'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_integration_guid", $pfResponse['dataArray']['integrationGuid'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_sourcecode", $postData['donationSourceCode'], $form['id']);
+            }
+        } else {
             // Profiler failed. Send the failure email.
-            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']['profiler_erroremailaddress']);
-
-        } else {
-            // Store the Integration ID as meta so we can use it later
-            if(isset($pfResponse['dataArray']['id'])) {
-                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['id'], $form['id']);
-                gform_add_meta($entry["id"], "profiler_sourcecode", $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']], $form['id']);
-            }
-        }
-
+            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']["profiler".$this->gffield_legacyname."_erroremailaddress"]);
+        }
     }
 

profiler-donations-gravityforms/tags/2.5.0/class-profilermembership-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/Legacy/";
-    protected $apifield_apikey = "apikey";
-    protected $apifield_apipass = "apipass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "membership";
 
@@ -43 +45 @@
         $fields = parent::feed_settings_fields_custom();
 
-        foreach($fields as $fieldKey => $fieldVal) {
-            if($fieldVal['label'] == "Use Profiler As A Gateway?") {
-                $fields[$fieldKey]['choices'][] = array(
-                    'label'         => 'Manual - Profiler will Process Payments, manually later on via a Pledge',
-                    'value'         => 'manual',
-                );
+        if(apply_filters('profiler_integration_allow_profiler_gateway', true) == true) {
+            // This filter allows us to disable the Profiler Gateway feature on a site
+
+            foreach($fields as $fieldKey => $fieldVal) {
+                if($fieldVal['label'] == "Use Profiler As A Gateway?") {
+                    $fields[$fieldKey]['choices'][] = array(
+                        'label'         => 'Manual - Profiler will Process Payments, manually later on via a Pledge',
+                        'value'         => 'manual',
+                    );
+                }
             }
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Number',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_number",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card number in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Expiry',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_expiry",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card expiry in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card CCV',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_ccv",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card CCV in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Name',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_name",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card name in",
+                "choices" => $userdefinedfields,
+            );
+
         }
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Number',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_number",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card number in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Expiry',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_expiry",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card expiry in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card CCV',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_ccv",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card CCV in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Name',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_name",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card name in",
-            "choices" => $userdefinedfields,
-        );
 
         return $fields;

profiler-donations-gravityforms/tags/2.5.0/class-profilerpostdonate-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/LegacyPost/";
-    protected $apifield_apikey = "api_user";
-    protected $apifield_apipass = "api_pass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "donation";
     protected $supports_custom_fields = true;
@@ -59 +61 @@
 
         $fields[] = array(
-            "label" => 'UDF: Comments',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_comments",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to use for the Comments field",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Extra Comments Text',
             "type" => "textarea",
             "name" => "profilerdonation_commentsextra",
-            "required" => true,
+            "required" => false,
             "class" => "merge-tag-support",
             "tooltip" => "This is extra text to be sent to Profiler as an Interaction. Protip: Include Gravity Forms Merge Fields in this textarea to accept user input.",
@@ -109 +102 @@
     public function process_feed_custom($feed, $entry, $form, $postData, $fromValidatorProcessPFGateway = false) {
 
-        $postData['method'] = "integration.send";
         $postData['datatype'] = "OLDON";
 
@@ -123 +115 @@
         // Comments
         $postData['comments'] = $comments;
-        $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_comments']] = $comments;
-        
+
         $gfEntryId = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_gfentryid']);
         $pfIntegrationId = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_profilerid']);
@@ -147 +138 @@
 
         // This is the ID of the actual donation entry
-        $postData['HoldingID'] = $pfIntegrationId;
+        $postData['holdingId'] = $pfIntegrationId;
 
         return $postData;
@@ -154 +145 @@
     public function process_feed_success($feed, $entry, $form, $pfResponse, $postData) {
 
-        if(!isset($pfResponse['dataArray']['status']) || $pfResponse['dataArray']['status'] != "Pass") {
+        if(isset($pfResponse['dataArray']['success']) && $pfResponse['dataArray']['success'] === true) {
+            // Store the Integration ID as meta so we can use it later
+            if(isset($pfResponse['dataArray']['integrationId'])) {
+                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['integrationId'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_integration_guid", $pfResponse['dataArray']['integrationGuid'], $form['id']);
+            }
+        } else {
             // Profiler failed. Send the failure email.
-            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']['profiler_erroremailaddress']);
-
-        } else {
-            // Store the Integration ID as meta so we can use it later
-            if(isset($pfResponse['dataArray']['id']))
-                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['id'], $form['id']);
+            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']["profiler".$this->gffield_legacyname."_erroremailaddress"]);
         }
-
     }
 

profiler-donations-gravityforms/tags/2.5.0/index.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: Profiler Donations - Gravity Forms Add-On
+Plugin Name: Gravity Forms + Profiler Add-On
 Plugin URI: https://mediarealm.com.au/
 Description: Integrates Gravity Forms with Profiler, enabling donation data and more to be sent directly to Profiler.
-Version: 2.4.3
+Version: 2.5.0
 
 Author: Media Realm
@@ -66 +66 @@
         //GFAddOn::register('GFProfilerEvents');
 
+        // This is a settings screen to list all Profiler feeds in the system
+        require_once('class-feedlist-gfaddon.php');
+        GFAddOn::register('GF_Profiler_FeedList');
+
         // Include some random helper functions
         require_once(plugin_dir_path(__FILE__) . '/shortcodes.php');

profiler-donations-gravityforms/tags/2.5.0/readme.txt

@@ -22 +22 @@
 
 == Changelog ==
+
+= 2.5.0 =
+
+This is a substantial update. Please backup your site before upgrading, and test all your integrations thoroughly after upgrading this plugin.
+
+* Use the new Profiler Core API for Donations/payments. This removes the UDF field config and automates it within Profiler.
+* Create 'Profiler Feed List' setting screen, for quick access to all configured feeds on your site
+* Remove Profiler Logs fields, and move these to an entry metabox.
+* Donation Feed: Add Extra Comments field
+* Donation Feed: Automatic formatting of Australian phone numbers
+* Add Profiler icon to all Feeds
+* Donation Feed: Add new fields for gender, interactions, roles, membership mapping and payment split text.
+* Membership Feed: Hide manual payment fields if Profiler-driven payments have been disabled
 
 = 2.4.3 =

profiler-donations-gravityforms/tags/2.5.0/sync_users.php

@@ -232 +232 @@
 
         if(empty($options['auth_apikey']) || empty($options['auth_apipass']) || empty($options['pf_database']) || empty($options['pf_domain'])) {
-            $this->log("Profiler Users not configured correctly");
             return;
         }

profiler-donations-gravityforms/tags/2.5.0/woocommerce/integration.php

@@ -23 +23 @@
         $this->dbname                      = $this->get_option( 'dbname' );
         $this->apikey                      = $this->get_option( 'apikey' );
+
+        // Upgrade config to new domain
+        $this->instancedomainname = str_replace(".profilersystem.com", ".profilersoftware.com", $this->instancedomainname);
 
         // Actions.
@@ -54 +57 @@
                 'title'             => 'Profiler Instance Domain Name',
                 'type'              => 'text',
-                'description'       => 'e.g. example.profilersystem.com',
+                'description'       => 'e.g. example.profilersoftware.com',
                 'desc_tip'          => true,
                 'default'           => '',
@@ -85 +88 @@
                 'desc_tip'          => true,
                 'default'           => ''
-            ),
-            'udf_sourcecode' => array(
-                'title'             => 'UDF: Donation Source Code',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
-            ),
-            'udf_clientip' => array(
-                'title'             => 'UDF: Client IP Address',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
-            ),
-            'udf_transactionid' => array(
-                'title'             => 'UDF: Gateway Transaction ID',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
             ),
         );
@@ -204 +183 @@
 
         // Build API payload
-        $url = 'https://' . $this->instancedomainname . '/ProfilerAPI/Legacy/';
+        $url = 'https://' . $this->instancedomainname . '/ProfilerAPI/RapidEndpoint/';
         $profiler_data = array(
-            'DB' => $this->dbname,
-            'apikey' => $this->apikey,
-            'apipass' => $this->get_option('apipass'),
-            'method' => 'integration.send',
+            'apiuser' => $this->apikey,
+            'apipassword' => $this->get_option('apipass'),
             'datatype' => 'OLDON',
 
             'amount' => $total,
-            'donationamount' => $total,
-            'sourcecode' => $this->get_option('sourcecode'),
+            'donationAmount' => $total,
+            'donationSourceCode' => $this->get_option('sourcecode'),
             'status' => 'Approved',
 
             'clientname' => $first_name . ' ' . $last_name,
-            'firstname' => $first_name,
+            'firstName' => $first_name,
             'surname' => $last_name,
 
@@ -233 +210 @@
         );
 
-        if($this->get_option('udf_sourcecode') != '') {
-            // Source code as a UDF
-            $profiler_data['userdefined' . $this->get_option('udf_sourcecode')] = $this->get_option('sourcecode');
-        }
+        // Source code as a UDF
+        $profiler_data['donationSourceCode'] = $this->get_option('sourcecode');
 
         if($order->needs_payment()) {
@@ -243 +218 @@
         }
 
-        if($this->get_option('udf_clientip') != '') {
-            // Client IP Address
-            $profiler_data['userdefined' . $this->get_option('udf_clientip')] = $this->get_client_ip_address();
-        }
-
-        if($this->get_option('udf_transactionid') != '') {
-            // Payment Gateway Transaction ID
-            $profiler_data['userdefined' . $this->get_option('udf_transactionid')] = $order->get_transaction_id();
-        }
+        // Client IP Address
+        $profiler_data['requestIPAddress'] = $this->get_client_ip_address();
+
+        // Payment Gateway Transaction ID
+        $profiler_data['gatewayResponseId'] = $order->get_transaction_id();
 
         // Push data to Profiler
@@ -350 +321 @@
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url . '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit')));
+        curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($profiler_query));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -386 +357 @@
             "dataSent" => $profiler_query,
             "data" => $result,
-            "dataXML" => simplexml_load_string($result),
-            "dataArray" => json_decode(json_encode((array)simplexml_load_string($result)), 1),
+            "dataArray" => json_decode($result, true),
             "cURLError" => $cURL_error,
             "cURL_SSL_Mode" => $ssl_mode,
         );
-    }
-
-    private function options_udf() {
-        $fields = array("0" => "");
-
-        for($i = 1; $i <= 99; $i++) {
-            $fields[$i] = "User Defined Field " . $i;
-        }
-
-        return $fields;
     }
 

profiler-donations-gravityforms/trunk/README.md

@@ -15 +15 @@
 *   [Gravity Forms](http://www.gravityforms.com)
 *   Payment Gateway integration with Gravity Forms (must be pre-existing and use standard Gravity Forms payment hooks and database fields)
-  * For Australian non-profits, we recommend the official Gravity Forms Stripe plugin
+  * We recommend the official Gravity Forms Stripe plugin
 *   Full administrative access to Profiler
 *   CURL and XML Enabled on Web Server

profiler-donations-gravityforms/trunk/class-profilercommon.php

@@ -7 +7 @@
     protected $_title = "Profiler / Gravity Forms - Integration Feed";
 
+    protected $api_type = "form"; // form or json
+    protected $api_domain = "profilersystem.com";
     protected $apifield_apikey = "apikey";
     protected $apifield_apipass = "apipass";
@@ -27 +29 @@
         add_filter('gform_stripe_charge_description',       array($this, 'stripe_payment_description'), 10, 5);
         add_filter('gform_stripe_payment_element_initial_payment_information', array($this, 'stripe_elements_setup'), 10, 3);
-    }
+
+        // Metabox for Profiler Logs
+        add_filter('gform_entry_detail_meta_boxes',         array($this, 'meta_box_entry'), 10, 3);
+    }
+
+    public function get_menu_icon() {
+        //return 'dashicons-admin-generic';
+        return plugins_url('icon-profiler.png', __FILE__);
+    }
 
     public function feed_settings_fields() {
@@ -65 +75 @@
             "name" => "profiler".$this->gffield_legacyname."_instancedomainname",
             "required" => true,
-            "tooltip" => "Your Instance Domain Name can be found in your login URL: e.g. 'https://instance.profiler.net.au/' is 'instance.profiler.net.au'",
-        );
-        
-        $fields[] = array(
-            "label" => 'Profiler Database Name',
-            "type" => "text",
-            "name" => "profiler".$this->gffield_legacyname."_dbname",
-            "required" => true,
-        );
+            "tooltip" => "Your Instance Domain Name can be found in your login URL: e.g. 'https://instance.profilersystem.com/' is 'instance.profilesystem.com'",
+        );
+        
+        if($this->api_type !== 'json') {
+            $fields[] = array(
+                "label" => 'Profiler Database Name',
+                "type" => "text",
+                "name" => "profiler".$this->gffield_legacyname."_dbname",
+                "required" => true,
+            );
+        }
         
         $fields[] = array(
@@ -138 +150 @@
                     // Loop over mailing list fields
     
+                    if($this->api_type !== 'json') {
+                        $fields[] = array(
+                            "label" => 'Mailing List #'.$i.': UDF',
+                            "type" => "select",
+                            "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf",
+                            "required" => false,
+                            "tooltip" => "Pick the Profiler User Defined Field you wish to use for this mailing",
+                            "choices" => $userdefinedfields,
+                        );
+                    }
+
                     $fields[] = array(
-                        "label" => 'Mailing List #'.$i.': UDF',
-                        "type" => "select",
-                        "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf",
-                        "required" => false,
-                        "tooltip" => "Pick the Profiler User Defined Field you wish to use for this mailing",
-                        "choices" => $userdefinedfields,
-                    );
-    
-                    $fields[] = array(
-                        "label" => 'Mailing List #'.$i.': UDF Text',
+                        "label" => ($this->api_type == 'json' ? 'Mailing List #'.$i.': Mailing Type Code' : 'Mailing List #'.$i.': UDF Text'),
                         "type" => "text",
                         "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udftext",
                         "required" => false,
-                        "tooltip" => "Enter the string Profiler is expecting in this UDF",
+                        "tooltip" => ($this->api_type == 'json' ? "Enter the Profiler Mailing Type Code" : "Enter the string Profiler is expecting in this UDF") . ". This field also accept post meta merge fields in this format: {postmeta:meta_field_name}",
                     );
-    
+
                     $fields[] = array(
                         "label" => 'Mailing List #'.$i.': Field',
@@ -161 +175 @@
                         "tooltip" => 'Link it to a checkbox field - when checked, the mailing will be sent',
                         "required" => false,
-                        "choices" => $checkboxFields
+                        "choices" => array_merge($checkboxRadioFields, array(array("value" => "always", "label" => "Always Subscribe"))),
                     );
                 }
@@ -203 +217 @@
 
         $fields[] = array(
-            "label" => 'Profiler Logs',
-            "type" => "select",
-            "name" => "profiler".$this->gffield_legacyname."_logs",
-            "tooltip" => 'Link it to a Hidden field that will hold Profiler Response Logs',
-            "required" => false,
-            "choices" => $hiddenFields
-        );
-        
-        $fields[] = array(
             "label" => 'SSL Mode',
             "type" => "select",
@@ -259 +264 @@
         $postData = array();
 
-        $postData['DB'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_dbname'];
+        if($this->api_type !== 'json') {
+            $postData['DB'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_dbname'];
+        }
         $postData[$this->apifield_apikey] = $feed['meta']['profiler'.$this->gffield_legacyname.'_apikey'];
         $postData[$this->apifield_apipass] = $feed['meta']['profiler'.$this->gffield_legacyname.'_apipass'];
@@ -265 +272 @@
         if(empty($feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname']) && !empty($feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'])) {
             // Respect the setting from when we only accepted the first part of the domain name
-            $feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'] . ".profiler.net.au";
+            $feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'] = $feed['meta']['profiler'.$this->gffield_legacyname.'_instancename'] . ".profilersystem.com";
         }
 
@@ -282 +289 @@
             if(isset($field['pf_apifield']) && $this->get_field_value($form, $entry, $feed['meta'][$field['name']]) != '') {
                 $postData[$field['pf_apifield']] = trim($this->get_field_value($form, $entry, $feed['meta'][$field['name']]));
+
+                // Auto formatting for phone fields
+                if(isset($field['auto_format']) && $field['auto_format'] == "phone") {
+                    $postData[$field['pf_apifield']] = $this->auto_format_phone($postData[$field['pf_apifield']]);
+                }
             }
         }
@@ -301 +313 @@
         if($this->apifield_formurl === true && !empty($feed['meta']['profiler'.$this->gffield_legacyname.'_userdefined_formurl'])) {
             $postData['userdefined' . $feed['meta']['profiler'.$this->gffield_legacyname.'_userdefined_formurl']] = $entry['source_url'];
+        } else if($this->apifield_formurl !== false) {
+            $postData[$this->apifield_formurl] = $entry['source_url'];
         }
 
@@ -322 +336 @@
             }
 
-            if($feed['meta']['profilerdonation_userdefined_gatewaycustomerid'] !== "" && isset($payment_intent)) {
+            if(isset($payment_intent)) {
                 // Gateway Customer ID
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycustomerid']] = $payment_intent->customer;
-            }
-
-            if($feed['meta']['profilerdonation_userdefined_gatewaycardtoken'] !== "" && isset($payment_intent)) {
+                $postData['paymentGatewayCustomerId'] = $payment_intent->customer;
+            }
+
+            if(isset($payment_intent)) {
                 // Gateway Card Token
                 try {
-                    $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycardtoken']] = $payment_intent->charges->data[0]->payment_method;
+                    $postData['gatewayCardToken'] = $payment_intent->charges->data[0]->payment_method;
                 } catch(Exception $e) {
                     error_log("STRIPE/PROFILER CARD TOKEN ERROR: " . print_r($e, true));
@@ -338 +352 @@
 
         // PayFURL-supplied Gateway Token
-        if($feed['meta']['profilerdonation_userdefined_gatewaycardtoken'] !== "" && isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'])) {
+        if(isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'])) {
             $payfurl_provider_token = $_POST['payfurl_payment_details']['captured_payment']['payfurl_payment_method_id_provider'];
-            
+
             if(!empty($payfurl_provider_token)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycardtoken']] = $payfurl_provider_token;
+                $postData['gatewayCardToken'] = $payfurl_provider_token;
             }
         }
@@ -349 +363 @@
         if($this->supports_custom_fields === true && !empty($feed['meta']['profiler_customfields_count'])) {
             for($i = 1; $i <= $feed['meta']['profiler_customfields_count']; $i++) {
-                $postData["userdefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+
+                $value = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+
+                if($this->api_type == 'json') {
+                    if(!isset($postData['userDefinedFields'])) {
+                        $postData['userDefinedFields'] = array();
+                    }
+
+                    $postData['userDefinedFields']["userDefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = $value;
+
+                } else {
+                    $postData["userdefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = $value;
+                }
+
+                
             }
         }
@@ -358 +386 @@
                 // Loop over mailing list fields
                 $mailingFieldValue = $this->get_field_value($form, $entry, $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"]);
-                $udf = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf"];
                 $udfText = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udftext"];
 
-                if(!empty($udf) && !empty($udfText) && !empty($mailingFieldValue)) {
-                    $postData['userdefined' . $udf] = $udfText;
-                }
-
+                // Allow merging post meta fields into $udfText
+                if(isset($entry['post_id']) && !empty($entry['post_id'])) {
+                    $post_id = $entry['post_id'];
+                } else {
+                    global $post;
+                    if(isset($post)) {
+                        $post_id = $post->ID;
+                    }
+                }
+
+                if(isset($post_id)) {
+                    preg_match_all("/{postmeta:(.*?)}/", $udfText, $matches);
+
+                    if(is_array($matches) && isset($matches[1])) {
+                        foreach($matches[1] as $match) {
+                            $post_meta = get_post_meta($post_id, $match, true);
+                            $udfText = str_replace("{postmeta:".$match."}", $post_meta, $udfText);
+                        }
+                    }
+                }
+
+                if($this->api_type == 'json') {
+
+                    if(!isset($postData['mailingList'])) {
+                        $postData['mailingList'] = '';
+                    }
+
+                    if(!empty($udfText) && (!empty($mailingFieldValue) || $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"] == 'always')) {
+                        $postData['mailingList'] .= (!empty($postData['mailingList']) ? ',' : '') . $udfText;
+                    }
+
+                } else {
+                    $udf = $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_udf"];
+
+                    if(!empty($udf) && !empty($udfText) && (!empty($mailingFieldValue) || $feed['meta']["profiler".$this->gffield_legacyname."_mailinglist_".$i."_field"] == 'always')) {
+                        $postData['userdefined' . $udf] = $udfText;
+                    }
+                }
             }
         }
@@ -386 +447 @@
         $postData = apply_filters('profiler_integration_api_request_data', $postData, $form, $entry, $this->apifield_endpoint);
 
+        // Update URL for newer APIs
+        if($this->api_domain !== 'profilersystem.com') {
+            $API_URL = str_replace(".profilersystem.com", "." . $this->api_domain, $API_URL);
+        }
+
         // Send data to Profiler
         $pfResponse = $this->sendDataToProfiler($API_URL, $postData, $feed['meta']['profiler'.$this->gffield_legacyname.'_sslmode']);
@@ -391 +457 @@
         if($fromValidatorProcessPFGateway === false) {
             // Save Profiler response data back to the form entry
-            $logsToStore = json_encode($pfResponse);
+            $logsToStore = json_encode($pfResponse, JSON_PRETTY_PRINT);
             $logsToStore = str_replace($postData['cardnumber'], "--REDACTED--", $logsToStore);
             $logsToStore = str_replace($postData[$this->apifield_apikey], "--REDACTED--", $logsToStore);
             $logsToStore = str_replace($postData[$this->apifield_apipass], "--REDACTED--", $logsToStore);
-            $entry[$feed['meta']['profiler'.$this->gffield_legacyname.'_logs']] = htmlentities($logsToStore);
-            GFAPI::update_entry($entry);
+            gform_add_meta($entry["id"], "profiler_logs", $logsToStore, $form['id']);
 
             if(method_exists($this, 'process_feed_success')) {
                 $this->process_feed_success($feed, $entry, $form, $pfResponse, $postData);
-            }   
+            }
+
         } else {
             return $pfResponse;
@@ -651 +717 @@
         }
 
+        if(isset($profiler_query['DB'])) {
+            $url .= '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit'));
+        }
+
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url . '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit')));
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        
+
         if($ssl_mode == "bundled_ca") {
             // Use the CA Cert bundled with this plugin
@@ -669 +737 @@
         }
 
+        if($this->api_type === 'json') {
+            // JSON POST
+            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($profiler_query));
+            curl_setopt( $ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+
+        } else {
+            // FORM POST
+            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
+        }
+
         $result = curl_exec($ch);
         $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        
+
         if(curl_error($ch)) {
             $cURL_error = curl_error($ch);
@@ -677 +756 @@
             $cURL_error = null;
         }
-        
+
         curl_close($ch);
-        
+
+        if($this->api_type === 'json') {
+            $data_decoded = json_decode($result, true);
+        } else {
+            $data_decoded = json_decode(json_encode((array)simplexml_load_string($result)), true);
+        }
+
         return array(
             "httpstatus" => $status_code,
+            "url" => $url,
             "dataSent" => $profiler_query,
             "data" => $result,
-            "dataXML" => simplexml_load_string($result),
-            "dataArray" => json_decode(json_encode((array)simplexml_load_string($result)), 1),
+            "dataArray" => $data_decoded,
             "cURLError" => $cURL_error,
             "cURL_SSL_Mode" => $ssl_mode,
+            "api_type" => $this->api_type,
         );
     }
@@ -707 +793 @@
 
         foreach($pfResponse['dataSent'] as $key => $val) {
-            if($key == "apikey" || $key == "apipass" || $key == "cardnumber" || $key == "api_user" || $key == "api_pass" || $key == $this->apifield_apikey || $key == $this->apifield_apipass) {
+            if($key == "apikey" || $key == "apipass" || $key == "apipassword" || $key == "cardnumber" || $key == "api_user" || $key == "api_pass" || $key == $this->apifield_apikey || $key == $this->apifield_apipass) {
                 $val = "--REDACTED--";
             }
@@ -1023 +1109 @@
 
     }
+
+    public function meta_box_entry($meta_boxes, $entry, $form) {
+        // Custom Metabox
+
+        if($this->get_active_feeds($form['id'])) {
+
+            $profiler_logs_meta = gform_get_meta($entry['id'], 'profiler_logs');
+
+            if(!empty($profiler_logs_meta)) {
+                $meta_boxes[$this->_slug] = array(
+                    'title'    => 'Profiler API',
+                    'callback' => array($this, 'meta_box_entry_render'),
+                    'context'  => 'side',
+                    'callback_args' => array($entry, $form),
+                );
+            }
+        }
+
+        return $meta_boxes;
+    }
+
+    public function meta_box_entry_render($data) {
+        // Render the Custom Metabox
+        $html = '';
+
+        $meta_fields = array(
+            "profiler_integrationid" => "Integration ID",
+            "profiler_integration_guid" => "Integration GUID",
+            "profiler_logs" => "Profiler API Logs",
+        );
+
+        foreach($meta_fields as $field_name => $field_title) {
+
+            $meta_value = gform_get_meta($data['entry']['id'], $field_name);
+
+            if(!empty($meta_value)) {
+                $html .= '<p><strong>'.$field_title.'</strong>:<br /><pre style="width: 100%; overflow-x: scroll;">'.esc_html($meta_value).'</pre></p>';
+            }
+        }
+
+        echo $html;
+    }
+
+    private function auto_format_phone($phone_number_original) {
+        // This function auto-formats a phone number into an Australian format (0000 000 000 or 00 0000 0000)
+
+        // Remove certain characters
+        $phone_number = str_replace(array(" ", "-", "(", ")"), array("", "", "", ""), $phone_number_original);
+
+        // Remove +61 prefix
+        if(substr($phone_number, 0, 3) == "+61") {
+            $phone_number = substr($phone_number, 3);
+
+            if(strlen($phone_number) === 9) {
+                $phone_number = "0" . $phone_number;
+            }
+        }
+
+        // International number. Return as-is
+        if(substr($phone_number, 0, 1) == "+") {
+            return $phone_number;
+        }
+
+        // Probably an Australian number
+        if(strlen($phone_number) == 10) {
+            // 0000 000 000
+            if(substr($phone_number, 0, 2) == "04") {
+                $phone_number = substr($phone_number, 0, 4) . " " . substr($phone_number, 4, 3) . " " . substr($phone_number, 7);
+                return $phone_number;
+            }
+
+            // 00 0000 0000
+            $phone_number = substr($phone_number, 0, 2) . " " . substr($phone_number, 2, 4) . " " . substr($phone_number, 6);
+            return $phone_number;
+        }
+
+        // Probably Australian landline with no area prefix
+        if(strlen($phone_number) == 8) {
+            // Adjust to 0000 0000 format
+            $phone_number = substr($phone_number, 0, 4) . " " . substr($phone_number, 4);
+        }
+
+        return $phone_number;
+    }
 }
 

profiler-donations-gravityforms/trunk/class-profilerdonate-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/Legacy/";
-    protected $apifield_apikey = "apikey";
-    protected $apifield_apipass = "apipass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "donation";
     protected $supports_custom_fields = true;
@@ -129 +131 @@
             "required" => false,
             "choices" => $field_settings,
-            "tooltip" => "The value of this field must be set to 'monthly' or 'yearly'. This field will be used if 'Donation Type' is set to 'regular'."
+            "tooltip" => "The value of this field must be set to 'weekly', 'monthly' or 'yearly'. This field will be used if 'Donation Type' is set to 'regular'."
         );
         
@@ -139 +141 @@
             "choices" => $product_field_settings,
             "tooltip" => "This amount field will be used if Donation Type is set to 'regular'.",
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Pledge Type ID',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgetypeid",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the Pledge Type ID to be sent to",
-            "choices" => $userdefinedfields,
         );
 
@@ -182 +175 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "firstname",
+            "pf_apifield" => "firstName",
         );
         
@@ -193 +186 @@
             "pf_apifield" => "surname",
         );
+
+        $fields[] = array(
+            "label" => 'Client: Gender',
+            "type" => "select",
+            "name" => "profilerdonation_clientgender",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "clientGender",
+            "tooltip" => "Gender values are defined in Profiler in Setup > Client > Gender.",
+        );
         
         $fields[] = array(
@@ -263 +266 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phoneah",
-        );
-        
+            "pf_apifield" => "phoneAH",
+        );
+
         $fields[] = array(
             "label" => 'Client: Business Phone',
@@ -272 +275 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phonebus",
-        );
-        
+            "pf_apifield" => "phoneBus",
+            "auto_format" => "phone",
+        );
+
         $fields[] = array(
             "label" => 'Client: Mobile Phone',
@@ -281 +285 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "phonemobile",
-        );
-        
+            "pf_apifield" => "phoneMobile",
+            "auto_format" => "phone",
+        );
+
+        $fields[] = array(
+            "label" => 'Client: Phone',
+            "type" => "select",
+            "name" => "profilerdonation_clientphonemobile",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "phoneMobile",
+            "auto_format" => "phone",
+        );
+
         $fields[] = array(
             "label" => 'Client: Website',
@@ -323 +338 @@
             "required" => false,
             "choices" => $field_settings,
-            "pf_apifield" => "comments",
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Receipt Name',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_receiptname",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation receipt name to be sent to",
-            "choices" => $userdefinedfields,
+        );
+
+        $fields[] = array(
+            "label" => 'Extra Comments Text',
+            "type" => "textarea",
+            "name" => "profilerdonation_commentsextra",
+            "required" => false,
+            "class" => "merge-tag-support",
+            "tooltip" => "This is extra text to be sent to Profiler in the Comments field. Youc an include Gravity Forms Merge Fields in this textarea to accept additional user input.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Type',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_type",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionType",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Type here, and your Interaction Text below. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Text',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionText",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text here, and your Interaction Type above. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Tag',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_tag",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionTag",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text and Interaction Type above, and your Interaction Tag here. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Interaction: Sub-Tag',
+            "type" => "select",
+            "name" => "profilerdonation_interaction_subtag",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "interactionSubTag",
+            "tooltip" => "If you wish to setup an Interaction, specify your Interaction Text and Interaction Type above, and your Interaction Sub-Tag here. This is separate to the 'Comments' field above.",
+        );
+
+        $fields[] = array(
+            "label" => 'Role: Add Role By Role Name',
+            "type" => "select",
+            "name" => "profilerdonation_role_name",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "roleName",
+            "tooltip" => "If you wish to add a Role to a Client by Role Name, enter the Role Name here.",
+        );
+
+        $fields[] = array(
+            "label" => 'Role: Add Role By Role ID',
+            "type" => "select",
+            "name" => "profilerdonation_role_id",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "roleId",
+            "tooltip" => "If you wish to add a Role to a Client by Role ID, enter the Role ID here.",
         );
 
@@ -341 +415 @@
             "required" => false,
             "choices" => $field_settings,
-        );
-        
-        $fields[] = array(
-            "label" => 'UDF: Donation Source Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_sourcecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation source code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+            "pf_apifield" => "receiptName",
+        );
+
         $fields[] = array(
             "label" => 'Donation Source Code - Default Value',
@@ -374 +440 @@
                 + self::$_instance->formFields("Form Field: "),
         );
-        
-        $fields[] = array(
-            "label" => 'UDF: Pledge Source Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgesourcecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the pledge source code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+
         $fields[] = array(
             "label" => 'Pledge Source Code - Default Value',
@@ -406 +463 @@
                 + self::$_instance->formFields("Form Field: "),
         );
-        
-        $fields[] = array(
-            "label" => 'UDF: Pledge Acquisition Code',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_pledgeacquisitioncode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the pledge acquisition code to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+
         $fields[] = array(
             "label" => 'Pledge Acquisition Code - Default Value',
@@ -425 +473 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Acquisition',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientacquisitioncode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client acquisition code to be sent to.",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Client Acquisition Field',
             "type" => "select",
@@ -441 +480 @@
             "choices" => $field_settings
         );
-
-        $fields[] = array(
-            "label" => 'UDF: Donation Purpose',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_donationpurposecode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation's purpose code to be sent to",
-            "choices" => $userdefinedfields,
-        );
         
         $fields[] = array(
@@ -461 +491 @@
 
         $fields[] = array(
-            "label" => 'UDF: Donation Tag',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_donationtagcode",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the donation's tag code to be sent to. Do not set this up if you use Tag Automation within Profiler.",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Donation Tag Field',
             "type" => "select",
@@ -479 +500 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Preferred Contact Method',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientpreferredcontactmethod",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's preferred contact method to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
+            "label" => 'Interaction: Membership/Regular Mapping Text',
+            "type" => "select",
+            "name" => "profilerdonation_membership_mapping_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "membershipMappingText",
+            "tooltip" => "If you configure a 'Membership/Regular Type Map' in Profiler, you can use this field to perform the Mapping.",
+        );
+
+        $fields[] = array(
+            "label" => 'Payment Split-Out Text',
+            "type" => "select",
+            "name" => "profilerdonation_payment_split_out_text",
+            "required" => false,
+            "choices" => $field_settings,
+            "pf_apifield" => "splitOutText",
+            "tooltip" => "In Profiler, you can setup a text mapping for a Split / Breakdown Payment. If configured, it uses the text in this field to perform the split. For example, a Payment comes in for 100 and split is setup in Profiler for word POSTAGE, the payment recorded in Profiler will have separate amounts for two source codes.",
+        );
+
         $fields[] = array(
             "label" => 'Client Preferred Contact Method Field',
@@ -497 +529 @@
 
         $fields[] = array(
-            "label" => 'UDF: Client Privacy Preference',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientprivacypreference",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's privacy preference (true/false) to be sent to",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Client Privacy Preference Field',
             "type" => "select",
@@ -512 +535 @@
             "tooltip" => "If this checkbox is true, this client will be marked as 'private'.",
             "choices" => $checkboxFields
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Client IP Address',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_clientip",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the client's IP address to be sent to",
-            "choices" => $userdefinedfields,
-        );
-        
-        $fields[] = array(
-            "label" => 'UDF: Gateway Transaction ID / Gateway Response',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_gatewaytransactionid",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the gateway transaction ID to be sent to (certain gateways only)",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Payment Gateway ID Used',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_paymentgatewayidused",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish the payment gateway ID to be sent to",
-            "choices" => $userdefinedfields,
         );
 
@@ -558 +554 @@
             "choices" => $field_settings
         );
-
-        if(function_exists('gf_stripe') || class_exists('GF_PayFURL')) {
-            // Stripe & PayFURL only fields
-            $fields[] = array(
-                "label" => 'UDF: Payment Gateway Card Token',
-                "type" => "select",
-                "name" => "profilerdonation_userdefined_gatewaycardtoken",
-                "required" => false,
-                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Card Token to",
-                "choices" => $userdefinedfields,
-            );
-        }
-    
-        if(function_exists('gf_stripe')) {
-            // Stripe only fields
-            $fields[] = array(
-                "label" => 'UDF: Payment Gateway Customer ID',
-                "type" => "select",
-                "name" => "profilerdonation_userdefined_gatewaycustomerid",
-                "required" => false,
-                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Customer ID to",
-                "choices" => $userdefinedfields,
-            );
-        }
 
 
@@ -620 +592 @@
         } else {
             // Profiler will just record integration data
-            $postData['method'] = "integration.send";
-            $postData['datatype'] = "OLDON";
+            $postData['dataType'] = "OLDON";
         }
 
@@ -634 +605 @@
             $postData['pledgeamount'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_amount']);
         }
-
-        $postData['clientname'] = $postData['firstname'] . ' ' . $postData['surname'];
 
         // Credit card fields:
@@ -645 +614 @@
         $postData['ccv'] = $cardDetails['ccv'];
 
-        if($feed['meta']['profilerdonation_userdefined_receiptname'] !== "") {
-            // Receipt Name
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_receiptname']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_receiptname']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_paymentgatewayidused'] !== "") {
-            // Payment Gateway ID Used
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentgatewayidused']);
-
-            if(empty($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']])) {
-                // Use default value
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_paymentgatewayidused']] = $feed['meta']['profilerdonation_paymentgatewayidused_default'];
-            }
-        }
-
+        // Payment Gateway ID Used
+        $postData['paymentGatewayIdUsed'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentgatewayidused']);
+
+        if(empty($postData['paymentGatewayIdUsed'])) {
+            // Use default value
+            $postData['paymentGatewayIdUsed'] = $feed['meta']['profilerdonation_paymentgatewayidused_default'];
+        }
 
         // Source codes
@@ -671 +632 @@
         }
 
-        $postData['sourcecode'] = $donationSourceCode;
-
-        if($feed['meta']['profilerdonation_userdefined_sourcecode'] !== "") {
-            // Donation Source Code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']] = $donationSourceCode;
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_pledgesourcecode'] !== "") {
-            // Pledge Source Code
-
-            if(isset($feed['meta']['profilerdonation_pledgesourcecodemode']) && $feed['meta']['profilerdonation_pledgesourcecodemode'] !== "normal") {
-                // The source code is a value of a specified field
-                $pledgeSourceCode = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgesourcecodemode']);
-
-            } else {
-                // Regular behaviour
-                $pledgeSourceCode = $this->getDonationCode($feed, 'pledgesourcecode', $form);
-            }
-
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgesourcecode']] = $pledgeSourceCode;
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode'] !== "") {
-            // Pledge Acqusition code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode']] = $this->getDonationCode($feed, 'pledgeacquisitioncode', $form);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_pledgetypeid'] !== "") {
-            // Pledge Type ID
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgetypeid']);
-
-            if(empty($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']])) {
-                // Default value if above field is empty
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgetypeid']] = $feed['meta']['profilerdonation_pledgetypeid_default'];
-            }
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_clientacquisitioncode'] !== "" && $feed['meta']['profilerdonation_clientacquisitioncode'] !== "") {
+        $postData['donationSourceCode'] = $donationSourceCode;
+        
+        // Pledge Source Code
+
+        if(isset($feed['meta']['profilerdonation_pledgesourcecodemode']) && $feed['meta']['profilerdonation_pledgesourcecodemode'] !== "normal") {
+            // The source code is a value of a specified field
+            $pledgeSourceCode = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgesourcecodemode']);
+
+        } else {
+            // Regular behaviour
+            $pledgeSourceCode = $this->getDonationCode($feed, 'pledgesourcecode', $form);
+        }
+
+        $postData['regularSourceCode'] = $pledgeSourceCode;
+
+        // Pledge Acqusition code
+        $postData['regularAcquiredReason'] = $this->getDonationCode($feed, 'pledgeacquisitioncode', $form);
+
+        // Pledge Type ID
+        $postData['regularType'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgetypeid']);
+
+        if(empty($postData['regularType'])) {
+            // Default value if above field is empty
+            $postData['regularType'] = $feed['meta']['profilerdonation_pledgetypeid_default'];
+        }
+
+        if($feed['meta']['profilerdonation_clientacquisitioncode'] !== "") {
             // Client Acqusition code
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientacquisitioncode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientacquisitioncode']);
-
-        } else if ($feed['meta']['profilerdonation_userdefined_clientacquisitioncode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientacquisitioncode']] = $this->getDonationCode($feed, 'clientacquisitioncode', $form);
-        }
-        
-        if($feed['meta']['profilerdonation_userdefined_donationpurposecode'] !== "" && $feed['meta']['profilerdonation_donationpurposecode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_donationpurposecode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationpurposecode']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_donationtagcode'] !== "" && $feed['meta']['profilerdonation_donationtagcode'] !== "") {
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_donationtagcode']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtagcode']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_gatewaytransactionid'] !== "" && isset($entry['transaction_id'])) {
+            $postData['clientAcquiredReason'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientacquisitioncode']);
+
+        } else {
+            $postData['clientAcquiredReason'] = $this->getDonationCode($feed, 'clientacquisitioncode', $form);
+        }
+        
+        if($feed['meta']['profilerdonation_donationpurposecode'] !== "") {
+            $postData['paymentPupose'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationpurposecode']);
+        }
+
+        if($feed['meta']['profilerdonation_donationtagcode'] !== "") {
+            $postData['paymentTag'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtagcode']);
+        }
+
+        if(isset($entry['transaction_id'])) {
             // Gateway transaction id
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaytransactionid']] = $entry['transaction_id'];
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_gatewaytransactionid'] !== "" && isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'])) {
+            $postData['gatewayResponseId'] = $entry['transaction_id'];
+        }
+
+        if(isset($_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'])) {
             // PayFURL-supplied Gateway Response
             $payfurl_gateway_response = $_POST['payfurl_payment_details']['captured_payment']['payfurl_transaction_id'];
 
             if(!empty($payfurl_gateway_response)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaytransactionid']] = $payfurl_gateway_response;
+                $postData['gatewayResponseId'] = $payfurl_gateway_response;
             }
         }
@@ -743 +693 @@
         }
 
-        if($feed['meta']['profilerdonation_userdefined_clientpreferredcontactmethod'] !== "") {
-            // Client Preferred Contact Method
-            $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientpreferredcontactmethod']] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientpreferredcontactmethod']);
-        }
-
-        if($feed['meta']['profilerdonation_userdefined_clientprivacypreference'] !== "") {
-            // Client Privacy Preference
-
-            $privacy_field_value = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientprivacypreference']);
-
-            if(!empty($privacy_field_value)) {
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_clientprivacypreference']] = 'true';
-            }
-        }
+        // Client Preferred Contact Method
+        $postData['clientPreferredContactMethod'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientpreferredcontactmethod']);
+
+        // Client Privacy Preference
+        $privacy_field_value = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_clientprivacypreference']);
+        if(!empty($privacy_field_value)) {
+            $postData['clientPrivacyPreference'] = 'true';
+        }
+
+        // Comments field
+        $comments = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_comments']);
+
+        if(!empty($feed['meta']['profilerdonation_commentsextra'])) {
+            // Extra text to append to comments field
+            $comments .= GFCommon::replace_variables($feed['meta']['profilerdonation_commentsextra'], $form, $entry, false, true, false, 'text');
+        }
+
+        $comments = html_entity_decode($comments);
+
+        // Only allow ASCII printable characters.
+        // This is a work-around to the API endpoint not allowing some characters
+        $comments = preg_replace('/[^\x20-\x7E]/','', $comments);
+
+        // Comments
+        $postData['comments'] = $comments;
 
         if($this->get_field_value($form, $entry, $feed['meta']['profilerdonation_donationtype']) == "regular") {
             // Recurring donation
-            $postData['datatype'] = "PLG";
-            $postData['pledgetype'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgefreq']);
-
-            if(empty($postData['pledgetype'])) {
+            $postData['dataType'] = "PLG";
+            $postData['pledgeType'] = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_pledgefreq']);
+
+            if(empty($postData['pledgeType'])) {
                 // We assume a monthly pledge if no frequency is specified
-                $postData['pledgetype'] = "monthly";
+                $postData['pledgeType'] = "monthly";
             }
 
-            if($feed['meta']['profilerdonation_userdefined_sourcecode'] !== "") {
-                // If it's recurring, the donation gets the pledge source code instead of the donation code
-                $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']] = $this->getDonationCode($feed, 'pledgesourcecode', $form);
-            }
+            // If it's recurring, the donation gets the pledge source code instead of the donation code
+            $postData['donationSourceCode'] = $this->getDonationCode($feed, 'pledgesourcecode', $form);
 
             // Store the donation type
-            gform_add_meta($entry["id"], "profiler_type", "regular", $form_id);
+            gform_add_meta($entry["id"], "profiler_type", "regular", $form['id']);
 
         } elseif($useAsGateway == false) {
@@ -786 +745 @@
 
             unset($postData['pledgeamount']);
-            unset($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode']]);
-            unset($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgesourcecode']]);
+            unset($postData['regularAcquiredReason']);
+            unset($postData['regularSourceCode']);
 
         } else {
@@ -810 +769 @@
             unset($postData['cardexpiry']);
 
-            $postData['bankaccountname'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountname"]);
-            $postData['bankbsb'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_bsb"]);
-            $postData['bankaccountnumber'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountnumber"]);
+            $postData['bsbAccName'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountname"]);
+            $postData['bsb'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_bsb"]);
+            $postData['bsbAccNum'] = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_bankdebit_accountnumber"]);
             
         } elseif($this->get_field_value($form, $entry, $feed['meta']['profilerdonation_paymentmethod']) == "paypal") {
@@ -829 +788 @@
     public function process_feed_success($feed, $entry, $form, $pfResponse, $postData) {
 
-        if(!isset($pfResponse['dataArray']['status']) || $pfResponse['dataArray']['status'] != "Pass") {
+        if(isset($pfResponse['dataArray']['success']) && $pfResponse['dataArray']['success'] === true) {
+            // Store the Integration ID as meta so we can use it later
+            if(isset($pfResponse['dataArray']['integrationId'])) {
+                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['integrationId'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_integration_guid", $pfResponse['dataArray']['integrationGuid'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_sourcecode", $postData['donationSourceCode'], $form['id']);
+            }
+        } else {
             // Profiler failed. Send the failure email.
-            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']['profiler_erroremailaddress']);
-
-        } else {
-            // Store the Integration ID as meta so we can use it later
-            if(isset($pfResponse['dataArray']['id'])) {
-                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['id'], $form['id']);
-                gform_add_meta($entry["id"], "profiler_sourcecode", $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_sourcecode']], $form['id']);
-            }
-        }
-
+            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']["profiler".$this->gffield_legacyname."_erroremailaddress"]);
+        }
     }
 

profiler-donations-gravityforms/trunk/class-profilermembership-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/Legacy/";
-    protected $apifield_apikey = "apikey";
-    protected $apifield_apipass = "apipass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "membership";
 
@@ -43 +45 @@
         $fields = parent::feed_settings_fields_custom();
 
-        foreach($fields as $fieldKey => $fieldVal) {
-            if($fieldVal['label'] == "Use Profiler As A Gateway?") {
-                $fields[$fieldKey]['choices'][] = array(
-                    'label'         => 'Manual - Profiler will Process Payments, manually later on via a Pledge',
-                    'value'         => 'manual',
-                );
+        if(apply_filters('profiler_integration_allow_profiler_gateway', true) == true) {
+            // This filter allows us to disable the Profiler Gateway feature on a site
+
+            foreach($fields as $fieldKey => $fieldVal) {
+                if($fieldVal['label'] == "Use Profiler As A Gateway?") {
+                    $fields[$fieldKey]['choices'][] = array(
+                        'label'         => 'Manual - Profiler will Process Payments, manually later on via a Pledge',
+                        'value'         => 'manual',
+                    );
+                }
             }
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Number',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_number",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card number in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Expiry',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_expiry",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card expiry in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card CCV',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_ccv",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card CCV in",
+                "choices" => $userdefinedfields,
+            );
+
+            $fields[] = array(
+                "label" => 'UDF: Stored Card Name',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_storedcard_name",
+                "required" => false,
+                "tooltip" => "Pick the Profiler User Defined Field you wish to store the card name in",
+                "choices" => $userdefinedfields,
+            );
+
         }
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Number',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_number",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card number in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Expiry',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_expiry",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card expiry in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card CCV',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_ccv",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card CCV in",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
-            "label" => 'UDF: Stored Card Name',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_storedcard_name",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to store the card name in",
-            "choices" => $userdefinedfields,
-        );
 
         return $fields;

profiler-donations-gravityforms/trunk/class-profilerpostdonate-gfaddon.php

@@ -10 +10 @@
     protected static $_instance = null;
 
-    protected $apifield_endpoint = "/ProfilerAPI/LegacyPost/";
-    protected $apifield_apikey = "api_user";
-    protected $apifield_apipass = "api_pass";
-    protected $apifield_ipaddress = 'udf';
-    protected $apifield_formurl = true;
+    protected $api_type = "json";
+    protected $api_domain = "profilersoftware.com";
+    protected $apifield_endpoint = "/ProfilerAPI/RapidEndpoint/";
+    protected $apifield_apikey = "apiuser";
+    protected $apifield_apipass = "apipassword";
+    protected $apifield_ipaddress = 'requestIPAddress';
+    protected $apifield_formurl = 'pageURL';
     protected $gffield_legacyname = "donation";
     protected $supports_custom_fields = true;
@@ -59 +61 @@
 
         $fields[] = array(
-            "label" => 'UDF: Comments',
-            "type" => "select",
-            "name" => "profilerdonation_userdefined_comments",
-            "required" => false,
-            "tooltip" => "Pick the Profiler User Defined Field you wish to use for the Comments field",
-            "choices" => $userdefinedfields,
-        );
-
-        $fields[] = array(
             "label" => 'Extra Comments Text',
             "type" => "textarea",
             "name" => "profilerdonation_commentsextra",
-            "required" => true,
+            "required" => false,
             "class" => "merge-tag-support",
             "tooltip" => "This is extra text to be sent to Profiler as an Interaction. Protip: Include Gravity Forms Merge Fields in this textarea to accept user input.",
@@ -109 +102 @@
     public function process_feed_custom($feed, $entry, $form, $postData, $fromValidatorProcessPFGateway = false) {
 
-        $postData['method'] = "integration.send";
         $postData['datatype'] = "OLDON";
 
@@ -123 +115 @@
         // Comments
         $postData['comments'] = $comments;
-        $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_comments']] = $comments;
-        
+
         $gfEntryId = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_gfentryid']);
         $pfIntegrationId = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_profilerid']);
@@ -147 +138 @@
 
         // This is the ID of the actual donation entry
-        $postData['HoldingID'] = $pfIntegrationId;
+        $postData['holdingId'] = $pfIntegrationId;
 
         return $postData;
@@ -154 +145 @@
     public function process_feed_success($feed, $entry, $form, $pfResponse, $postData) {
 
-        if(!isset($pfResponse['dataArray']['status']) || $pfResponse['dataArray']['status'] != "Pass") {
+        if(isset($pfResponse['dataArray']['success']) && $pfResponse['dataArray']['success'] === true) {
+            // Store the Integration ID as meta so we can use it later
+            if(isset($pfResponse['dataArray']['integrationId'])) {
+                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['integrationId'], $form['id']);
+                gform_add_meta($entry["id"], "profiler_integration_guid", $pfResponse['dataArray']['integrationGuid'], $form['id']);
+            }
+        } else {
             // Profiler failed. Send the failure email.
-            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']['profiler_erroremailaddress']);
-
-        } else {
-            // Store the Integration ID as meta so we can use it later
-            if(isset($pfResponse['dataArray']['id']))
-                gform_add_meta($entry["id"], "profiler_integrationid", $pfResponse['dataArray']['id'], $form['id']);
+            $this->sendFailureEmail($entry, $form, $pfResponse, $feed['meta']["profiler".$this->gffield_legacyname."_erroremailaddress"]);
         }
-
     }
 

profiler-donations-gravityforms/trunk/index.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: Profiler Donations - Gravity Forms Add-On
+Plugin Name: Gravity Forms + Profiler Add-On
 Plugin URI: https://mediarealm.com.au/
 Description: Integrates Gravity Forms with Profiler, enabling donation data and more to be sent directly to Profiler.
-Version: 2.4.3
+Version: 2.5.0
 
 Author: Media Realm
@@ -66 +66 @@
         //GFAddOn::register('GFProfilerEvents');
 
+        // This is a settings screen to list all Profiler feeds in the system
+        require_once('class-feedlist-gfaddon.php');
+        GFAddOn::register('GF_Profiler_FeedList');
+
         // Include some random helper functions
         require_once(plugin_dir_path(__FILE__) . '/shortcodes.php');

profiler-donations-gravityforms/trunk/readme.txt

@@ -22 +22 @@
 
 == Changelog ==
+
+= 2.5.0 =
+
+This is a substantial update. Please backup your site before upgrading, and test all your integrations thoroughly after upgrading this plugin.
+
+* Use the new Profiler Core API for Donations/payments. This removes the UDF field config and automates it within Profiler.
+* Create 'Profiler Feed List' setting screen, for quick access to all configured feeds on your site
+* Remove Profiler Logs fields, and move these to an entry metabox.
+* Donation Feed: Add Extra Comments field
+* Donation Feed: Automatic formatting of Australian phone numbers
+* Add Profiler icon to all Feeds
+* Donation Feed: Add new fields for gender, interactions, roles, membership mapping and payment split text.
+* Membership Feed: Hide manual payment fields if Profiler-driven payments have been disabled
 
 = 2.4.3 =

profiler-donations-gravityforms/trunk/sync_users.php

@@ -232 +232 @@
 
         if(empty($options['auth_apikey']) || empty($options['auth_apipass']) || empty($options['pf_database']) || empty($options['pf_domain'])) {
-            $this->log("Profiler Users not configured correctly");
             return;
         }

profiler-donations-gravityforms/trunk/woocommerce/integration.php

@@ -23 +23 @@
         $this->dbname                      = $this->get_option( 'dbname' );
         $this->apikey                      = $this->get_option( 'apikey' );
+
+        // Upgrade config to new domain
+        $this->instancedomainname = str_replace(".profilersystem.com", ".profilersoftware.com", $this->instancedomainname);
 
         // Actions.
@@ -54 +57 @@
                 'title'             => 'Profiler Instance Domain Name',
                 'type'              => 'text',
-                'description'       => 'e.g. example.profilersystem.com',
+                'description'       => 'e.g. example.profilersoftware.com',
                 'desc_tip'          => true,
                 'default'           => '',
@@ -85 +88 @@
                 'desc_tip'          => true,
                 'default'           => ''
-            ),
-            'udf_sourcecode' => array(
-                'title'             => 'UDF: Donation Source Code',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
-            ),
-            'udf_clientip' => array(
-                'title'             => 'UDF: Client IP Address',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
-            ),
-            'udf_transactionid' => array(
-                'title'             => 'UDF: Gateway Transaction ID',
-                'type'              => 'select',
-                'description'       => '',
-                'desc_tip'          => true,
-                'default'           => '',
-                'options'           => $this->options_udf(),
             ),
         );
@@ -204 +183 @@
 
         // Build API payload
-        $url = 'https://' . $this->instancedomainname . '/ProfilerAPI/Legacy/';
+        $url = 'https://' . $this->instancedomainname . '/ProfilerAPI/RapidEndpoint/';
         $profiler_data = array(
-            'DB' => $this->dbname,
-            'apikey' => $this->apikey,
-            'apipass' => $this->get_option('apipass'),
-            'method' => 'integration.send',
+            'apiuser' => $this->apikey,
+            'apipassword' => $this->get_option('apipass'),
             'datatype' => 'OLDON',
 
             'amount' => $total,
-            'donationamount' => $total,
-            'sourcecode' => $this->get_option('sourcecode'),
+            'donationAmount' => $total,
+            'donationSourceCode' => $this->get_option('sourcecode'),
             'status' => 'Approved',
 
             'clientname' => $first_name . ' ' . $last_name,
-            'firstname' => $first_name,
+            'firstName' => $first_name,
             'surname' => $last_name,
 
@@ -233 +210 @@
         );
 
-        if($this->get_option('udf_sourcecode') != '') {
-            // Source code as a UDF
-            $profiler_data['userdefined' . $this->get_option('udf_sourcecode')] = $this->get_option('sourcecode');
-        }
+        // Source code as a UDF
+        $profiler_data['donationSourceCode'] = $this->get_option('sourcecode');
 
         if($order->needs_payment()) {
@@ -243 +218 @@
         }
 
-        if($this->get_option('udf_clientip') != '') {
-            // Client IP Address
-            $profiler_data['userdefined' . $this->get_option('udf_clientip')] = $this->get_client_ip_address();
-        }
-
-        if($this->get_option('udf_transactionid') != '') {
-            // Payment Gateway Transaction ID
-            $profiler_data['userdefined' . $this->get_option('udf_transactionid')] = $order->get_transaction_id();
-        }
+        // Client IP Address
+        $profiler_data['requestIPAddress'] = $this->get_client_ip_address();
+
+        // Payment Gateway Transaction ID
+        $profiler_data['gatewayResponseId'] = $order->get_transaction_id();
 
         // Push data to Profiler
@@ -350 +321 @@
 
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url . '?' . http_build_query(array("DB" => $profiler_query['DB'], "Call" => 'submit')));
+        curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Length: ' . strlen(http_build_query($profiler_query))));
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($profiler_query));
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($profiler_query));
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
@@ -386 +357 @@
             "dataSent" => $profiler_query,
             "data" => $result,
-            "dataXML" => simplexml_load_string($result),
-            "dataArray" => json_decode(json_encode((array)simplexml_load_string($result)), 1),
+            "dataArray" => json_decode($result, true),
             "cURLError" => $cURL_error,
             "cURL_SSL_Mode" => $ssl_mode,
         );
-    }
-
-    private function options_udf() {
-        $fields = array("0" => "");
-
-        for($i = 1; $i <= 99; $i++) {
-            $fields[$i] = "User Defined Field " . $i;
-        }
-
-        return $fields;
     }