Changeset 2084732

Timestamp:

05/09/2019 03:42:59 PM (7 years ago)

Author:

travisnorthcutt

Message:

Version 1.1.0

Location:

convertkit-gravity-forms

Files:

• tags/1.1.0 (added)
• tags/1.1.0/components (added)
• tags/1.1.0/components/gravityforms (added)
• tags/1.1.0/components/gravityforms/class-gf-convertkit.php (added)
• tags/1.1.0/components/gravityforms/functions (added)
• tags/1.1.0/components/gravityforms/functions/gravityforms.php (added)
• tags/1.1.0/components/gravityforms/gravityforms.php (added)
• tags/1.1.0/components/gravityforms/views (added)
• tags/1.1.0/components/gravityforms/views/section.php (added)
• tags/1.1.0/convertkit.php (added)
• tags/1.1.0/functions (added)
• tags/1.1.0/functions/convertkit.php (added)
• tags/1.1.0/functions/utility.php (added)
• tags/1.1.0/languages (added)
• tags/1.1.0/languages/convertkit.pot (added)
• tags/1.1.0/readme.txt (added)
• trunk/components/gravityforms/class-gf-convertkit.php (modified) (8 diffs)
• trunk/components/gravityforms/views/section.php (modified) (1 diff)
• trunk/convertkit.php (modified) (3 diffs)
• trunk/functions/convertkit.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

convertkit-gravity-forms/trunk/components/gravityforms/class-gf-convertkit.php

@@ -7 +7 @@
 GFForms::include_feed_addon_framework();
 
+/**
+ * Class GFConvertKit
+ */
 class GFConvertKit extends GFFeedAddOn {
 
@@ -124 +127 @@
                             'name'       => 'n',
                             'label'      => __( 'Name' ),
-                            'required'   => true,
+                            'required'   => false,
                             'field_type' => '',
                         ),
@@ -131 +134 @@
                 ),
                 array(
-                    'name' => 'convertkit_custom_fields',
-                    'label' => '',
-                    'type' => 'dynamic_field_map',
-                    'field_map' => $this->get_custom_fields(),
-                    'disable_custom' => true,
-                ),
-                array(
                     'name'    => 'conditions',
                     'label'   => __( 'Conditional Logic' ),
@@ -146 +142 @@
         );
 
+        $base_fields = $this->maybe_add_custom_field_mapping( $base_fields );
+
         return array( $base_fields );
     }
 
     /**
+     * If the connected account returns custom fields, add custom field mapping to the feed settings
+     * Otherwise, don't insert custom field mapping
+     *
+     * @param array $base_fields
+     *
+     * @return array
+     */
+    public function maybe_add_custom_field_mapping( $base_fields ) {
+        $custom_mapping = array(
+            'name'           => 'convertkit_custom_fields',
+            'label'          => '',
+            'type'           => 'dynamic_field_map',
+            'field_map'      => $this->get_custom_fields(),
+            'disable_custom' => true,
+        );
+
+        if ( $this->get_custom_fields() ) {
+            array_splice( $base_fields['fields'], 3, 0, array( $custom_mapping ) );
+        }
+
+        return $base_fields;
+    }
+
+    /**
      * Get ConvertKit Custom Fields from the API to be used for the dynamic field map
      *
@@ -156 +178 @@
     public function get_custom_fields() {
 
-        $path = 'custom_fields';
-        $query_args = array();
+        $path         = 'custom_fields';
+        $query_args   = array();
         $request_body = null;
         $request_args = array();
-        $fields = array();
+        $fields       = array();
 
         $response = ckgf_convertkit_api_request( $path, $query_args, $request_body, $request_args );
-        $custom_fields = $response['custom_fields'];
-
-        if ( $custom_fields && ! is_wp_error( $custom_fields ) ) {
+
+        // We don't want to do anything if there's an error...
+        if ( is_wp_error( $response ) ) {
+            return $fields;
+        }
+
+        // Or if the `custom_fields` field is empty
+        if ( empty( $response['custom_fields'] ) ) {
+            return $fields;
+        }
+
+        $fields[] = array(
+            'label' => __( 'Choose a ConvertKit Field', 'convertkit' ),
+        );
+
+        foreach ( $response['custom_fields'] as $field ) {
 
             $fields[] = array(
-                'label'     => __( 'Choose a ConvertKit Field', 'convertkit' ),
-                );
-
-            foreach ( $custom_fields as $field ) {
-
-                $fields[] = array(
-                        'value'     => $field['key'],
-                        'label'     => $field['label'],
-                );
-            }
+                'value' => $field['key'],
+                'label' => $field['label'],
+            );
         }
 
@@ -251 +279 @@
 
         if ( is_array( $forms ) && isset( $forms[ $form_id ] ) ) {
-            $form = $forms[ $form_id ];
-
-            return sprintf( '<a href="%s" target="_blank">%s</a>', esc_attr( esc_url( $form['url'] ) ), esc_html( $forms[ $form_id ]['name'] ) );
+            $form_url = sprintf( '%s/forms/designers/%s/edit', CKGF_APP_BASE_URL, $form_id );
+
+            return sprintf( '<a href="%s" target="_blank">%s</a>',
+                            esc_attr( esc_url( $form_url ) ),
+                            esc_html( $forms[ $form_id ]['name'] )
+            );
         } else {
             return __( 'N/A' );
@@ -278 +309 @@
 
         $fields = array();
+
+        $email = $this->get_field_value( $form, $entry, $field_map_e );
+        $name  = $this->get_field_value( $form, $entry, $field_map_n );
 
         $custom_fields = $this->get_custom_fields();
@@ -289 +323 @@
         }
 
-        ckgf_convertkit_api_add_email( $form_id, $entry[ $field_map_e ], $entry[ $field_map_n ], null, $fields );
+        ckgf_convertkit_api_add_email( $form_id, $email, $name, null, $fields );
     }
 

convertkit-gravity-forms/trunk/components/gravityforms/views/section.php

@@ -4 +4 @@
 
 <p>
-    <?php printf(__('If you already have an account, <a href="%s" target="_blank">click here to retrieve your API Key</a>.'), esc_attr(esc_html('https://app.convertkit.com/account/edit'))); ?>
+    <?php printf( __( 'If you already have an account, <a href="%s" target="_blank">click here to retrieve your API Key</a>.' ),
+                  esc_attr( esc_html( CKGF_APP_BASE_URL . '/account/edit' ) ) ); ?>
 </p>

convertkit-gravity-forms/trunk/convertkit.php

@@ -3 +3 @@
  * Plugin Name: Gravity Forms ConvertKit Add-On
  * Description: Integrates Gravity Forms with ConvertKit allowing form submissions to be automatically sent to your ConvertKit account.
- * Version: 1.0.4
+ * Version: 1.1.0
  * Author: ConvertKit
  * Author URI: https://convertkit.com/
@@ -30 +30 @@
 
 if ( ! defined( 'CKGF_VERSION' ) ) {
-    define( 'CKGF_VERSION', '1.0.4' );
+    define( 'CKGF_VERSION', '1.1.0' );
 }
 
@@ -47 +47 @@
 if ( ! defined( 'CKGF_SHORT_TITLE' ) ) {
     define( 'CKGF_SHORT_TITLE', 'ConvertKit' );
+}
+
+if ( ! defined( 'CKGF_API_BASE_URL' ) ) {
+    define( 'CKGF_API_BASE_URL', 'https://api.convertkit.com/v3' );
+}
+
+if ( ! defined( 'CKGF_APP_BASE_URL' ) ) {
+    define( 'CKGF_APP_BASE_URL', 'https://app.convertkit.com' );
 }
 

convertkit-gravity-forms/trunk/functions/convertkit.php

@@ -17 +17 @@
 function ckgf_convertkit_api_request( $path, $query_args = array(), $request_body = null, $request_args = array() ) {
     $path        = ltrim( $path, '/' );
-    $request_url = "https://api.convertkit.com/v3/{$path}";
+    $request_url = sprintf( '%s/%s', CKGF_API_BASE_URL,  $path );
 
     $request_args = array_merge(array(

convertkit-gravity-forms/trunk/readme.txt

@@ -1 +1 @@
 === Gravity Forms ConvertKit Add-On ===
-Contributors: nathanbarry, growdev
+Contributors: nathanbarry, growdev, travisnorthcutt
 Donate link: https://convertkit.com
 Tags: email, marketing, embed form, convertkit, capture
 Requires at least: 3.6
-Tested up to: 4.9.4
-Stable tag: 1.0.4
+Tested up to: 5.2
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -39 +39 @@
 == Changelog ==
 
+### 1.1.0  2019-06-09
+
+* Correctly send full name to ConvertKit when used in a field mapping
+* Only show field mappings for ConvertKit custom fields if they exist
+* Output correct form URL on feed settings screen
+* No longer requires a name field mapping, for email-only forms
+
 ### 1.0.4  2018-03-14