3.0.6

zackkatz · zackkatz · commit c909b5eff77e · 2014-07-19T19:41:32.000-06:00
* Added: Enabled Merge Tag field value support ([issue #97](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/ 97)) * Added [API Add-on]: "Form Title" as an option for mapping form fields * Fixed: Form details were not being properly passed ([issue #94](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/ 94)) * Fixed: DaddyAnalytics API names were incorrect for the API integration * Fixed: PHP warning about calling static functions * Added: Additional Debugging
diff --git a/trunk/inc/daddy_analytics.addon.php b/trunk/inc/daddy_analytics.addon.php
@@ -70,7 +70,7 @@ function __construct() {
 
 		function filter_web_to_lead_merge_vars($merge_vars, $form, $entry) {
 
-			KWSGFWebToLeadAddon::log_debug('DA::filter_web_to_lead_merge_vars() - Starting adding DA data to merge vars.');
+			do_action('kwsgfwebtoleadaddon_log_debug', 'DA::filter_web_to_lead_merge_vars() - Starting adding DA data to merge vars.');
 
 			// Get the $_POST data for the inserted fields
 			$submitted_token = rgpost(esc_attr($this->token), true);
@@ -80,7 +80,7 @@ function filter_web_to_lead_merge_vars($merge_vars, $form, $entry) {
 			$merge_vars[esc_attr($this->url)] = $submitted_url;
 			$merge_vars[esc_attr($this->token)] = $submitted_token;
 
-			KWSGFWebToLeadAddon::log_debug("DA::filter_api_merge_vars() - Added DA data to merge vars. Token: {$submitted_token} and Url: {$submitted_url}");
+			do_action('kwsgfwebtoleadaddon_log_debug', "DA::filter_api_merge_vars() - Added DA data to merge vars. Token: {$submitted_token} and Url: {$submitted_url}");
 
 			return $merge_vars;
 		}
@@ -105,8 +105,8 @@ function filter_api_merge_vars($merge_vars, $form, $entry, $feed, $api ) {
 			$submitted_url = rgpost(esc_attr($this->url), true);
 
 			// Use defaults if not set yet, somehow.
-			$url_api_name = empty($this->url_api_name) ? 'DaddyAnalytics_Web_to_Lead_URL__c' : $this->url_api_name;
-			$token_api_name = empty($this->token_api_name) ? 'DaddyAnalytics_DA_Token__c' : $this->token_api_name;
+			$url_api_name = empty($this->url_api_name) ? 'DaddyAnalytics__DA_Web_to_Lead_URL__c' : $this->url_api_name;
+			$token_api_name = empty($this->token_api_name) ? 'DaddyAnalytics__DA_Token__c' : $this->token_api_name;
 
 			// Add the data to be pushed.
 			$merge_vars[esc_attr($url_api_name)] = $submitted_url;
@@ -225,14 +225,14 @@ public function plugin_settings_fields() {
 							"name"    => "daddy_analytics_webtolead_url_api_name",
 							"label"   => __("Web-to-Lead URL API Name", "gravity-forms-salesforce"),
 							"type"    => "text",
-							"default_value" => 'DaddyAnalytics_Web_to_Lead_URL__c',
+							"default_value" => 'DaddyAnalytics__DA_Web_to_Lead_URL__c',
 							"class"   => "large code",
 						),
 						array(
 							"name"    => "daddy_analytics_token_api_name",
 							"label"   => __("Daddy Analytics Token API Name", "gravity-forms-salesforce"),
 							"type"    => "text",
-							"default_value" => 'DaddyAnalytics_DA_Token__c',
+							"default_value" => 'DaddyAnalytics__DA_Token__c',
 							"class"   => "large code",
 						),
 						array(
diff --git a/trunk/inc/kwsaddon.php b/trunk/inc/kwsaddon.php
@@ -777,16 +777,29 @@ public function process_feed( $feed, $entry, $form ) {
 
         protected function get_merge_vars_from_entry($feed, $entry, $form) {
 
+            $this->log_debug( 'All Feed Meta: '.print_r( $feed["meta"], true ) );
+
             $merge_vars = array();
             foreach($feed["meta"] as $var_tag => $field_id){
 
-                if(empty($field_id) || strpos($var_tag, 'feed_condition') !== false) { continue; }
+                if(empty($field_id) || strpos($var_tag, 'feed_condition') !== false) {
+                    $this->log_debug( '[get_merge_vars_from_entry]: Feed field not defined for field ID '.$var_tag );
+                    continue;
+                }
 
                 $var_tag = str_replace('field_map__', '', $var_tag);
 
-                $field = RGFormsModel::get_field($form, $field_id);
+                if( !is_numeric( $field_id ) ) {
 
-                $value = RGFormsModel::get_lead_field_value($entry, $field);
+                    $value = GFCommon::replace_variables( '{'.$field_id.'}' , $form, $entry, false, false, false );
+
+                } else {
+
+                    $field = RGFormsModel::get_field($form, $field_id);
+
+                    $value = RGFormsModel::get_lead_field_value($entry, $field);
+
+                }
 
                 // If the value is multi-part, like a name or address, there will be an array
                 // returned. In that case, we check the array for the key of the field id.
diff --git a/trunk/inc/salesforce-api.php b/trunk/inc/salesforce-api.php
@@ -785,10 +785,10 @@ private static function list_page(){
 									<th scope="row" class="check-column"><input type="checkbox" name="feed[]" value="<?php echo $setting["id"] ?>"/></th>
 									<td><img src="<?php echo self::get_base_url() ?>/assets/images/active<?php echo intval($setting["is_active"]) ?>.png" alt="<?php echo $setting["is_active"] ? __("Active", "gravity-forms-salesforce") : __("Inactive", "gravity-forms-salesforce");?>" title="<?php echo $setting["is_active"] ? __("Active", "gravity-forms-salesforce") : __("Inactive", "gravity-forms-salesforce");?>" onclick="ToggleActive(this, <?php echo $setting['id'] ?>); " /></td>
 									<td class="column-title">
-										<a href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php echo $setting["form_title"] ?></a>
+										<a href="admin.php?page=gf_salesforce&amp;view=edit&amp;id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php echo esc_html( $setting["form_title"] ); ?></a>
 										<div class="row-actions">
 											<span class="edit">
-											<a title="Edit this setting" href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php _e("Edit", "gravity-forms-salesforce") ?></a>
+											<a title="Edit this setting" href="admin.php?page=gf_salesforce&amp;view=edit&amp;id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php _e("Edit", "gravity-forms-salesforce") ?></a>
 											|
 											</span>
 
@@ -1847,6 +1847,8 @@ public static function get_form_fields($form_id){
 		array_push($form["fields"],array("id" => "date_created" , "label" => __("Entry Date", "gravity-forms-salesforce")));
 		array_push($form["fields"],array("id" => "ip" , "label" => __("User IP", "gravity-forms-salesforce")));
 		array_push($form["fields"],array("id" => "source_url" , "label" => __("Source Url", "gravity-forms-salesforce")));
+		array_push($form["fields"],array("id" => "form_title" , "label" => __("Form Title", "gravity-forms-salesforce")));
+
 
 		if(is_array($form["fields"])){
 			foreach($form["fields"] as $field){
@@ -2082,7 +2084,7 @@ private static function process_merge_vars($entry, $form, $feed) {
 							$value = htmlspecialchars($entry[$field_id]);
 					}
 
-					$merge_vars[$var_tag] = $value;
+					$merge_vars[$var_tag] = GFCommon::replace_variables($value, $form, $entry, false, false, false );
 
 			} else {
 
@@ -2093,7 +2095,10 @@ private static function process_merge_vars($entry, $form, $feed) {
 							$elements[] = htmlspecialchars($value);
 						}
 					}
-					$merge_vars[$var_tag] = implode(';',array_map('htmlspecialchars', $elements));
+
+					$value = implode(';',array_map('htmlspecialchars', $elements));
+
+					$merge_vars[$var_tag] = GFCommon::replace_variables($value, $form, $entry, false, false, false );
 				}
 			}
 
diff --git a/trunk/inc/web-to-lead.php b/trunk/inc/web-to-lead.php
@@ -35,6 +35,9 @@ function __construct() {
 
 			$this->_version = KWS_GF_Salesforce::version;
 
+			add_action('kwsgfwebtoleadaddon_log_debug', array( $this, 'log_debug' ));
+			add_action('kwsgfwebtoleadaddon_log_error', array( $this, 'log_error' ));
+
 			parent::__construct();
 
 		}
@@ -386,17 +389,23 @@ public function process_feed( $feed, $entry, $form ) {
 
 			try {
 
+				foreach ($feed['meta'] as $key => $value) {
+					// The field names have a trailing underscore for some reason.
+					$trimmed_key = ltrim($key, '_');
+					$feed['meta'][ $trimmed_key ] = $value;
+					unset( $feed['meta'][$key] );
+				}
+
 				$temp_merge_vars = $this->get_merge_vars_from_entry($feed, $entry, $form);
 
+				self::log_debug( sprintf("Temp Merge Vars: %s", print_r( $temp_merge_vars, true )) );
+
 				$merge_vars = array();
 				foreach($temp_merge_vars as $key => $value) {
 
 					// Get the field ID for the current value
 					$field_id = $feed['meta'][$key];
 
-					// The field names have a trailing underscore for some reason.
-					$key = ltrim($key, '_');
-
 					// We need to specially format some data going to Salesforce
 					// If it's a field ID, get the field data
 					if(is_numeric($field_id) && !empty($value)) {
@@ -442,7 +451,7 @@ public function process_feed( $feed, $entry, $form ) {
 						unset($merge_vars[$key]);
 					} else {
 						// Add the value to the data being sent
-						$merge_vars[$key] = $value;
+						$merge_vars[$key] = GFCommon::replace_variables($value, $form, $entry, false, false, false );
 					}
 				}
 
diff --git a/trunk/readme.txt b/trunk/readme.txt
@@ -2,7 +2,7 @@
 Tags: gravity forms, forms, gravity, form, crm, gravity form, salesforce, salesforce plugin, form, forms, gravity, gravity form, gravity forms, secure form, simplemodal contact form, wp contact form, widget, sales force, customer, contact, contacts, address, addresses, address book, web to lead, web to case, web-to-lead, web-to-case, cases, leads, lead
 Requires at least: 3.3
 Tested up to: 3.9.1
-Stable tag: 3.0.5
+Stable tag: 3.0.6
 Contributors: katzwebdesign,katzwebservices
 Donate link:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zackkatz%40gmail%2ecom&item_name=Gravity%20Forms%20Salesforce%20Addon&no_shipping=0&no_note=1&tax=0&currency_code=USD&lc=US&bn=PP%2dDonationsBF&charset=UTF%2d8
 License: GPLv2 or later
@@ -60,11 +60,25 @@ If you have questions, comments, or issues with this plugin, <strong>please leav
 
 1. Upload plugin files to your plugins folder, or install using WordPress' built-in Add New Plugin installer
 1. Activate the plugin
-1. Go to the plugin settings page (under Forms > Settings > Salesforce)
-1. Enter the information requested by the plugin.
-1. Click Save Settings.
-1. If the settings are correct, it will say so.
-1. Follow on-screen instructions for integrating with Salesforce.
+1. Go to the plugin settings page (under Forms > Settings > Salesforce Add-on )
+1. Choose your Integration Method (API or Web-to-Lead)
+
+### API
+- Select API as your Integration Method
+- Click Save Settings.
+- Click the "Salesforce: API" menu in the current settings
+- Click the "Login with Salesforce" button
+- Log in to Salesforce.com
+- Click on the Forms > Salesforce menu link to create a feed
+- Follow the steps to create a feed
+
+### Web-to-Lead
+- Select Web-to-Lead as your Integration Method
+- Click Save Settings
+- Go to the Gravity Forms Forms page (the Forms menu)
+- Edit the form you want to connect with Salesforce
+- On the Edit Form page, under "Form Settings", click the "Salesforce: Web-to-Lead" link
+- Click the link to create a feed
 
 __If you are using the Web-To-Lead Add-on__ you must have Web-To-Lead enabled. [Read how to enable Web-to-Lead on Salesforce.com](https://help.salesforce.com/apex/HTViewHelpDoc?id=setting_up_web-to-lead.htm).
 
@@ -76,14 +90,30 @@ Please check the box "Enable Salesforce debugging emails" in the Web-to-Lead set
 = Web-to-Lead: How do I convert my existing form configuration to Feeds? =
 See "Web-to-Lead: How do I create a Feed" below.
 
+= API: How do I create a Feed? =
+
+- Go to the plugin settings page (under Forms > Settings > Salesforce Add-on )
+- Choose your Integration Method (API or Web-to-Lead)
+- Select API as your Integration Method
+- Click Save Settings.
+- Click the "Salesforce: API" menu in the current settings
+- Click the "Login with Salesforce" button
+- Log in to Salesforce.com
+- Click on the Forms > Salesforce menu link to create a feed
+- Follow the steps to create a feed
+
+
 = Web-to-Lead: How do I create a Feed? =
 
 __To create a feed:__
 
-1. Go to "Forms" in your admin
-1. Click on the name of the form you want to link with Salesforce
-1. Hover over "Form Settings" and click on the "Salesforce: Web-to-Lead" link
-1. Follow the instructions to create a Feed.
+- Go to the plugin settings page (under Forms > Settings > Salesforce Add-on )
+- Select Web-to-Lead as your Integration Method
+- Click Save Settings
+- Go to the Gravity Forms Forms page (the Forms menu)
+- Edit the form you want to connect with Salesforce
+- On the Edit Form page, under "Form Settings", click the "Salesforce: Web-to-Lead" link
+- Click the link to create a feed
 
 = Web-to-Lead: How do I modify the debug email address? =
 The Salesforce debugging emails are sent to the website administrator by default. To modify this, add a filter to `gf_salesforce_salesforce_debug_email_address` that returns an email address.
@@ -239,7 +269,7 @@ __If that doesn't work__, you can modify the format for the date by using this c
 add_filter('gf_salesforce_format_date', 'modify_gf_salesforce_format_date');
 
 /**
- * The default is US-style,  though Salesforce recommends `Y-m-d\'\T\'H:i:s`
+ * The default is US-style,  though Salesforce recommends <code>Y-m-d\'\T\'H:i:s</code>
  * You can use any date formatting as shown here:
  * @link  http://php.net/manual/en/function.date.php
  */
@@ -259,6 +289,15 @@ This plugin is released under a GPL license.
 
 == Changelog ==
 
+= 3.0.6 (July 19, 2014) =
+* If you haven't read the 3.0.5 changelog notes, please do so!
+* Added: Enabled Merge Tag field value support ([issue #97](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/97))
+* Added [API Add-on]: "Form Title" as an option for mapping form fields
+* Fixed: Form details were not being properly passed ([issue #94](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/94))
+* Fixed: DaddyAnalytics API names were incorrect for the API integration
+* Fixed: PHP warning about calling static functions
+* Added: Additional Debugging
+
 = 3.0.5 (June 26, 2014) =
 * __!!MAJOR UPDATE!!__ Please read through the changes below.
 * __API Add-on Changes__
@@ -443,6 +482,15 @@ This plugin is released under a GPL license.
 
 == Upgrade Notice ==
 
+= 3.0.6 (July 19, 2014) =
+* If you haven't read the 3.0.5 changelog notes, please do so!
+* Added: Enabled Merge Tag field value support ([issue #97](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/97))
+* Added [API Add-on]: "Form Title" as an option for mapping form fields
+* Fixed: Form details were not being properly passed ([issue #94](https://github.com/katzwebservices/Gravity-Forms-Salesforce/issues/94))
+* Fixed: DaddyAnalytics API names were incorrect for the API integration
+* Fixed: PHP warning about calling static functions
+* Added: Additional Debugging
+
 = 3.0.5 (June 26, 2014) =
 * __!!MAJOR UPDATE!!__ Please read through the changes below.
 * __API Add-on Changes__
diff --git a/trunk/salesforce.php b/trunk/salesforce.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Gravity Forms Salesforce Add-On
 Description: Integrates <a href="http://katz.si/gf">Gravity Forms</a> with Salesforce, allowing form submissions to be automatically sent to your Salesforce account.
-Version: 3.0.5
+Version: 3.0.6
 Requires at least: 3.3
 Author: Katz Web Services, Inc.
 Author URI: https://katz.co
@@ -33,7 +33,7 @@
  */
 class KWS_GF_Salesforce {
 
-    const version = '3.0.5';
+    const version = '3.0.6';
     static $file;
     static $plugin_dir_path;
 

Original file line number	Diff line number	Diff line change
`@@ -785,10 +785,10 @@ private static function list_page(){`
`785`	`785`	`<th scope="row" class="check-column"><input type="checkbox" name="feed[]" value="<?php echo $setting["id"] ?>"/></th>`
`786`	`786`	`<td><img src="<?php echo self::get_base_url() ?>/assets/images/active<?php echo intval($setting["is_active"]) ?>.png" alt="<?php echo $setting["is_active"] ? __("Active", "gravity-forms-salesforce") : __("Inactive", "gravity-forms-salesforce");?>" title="<?php echo $setting["is_active"] ? __("Active", "gravity-forms-salesforce") : __("Inactive", "gravity-forms-salesforce");?>" onclick="ToggleActive(this, <?php echo $setting['id'] ?>); " /></td>`
`787`	`787`	`<td class="column-title">`
`788`		`- <a href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php echo $setting["form_title"] ?></a>`
	`788`	`+ <a href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php echo esc_html( $setting["form_title"] ); ?></a>`
`789`	`789`	`<div class="row-actions">`
`790`	`790`	`<span class="edit">`
`791`		`- <a title="Edit this setting" href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php _e("Edit", "gravity-forms-salesforce") ?></a>`
	`791`	`+ <a title="Edit this setting" href="admin.php?page=gf_salesforce&view=edit&id=<?php echo $setting["id"] ?>" title="<?php _e("Edit", "gravity-forms-salesforce") ?>"><?php _e("Edit", "gravity-forms-salesforce") ?></a>`
`792`	`792`	`\|`
`793`	`793`	`</span>`
`794`	`794`
`@@ -1847,6 +1847,8 @@ public static function get_form_fields($form_id){`
`1847`	`1847`	`array_push($form["fields"],array("id" => "date_created" , "label" => __("Entry Date", "gravity-forms-salesforce")));`
`1848`	`1848`	`array_push($form["fields"],array("id" => "ip" , "label" => __("User IP", "gravity-forms-salesforce")));`
`1849`	`1849`	`array_push($form["fields"],array("id" => "source_url" , "label" => __("Source Url", "gravity-forms-salesforce")));`
	`1850`	`+ array_push($form["fields"],array("id" => "form_title" , "label" => __("Form Title", "gravity-forms-salesforce")));`
	`1851`	`+`
`1850`	`1852`
`1851`	`1853`	`if(is_array($form["fields"])){`
`1852`	`1854`	`foreach($form["fields"] as $field){`
`@@ -2082,7 +2084,7 @@ private static function process_merge_vars($entry, $form, $feed) {`
`2082`	`2084`	`$value = htmlspecialchars($entry[$field_id]);`
`2083`	`2085`	`}`
`2084`	`2086`
`2085`		`- $merge_vars[$var_tag] = $value;`
	`2087`	`+ $merge_vars[$var_tag] = GFCommon::replace_variables($value, $form, $entry, false, false, false );`
`2086`	`2088`
`2087`	`2089`	`} else {`
`2088`	`2090`
`@@ -2093,7 +2095,10 @@ private static function process_merge_vars($entry, $form, $feed) {`
`2093`	`2095`	`$elements[] = htmlspecialchars($value);`
`2094`	`2096`	`}`
`2095`	`2097`	`}`
`2096`		`- $merge_vars[$var_tag] = implode(';',array_map('htmlspecialchars', $elements));`
	`2098`	`+`
	`2099`	`+ $value = implode(';',array_map('htmlspecialchars', $elements));`
	`2100`	`+`
	`2101`	`+ $merge_vars[$var_tag] = GFCommon::replace_variables($value, $form, $entry, false, false, false );`
`2097`	`2102`	`}`
`2098`	`2103`	`}`
`2099`	`2104`