Changeset 2618947

Timestamp:

10/24/2021 06:58:21 AM (4 years ago)

Author:

anthonyeden

Message:

Version 2.1.0

Location:

profiler-donations-gravityforms

Files:

• assets/banner-1544x500.png (modified) (previous)
• assets/banner-772x250.png (modified) (previous)
• assets/icon-128x128.png (modified) (previous)
• assets/icon-256x256.png (modified) (previous)
• trunk/class-profilercommon.php (modified) (11 diffs)
• trunk/class-profilerdonate-gfaddon.php (modified) (11 diffs)
• trunk/class-profilerinteraction-gfaddon.php (modified) (2 diffs)
• trunk/class-profilerlists-gfaddon.php (modified) (1 diff)
• trunk/class-profilerpostdonate-gfaddon.php (modified) (5 diffs)
• trunk/index.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)

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

@@ -14 +14 @@
     protected $gffield_legacyname = "";
     protected $supports_custom_fields = false;
+    protected $supports_mailinglists = false;
 
     public function init() {
         parent::init();
+
+        // Stripe - force Customer creation
+        add_filter('gform_stripe_customer_id',              array($this, 'stripe_customer_id'), 10, 4);
+        add_action('gform_stripe_customer_after_create',    array($this, 'stripe_customer_id_save'), 10, 4);
+        add_filter('gform_stripe_charge_pre_create',        array($this, 'stripe_payment_intent'), 10, 5);
     }
 
@@ -28 +34 @@
         $hiddenFields = $this->hiddenFields();
         $checkboxRadioFields = $this->checkboxRadioFields();
+        $checkboxFields = $this->checkboxFields();
         $userdefinedfields = $this->userDefinedFields();
-        $customfields = $this->custom_fields_get();
 
         $numbers = array();
@@ -112 +118 @@
         }
 
+        // Mailing list support
+        if($this->supports_mailinglists === true) {
+            $fields[] = array(
+                "label" => 'Number of Mailing Lists',
+                "type" => "select",
+                "name" => "profiler".$this->gffield_legacyname."_mailinglist_count",
+                "required" => false,
+                "tooltip" => "Select a quantity of Mailing Lists, save this page, and then configure them. You will need to refresh this page after saving to see the extra fields.",
+                "choices" => $numbers,
+                "default" => 0,
+            );
+
+            for($i = 1; $i <= $feed['meta']['profiler'.$this->gffield_legacyname.'_mailinglist_count']; $i++) {
+                // Loop over mailing list fields
+
+                $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',
+                    "type" => "text",
+                    "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_udftext",
+                    "required" => false,
+                    "tooltip" => "Enter the string Profiler is expecting in this UDF",
+                );
+
+                $fields[] = array(
+                    "label" => 'Mailing List #'.$i.': Field',
+                    "type" => "select",
+                    "name" => "profiler".$this->gffield_legacyname."_mailinglist_".$i."_field",
+                    "tooltip" => 'Link it to a checkbox field - when checked, the mailing will be sent',
+                    "required" => false,
+                    "choices" => $checkboxFields
+                );
+            }
+        }
+
         if($this->supports_custom_fields === true) {
             $fields[] = array(
@@ -118 +167 @@
                 "name" => "profiler_customfields_count",
                 "required" => false,
-                "tooltip" => "How many custom fields do you want to send back to Profiler?",
+                "tooltip" => "How many custom fields do you want to send back to Profiler? You will need to refresh this page after saving to see the extra fields.",
                 "choices" => $numbers,
             );
@@ -126 +175 @@
 
                 $fields[] = array(
-                    "label" => 'Custom Field #'.$i.': Profiler Field',
+                    "label" => 'Custom Field #'.$i.': UDF',
                     "type" => "select",
                     "name" => "profiler_customfield_".$i."_pffield",
                     "required" => false,
-                    "tooltip" => "Pick the field in Profiler you wish to use",
-                    "choices" => $customfields,
+                    "tooltip" => "Pick the UDF field in Profiler you wish to use",
+                    "choices" => $userdefinedfields,
                 );
 
@@ -234 +283 @@
         }
 
-        if($this->apifield_formurl === true && !empty($feed['meta']['profiler_userdefined_clientip'])) {
-            $postData['userdefined' . $feed['meta']['profiler'.$this->gffield_legacyname.'_userdefined_clientip']] = $entry['source_url'];
+        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'];
+        }
+
+        if(substr($entry['transaction_id'], 0, 3) == "pi_") {
+            // Stripe Payment - find the Customer ID and Card ID, and pass it to the PF API
+
+            try {
+                if ( ! class_exists( '\Stripe\Stripe' ) ) {
+                    require_once( plugin_dir_path( __DIR__ ) . 'gravityformsstripe/includes/autoload.php' );
+                }
+
+                // Set Stripe API key.
+                $stripe_options = get_option('gravityformsaddon_gravityformsstripe_settings');
+                \Stripe\Stripe::setApiKey( $stripe_options[$stripe_options['api_mode'] . '_secret_key'] );
+                
+                // Get the Payment Intent
+                $payment_intent = \Stripe\PaymentIntent::retrieve($entry['transaction_id']);
+
+            } catch(Exception $e) {
+                error_log("STRIPE/PROFILER SETUP ERROR: " . print_r($e, true));
+            }
+
+            if($feed['meta']['profilerdonation_userdefined_gatewaycustomerid'] !== "" && 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)) {
+                // Gateway Card Token
+                try {
+                    $postData['userdefined' . $feed['meta']['profilerdonation_userdefined_gatewaycardtoken']] = $payment_intent->charges->data[0]->payment_method;
+                } catch(Exception $e) {
+                    error_log("STRIPE/PROFILER CARD TOKEN ERROR: " . print_r($e, true));
+                }
+            }
         }
 
@@ -241 +324 @@
         if($this->supports_custom_fields === true && !empty($feed['meta']['profiler_customfields_count'])) {
             for($i = 1; $i <= $feed['meta']['profiler_customfields_count']; $i++) {
-                $postData["custom_" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+                $postData["userdefined" . $feed['meta']["profiler_customfield_".$i."_pffield"]] = trim($this->get_field_value($form, $entry, $feed['meta']["profiler_customfield_".$i."_gffield"]));
+            }
+        }
+
+        // Calculate mailing list subscriptions
+        if($this->supports_mailinglists === true && isset($feed['meta']['profiler'.$this->gffield_legacyname.'_mailinglist_count']) && is_numeric($feed['meta']['profiler'.$this->gffield_legacyname.'_mailinglist_count'])) {
+            for($i = 1; $i <= $feed['meta']['profiler'.$this->gffield_legacyname.'_mailinglist_count']; $i++) {
+                // 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;
+                }
+
             }
         }
@@ -392 +490 @@
     }
 
+    protected function checkboxFields() {
+        // Returns an array of checkbox fields
+
+        $form = $this->get_current_form();
+        $fields = $form['fields'];
+
+        // An array holding all the hidden fields on the form - will be returned
+        $formfields = array(
+            array(
+                "value" => "",
+                "label" => ""
+            )
+        );
+
+        foreach ($fields as $key => $field) {
+            if ($field['type'] == 'checkbox') {
+                foreach($field['inputs'] as $input) {
+                    $formfields[] = array(
+                        "value" => $input['id'],
+                        "label" => "Field #" . $input['id'] . " - " . $field['label'] . " / " . $input['label']
+                    );
+                }
+            }
+        }
+
+        return $formfields;
+    }
+
     protected function selectFields() {
         // Returns an array of checkbox and radio fields
@@ -584 +710 @@
         $result = parent::save_feed_settings($feed_id, $form_id, $settings);
 
-        $this->custom_fields_cache();
-
         return $result;
-
-    }
-
-    private function custom_fields_cache() {
-        // Call this function to update the cached list of custom fields
-
-        if($this->supports_custom_fields !== true) {
-            return false;
-        }
-
-        // Data from Profiler is stored in here
-        $data = array();
-
-        $feed = $this->get_current_feed();
-
-        // All the POST data for Profiler gets stored in this variable
-        $postData = array();
-
-        $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'];
-
-        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";
-        }
-
-        if(empty($postData['DB']) || empty($postData[$this->apifield_apikey]) || empty($postData[$this->apifield_apipass]) || empty($feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'])) {
-            return false;
-        }
-
-        // Build the URL for this API call
-        $API_URL = "https://" . $feed['meta']['profiler'.$this->gffield_legacyname.'_instancedomainname'] . '/ProfilerAPI/system/customfields/';
-
-        // Send request to Profiler
-        $pfResponse = $this->sendDataToProfiler($API_URL, $postData, $feed['meta']['profiler_sslmode']);
-
-        // Loop over all the returned fields and pop them into the array of data to be saved
-        if(isset($pfResponse['dataArray']['field']) && count($pfResponse['dataArray']['field']) > 0) {
-            foreach($pfResponse['dataArray']['field'] as $field) {
-                $data[] = array(
-                    'id' => $field['id'],
-                    'field_name' => $field['field_name'],
-                    'friendly_name' => $field['friendly_name'],
-                    'field_category' => $field['field_category'],
-                    'sortorder' => $field['sortorder'],
-                );
-            }
-
-            // Update the cached data
-            update_option('profilergf_'.$this->get_current_feed_id().'_customfields', $data);
-        }
-
-    }
-
-    protected function custom_fields_get() {
-        // Returns a list of all custom fields (from the cache)
-
-        if($this->supports_custom_fields !== true) {
-            return false;
-        }
-
-        $fields = get_option('profilergf_'.$this->get_current_feed_id().'_customfields', array());
-
-        $formfields = array(
-            array(
-                "value" => "",
-                "label" => ""
-            )
-        );
-
-        foreach($fields as $field) {
-            $formfields[] = array(
-                "value" => $field['id'],
-                "label" => $field['field_name'] . ": " . $field['friendly_name'],
-            );
-        }
-
-        return $formfields;
 
     }
@@ -774 +819 @@
     }
 
-    protected function enable_creditcard($is_enabled) {
+    public function enable_creditcard($is_enabled) {
         return true;
     }
@@ -822 +867 @@
     }
 
+    public function stripe_customer_id($customer_id, $feed, $entry, $form) {
+        // Create a new customer in Stripe
+
+        // Find email address field
+        foreach($form['fields'] as &$field) {
+            if($field->type == "email") {
+                $email = $this->get_field_value($form, $entry, $field->id);
+            }
+        }
+
+        // Find name field on form
+        $name = '';
+        foreach($form['fields'] as $fieldKey => $field) {
+            if($field->type == "name") {
+                $name = $entry[$field->id . '.3'] . ' ' . $entry[$field->id . '.6'];
+            }
+        }
+
+        if(!isset($email)) {
+            return $customer_id;
+        }
+
+        if(class_exists('\Stripe\Customer')) {
+            // Find an existing customer by email
+            $stripe_all_customers = \Stripe\Customer::all(array(
+                'email' => $email,
+                'limit' => 1
+            ));
+
+            if(isset($stripe_all_customers['data'][0]['id'])) {
+                // Update the name of the customer
+                if(!empty($name)) {
+                    $update = \Stripe\Customer::update(
+                        $stripe_all_customers['data'][0]['id'],
+                        array(
+                            'name' => $name
+                        )
+                    );
+                }
+
+                // Return existing customer ID
+                return $stripe_all_customers['data'][0]['id'];
+            }
+        }
+
+        // Create a new customer
+        $customer_meta = array();
+        $customer_meta['description'] = $email_address . ' ' . $name;
+        $customer_meta['name'] = $name;
+        $customer_meta['email'] = $email_address;
+
+        $customer = gf_stripe()->create_customer($customer_meta, $feed, $entry, $form);
+        return $customer->id;
+    }
+
+    public function stripe_customer_id_save($customer, $feed, $entry, $form) {
+        // Get the new Stripe Customer ID and save for later use
+        gform_update_meta($entry['id'], 'stripe_customer_id', $customer->id);
+        return $customer;
+    }
+
+    public function stripe_payment_intent($charge_meta, $feed, $submission_data, $form, $entry) {
+        $charge_meta['setup_future_usage'] = 'off_session';
+        return $charge_meta;
+    }
 }
 

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

@@ -16 +16 @@
     protected $apifield_formurl = true;
     protected $gffield_legacyname = "donation";
+    protected $supports_custom_fields = true;
+    protected $supports_mailinglists = true;
 
     public static function get_instance() {
@@ -63 +65 @@
         $checkboxRadioFields = self::$_instance->checkboxRadioFields();
         $userdefinedfields = self::$_instance->userDefinedFields();
-
-        $mailingnumbers = array();
-        for($i = 0; $i <= 99; $i++) {
-            $mailingnumbers[] = array(
-                "value" => $i,
-                "label" => $i
-            );
-        }
 
         // All the fields to add to the feed:
@@ -137 +131 @@
             "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,
+        );
+
+        $fields[] = array(
+            "label" => 'Pledge Type ID',
+            "type" => "select",
+            "name" => "profilerdonation_pledgetypeid",
+            "required" => false,
+            "choices" => $field_settings,
+            "tooltip" => "Set this field to the Pledge Type ID"
+        );
+
+        $fields[] = array(
+            "label" => 'Pledge Type ID (Default)',
+            "type" => "text",
+            "name" => "profilerdonation_pledgetypeid_default",
+            "required" => false,
+            "tooltip" => "Set a default Pledge Type ID, in case the above field isn't set"
+        );
+
         $fields[] = array(
             "label" => 'Client: Title',
@@ -450 +470 @@
 
         $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,
+        );
+        
+        $fields[] = array(
+            "label" => 'Client Preferred Contact Method Field',
+            "type" => "select",
+            "name" => "profilerdonation_clientpreferredcontactmethod",
+            "required" => false,
+            "tooltip" => "This field's value should match one of these codes: E = Email; P = Post; T = Phone; S = SMS; N = No Contact Preferred",
+            "choices" => $field_settings
+        );
+
+        $fields[] = array(
             "label" => 'UDF: Client IP Address',
             "type" => "select",
@@ -477 +515 @@
 
         $fields[] = array(
-            "label" => 'Payment Gateway ID Used',
+            "label" => 'Payment Gateway ID Used (Field)',
             "type" => "select",
             "name" => "profilerdonation_paymentgatewayidused",
@@ -486 +524 @@
 
         $fields[] = array(
-            "label" => 'Number of Mailing Lists',
-            "type" => "select",
-            "name" => "profilerdonation_mailinglist_count",
-            "required" => false,
-            "tooltip" => "Select a quantity of Mailing Lists, save this page, and then configure them. You may need to refresh this page after saving to see the extra fields.",
-            "choices" => $mailingnumbers,
-            "default" => 0,
-        );
-
-        for($i = 1; $i <= $feed['meta']['profilerdonation_mailinglist_count']; $i++) {
-            // Loop over mailing list fields
-
+            "label" => 'Payment Gateway ID Used (Default)',
+            "type" => "text",
+            "name" => "profilerdonation_paymentgatewayidused_default",
+            "required" => false,
+            "tooltip" => "Specify a default Payment Gateway ID to send through to Profiler",
+            "choices" => $field_settings
+        );
+
+        if(function_exists('gf_stripe')) {
+            // Stripe only fields
             $fields[] = array(
-                "label" => 'Mailing List #'.$i.': UDF',
+                "label" => 'UDF: Payment Gateway Card Token',
                 "type" => "select",
-                "name" => "profilerdonation_mailinglist_".$i."_udf",
+                "name" => "profilerdonation_userdefined_gatewaycardtoken",
                 "required" => false,
-                "tooltip" => "Pick the Profiler User Defined Field you wish to use for this mailing",
+                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Card Token to",
                 "choices" => $userdefinedfields,
             );
-
+    
             $fields[] = array(
-                "label" => 'Mailing List #'.$i.': UDF Text',
-                "type" => "text",
-                "name" => "profilerdonation_mailinglist_".$i."_udftext",
+                "label" => 'UDF: Payment Gateway Customer ID',
+                "type" => "select",
+                "name" => "profilerdonation_userdefined_gatewaycustomerid",
                 "required" => false,
-                "tooltip" => "Enter the string Profiler is expecting in this UDF",
+                "tooltip" => "Pick the Profiler User Defined Field you wish to send the payment gateway Customer ID to",
+                "choices" => $userdefinedfields,
             );
-
-            $fields[] = array(
-                "label" => 'Mailing List #'.$i.': Field',
-                "type" => "select",
-                "name" => "profilerdonation_mailinglist_".$i."_field",
-                "tooltip" => 'Link it to a checkbox field - when checked, the mailing will be sent',
-                "required" => false,
-                "choices" => $checkboxFields
-            );
-        }
-
+        }
 
 
@@ -531 +558 @@
     }
 
-    public function process_feed_custom($feed, $entry, $form, $postData, $fromValidatorProcessPFGateway = false) {
+    public function process_feed_custom($feed, $entry, $form, $postData, $fromValidatorProcessPFGateway = false, $forceSendCard = false) {
         // Processes the feed and prepares to send it to Profiler
         // This can either do a gateway payment, or just an integration
@@ -591 +618 @@
             // 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'];
+            }
         }
 
@@ -631 +663 @@
         }
 
+        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'] !== "") {
             // Client Acqusition code
@@ -652 +694 @@
         }
 
-        // Calculate mailing list subscriptions
-        if(isset($feed['meta']['profilerdonation_mailinglist_count']) && is_numeric($feed['meta']['profilerdonation_mailinglist_count'])) {
-            for($i = 1; $i <= $feed['meta']['profilerdonation_mailinglist_count']; $i++) {
-                // Loop over mailing list fields
-                $mailingFieldValue = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_mailinglist_".$i."_field"]);
-                $udf = $feed['meta']["profilerdonation_mailinglist_".$i."_udf"];
-                $udfText = $feed['meta']["profilerdonation_mailinglist_".$i."_udftext"];
-
-                if(!empty($udf) && !empty($udfText) && !empty($mailingFieldValue)) {
-                    $postData['userdefined' . $udf] = $udfText;
-                }
-
-            }
+        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']);
         }
         
@@ -687 +719 @@
         } elseif($useAsGateway == false) {
             // Once-off donation (not using Profiler as the gateway)
-            $postData['cardnumber'] = "4444333322221111"; //PF expects a card number and expiry even for once-offs which have already been processed
-            $postData['cardexpiry'] = date("m") . " " . date("Y");
-            $postData['ccv'] = "";
+            
+            if($forceSendCard == false) {
+                $postData['cardnumber'] = "4444333322221111"; //PF expects a card number and expiry even for once-offs which have already been processed
+                $postData['cardexpiry'] = date("m") . " " . date("Y");
+                $postData['ccv'] = "";
+            }
+
             unset($postData['pledgeamount']);
             unset($postData['userdefined' . $feed['meta']['profilerdonation_userdefined_pledgeacquisitioncode']]);

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

@@ -11 +11 @@
 
     protected $apifield_endpoint = "/ProfilerAPI/interaction/";
-    protected $apifield_apikey = "apiuser";
+    protected $apifield_apikey = "apikey";
     protected $apifield_apipass = "apipass";
     protected $apifield_ipaddress = 'udf';
     protected $apifield_formurl = true;
     protected $gffield_legacyname = "interaction";
+    protected $supports_custom_fields = true;
+    protected $supports_mailinglists = true;
 
     public static function get_instance() {
@@ -59 +61 @@
         );
 
-        $mailingnumbers = array();
-        for($i = 0; $i <= 99; $i++) {
-            $mailingnumbers[] = array(
-                "value" => $i,
-                "label" => $i
-            );
-        }
-
         // All the fields to add to the feed:
         $fields = array();

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

@@ -13 +13 @@
     protected $apifield_apikey = "apikey";
     protected $apifield_apipass = "apipass";
+    protected $supports_custom_fields = true;
 
     public static function get_instance() {

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

@@ -16 +16 @@
     protected $apifield_formurl = true;
     protected $gffield_legacyname = "donation";
+    protected $supports_custom_fields = true;
+    protected $supports_mailinglists = true;
 
     public static function get_instance() {
@@ -43 +45 @@
         $userdefinedfields = self::$_instance->userDefinedFields();
 
-        $mailingnumbers = array();
-        for($i = 0; $i <= 99; $i++) {
-            $mailingnumbers[] = array(
-                "value" => $i,
-                "label" => $i
-            );
-        }
-
         // All the fields to add to the feed:
         $fields = array();
@@ -72 +66 @@
 
         $fields[] = array(
-            "label" => 'Number of Mailing Lists',
-            "type" => "select",
-            "name" => "profilerdonation_mailinglist_count",
-            "required" => false,
-            "tooltip" => "Select a quantity of Mailing Lists, save this page, and then configure them. You may need to refresh this page after saving to see the extra fields.",
-            "choices" => $mailingnumbers,
-            "default" => 0,
+            "label" => 'Extra Comments Text',
+            "type" => "textarea",
+            "name" => "profilerdonation_commentsextra",
+            "required" => true,
+            "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.",
         );
-
-        for($i = 1; $i <= $feed['meta']['profilerdonation_mailinglist_count']; $i++) {
-            // Loop over mailing list fields
-
-            $fields[] = array(
-                "label" => 'Mailing List #'.$i.': UDF',
-                "type" => "select",
-                "name" => "profilerdonation_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',
-                "type" => "text",
-                "name" => "profilerdonation_mailinglist_".$i."_udftext",
-                "required" => false,
-                "tooltip" => "Enter the string Profiler is expecting in this UDF",
-            );
-
-            $fields[] = array(
-                "label" => 'Mailing List #'.$i.': Field',
-                "type" => "select",
-                "name" => "profilerdonation_mailinglist_".$i."_field",
-                "tooltip" => 'Link it to a checkbox field - when checked, the mailing will be sent',
-                "required" => false,
-                "choices" => $checkboxRadioFields
-            );
-        }
 
         $fields[] = array(
@@ -147 +110 @@
         $postData['datatype'] = "OLDON";
 
+        $comments = $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_comments']);
+
+        $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]/','', $this->get_field_value($form, $entry, $feed['meta']['profilerdonation_comments']));
+        $comments = preg_replace('/[^\x20-\x7E]/','', $comments);
 
         // Comments
@@ -179 +147 @@
         $postData['HoldingID'] = $pfIntegrationId;
 
-        // Calculate mailing list subscriptions
-        for($i = 1; $i <= $feed['meta']['profilerdonation_mailinglist_count']; $i++) {
-            // Loop over mailing list fields
-            $mailingFieldValue = $this->get_field_value($form, $entry, $feed['meta']["profilerdonation_mailinglist_".$i."_field"]);
-            $udf = $feed['meta']["profilerdonation_mailinglist_".$i."_udf"];
-            $udfText = $feed['meta']["profilerdonation_mailinglist_".$i."_udftext"];
-
-            if(!empty($udf) && !empty($udfText) && !empty($mailingFieldValue)) {
-                $postData['userdefined' . $udf] = $udfText;
-            }
-
-        }
-
         return $postData;
     }

profiler-donations-gravityforms/trunk/index.php

@@ -4 +4 @@
 Plugin URI: http://mediarealm.com.au/
 Description: Integrates Gravity Forms with Profiler, enabling donation data and more to be sent directly to Profiler.
-Version: 2.0.0
+Version: 2.1.0
 
 Author: Media Realm
@@ -30 +30 @@
 class ProfilerDonation_GF_Launch {
     public static function ProfilerDonation_load() {
-        
+
         if (!class_exists('GFForms') || !method_exists('GFForms', 'include_payment_addon_framework')) {
             return;
@@ -57 +57 @@
         GFAddOn::register('GFProfilerListsBasic');
 
+        require_once('class-profilermembership-gfaddon.php');
+        GFAddOn::register('GFProfilerMembership');
+
+        require_once('class-profilerupdate-gfaddon.php');
+        GFAddOn::register('GFProfilerUpdate');
+
         //require_once('class-profilerevents-gfaddon.php');
         //GFAddOn::register('GFProfilerEvents');
-        
+
         // Include some random helper functions
-        require_once('shortcodes.php');
-        require_once('states_australia.php');
-        require_once('cardprocess.php');
+        require_once(plugin_dir_path(__FILE__) . '/shortcodes.php');
+        require_once(plugin_dir_path(__FILE__) . '/states_australia.php');
+        require_once(plugin_dir_path(__FILE__) . '/cardprocess.php');
+
+        // Feature to allow importing user accounts from Profiler
+        require_once(plugin_dir_path(__FILE__) . '/sync_users.php');
+
+        // Feature to allow importing Organisations from Profiler
+        require_once(plugin_dir_path(__FILE__) . '/sync_orgtype.php');
         
         if(isset($_POST['gform_submit'])) {

profiler-donations-gravityforms/trunk/readme.txt

@@ -3 +3 @@
 Tags: gravity-forms, fundraising, crm, donation, profiler
 Requires at least: 5.0
-Tested up to: 5.4.1
+Tested up to: 5.8.1
 Stable tag: trunk
-Requires PHP: 7.0.0
+Requires PHP: 7.2.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -22 +22 @@
 
 == Changelog ==
+
+= 2.1.0 =
+
+* CAUTION: This is a major update. Please take a backup before upgrading, and test your forms thoroughly after performing the update.
+* New Feature: Import Profiler Subscribers as Wordpress Users
+* New Feature: Import Organisation to a CPT, in order to create a Directory of organisations
+* New Feature: Membership Sign-ups & Renewals
+* New Feature: Update Details for existing Profiler Clients
+* New Feature: Send Custom Fields to Profiler UDFs in many types of data feeds
+* New Feature: Stripe Customer & Card compatibility
+* Various bug fixes and minor changes
 
 = 2.0.0 =