Merge pull request #140 from closemarketing/hotfix-webhook

Fix webhook ID extraction to handle multiple formats

Author: davidperezgar

formscrm.php

@@ -3,7 +3,7 @@
  * Plugin Name: FormsCRM
  * Plugin URI : https://close.technology/wordpress-plugins/formscrm/
  * Description: Connects Forms with CRM, ERP and Email Marketing.
- * Version: 4.2.0
+ * Version: 4.2.1
  * Author: CloseTechnology
  * Author URI: https://close.technology
  * Text Domain: formscrm
@@ -23,7 +23,7 @@
 
 defined( 'ABSPATH' ) || die( 'No script kiddies please!' );
 
-define( 'FORMSCRM_VERSION', '4.2.0' );
+define( 'FORMSCRM_VERSION', '4.2.1' );
 define( 'FORMSCRM_PLUGIN', __FILE__ );
 define( 'FORMSCRM_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'FORMSCRM_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );

includes/formscrm-library/helpers-functions.php

@@ -404,19 +404,19 @@ function formscrm_send_webhook( $settings, $response ) {
 		if ( ! $webhook_url ) {
 			return;
 		}
-		$module   = isset( $response['module'] ) ? $response['module'] : '';
-		$ids      = isset( $response['id'] ) ? $response['id'] : '';
-		$ids      = explode( '|', $ids );
-		$entry_id = end( $ids );
-		$entry_id = str_replace( 'Deal ', '', $entry_id );
+		$module    = isset( $response['module'] ) ? $response['module'] : '';
+		$ids       = isset( $response['id'] ) ? $response['id'] : '';
+		$ids       = explode( '|', $ids );
+		$entry_raw = end( $ids );
+		$entry_id  = preg_replace( '/\D/', '', $entry_raw );
 
 		$body     = array(
 			'hook' => array(
 				'event'  => $module . '.saved',
 				'target' => $webhook_url,
 			),
 			'data' => array(
-				'id' => $entry_id,
+				'id' => (int) $entry_id,
 			),
 		);
 		$response = wp_remote_post(

readme.txt

@@ -4,8 +4,8 @@ Tags: gravityforms, wpforms, crm, vtiger, odoo
 Donate link: https://close.marketing/go/donate/
 Requires at least: 5.5
 Tested up to: 6.9
-Stable tag: 4.2.0
-Version: 4.2.0
+Stable tag: 4.2.1
+Version: 4.2.1
 License: GPL2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -130,6 +130,9 @@ WordPress installation and then activate the Plugin from Plugins page.
 [Official Repository GitHub](https://github.com/closemarketing/formscrm/)
 
 == Changelog ==
+= 4.2.1 =
+*  Hotfix: Error not sending correctly entry id in webhook.
+
 = 4.2.0 =
 *  Enhanced: New design for the settings page.
 *  Dedicated menu for FormsCRM settings.

tests/Unit/test-helpers-functions.php

@@ -95,6 +95,74 @@ public function test_webhook_post_no_url() {
 		$this->assertNull( $response );
 	}
 
+	/**
+	 * Test formscrm_send_webhook ID extraction from different formats.
+	 *
+	 * Test that the function correctly extracts numeric ID from:
+	 * - Plain number: '22222'
+	 * - Pipe-separated with text: 'Lead 32132|Deal 22222'
+	 * - Text prefix: 'Deal 22222'
+	 * - Spanish text prefix: 'Oportunidad 22222'
+	 */
+	public function test_webhook_id_extraction() {
+		$settings = array( 'fc_crm_webhook' => 'https://webhook.com/test' );
+
+		// Test Case 1: Plain numeric ID.
+		$response_api = array(
+			'status'  => 'ok',
+			'message' => 'success',
+			'module'  => 'deal',
+			'id'      => '22222',
+		);
+		$response     = formscrm_send_webhook( $settings, $response_api );
+		$this->assertEquals( 22222, $response['request']['data']['id'] );
+		$this->assertIsInt( $response['request']['data']['id'] );
+
+		// Test Case 2: Pipe-separated IDs with text prefix (Lead 32132|Deal 22222).
+		$response_api = array(
+			'status'  => 'ok',
+			'message' => 'success',
+			'module'  => 'deal',
+			'id'      => 'Lead 32132|Deal 22222',
+		);
+		$response     = formscrm_send_webhook( $settings, $response_api );
+		$this->assertEquals( 22222, $response['request']['data']['id'] );
+		$this->assertIsInt( $response['request']['data']['id'] );
+
+		// Test Case 3: Single ID with text prefix (Deal 22222).
+		$response_api = array(
+			'status'  => 'ok',
+			'message' => 'success',
+			'module'  => 'deal',
+			'id'      => 'Deal 22222',
+		);
+		$response     = formscrm_send_webhook( $settings, $response_api );
+		$this->assertEquals( 22222, $response['request']['data']['id'] );
+		$this->assertIsInt( $response['request']['data']['id'] );
+
+		// Test Case 4: Spanish text prefix (Oportunidad 22222).
+		$response_api = array(
+			'status'  => 'ok',
+			'message' => 'success',
+			'module'  => 'deal',
+			'id'      => 'Oportunidad 22222',
+		);
+		$response     = formscrm_send_webhook( $settings, $response_api );
+		$this->assertEquals( 22222, $response['request']['data']['id'] );
+		$this->assertIsInt( $response['request']['data']['id'] );
+
+		// Test Case 5: Multiple pipe-separated with different numbers.
+		$response_api = array(
+			'status'  => 'ok',
+			'message' => 'success',
+			'module'  => 'deal',
+			'id'      => 'Contact 11111|Lead 99999|Deal 22222',
+		);
+		$response     = formscrm_send_webhook( $settings, $response_api );
+		$this->assertEquals( 22222, $response['request']['data']['id'] );
+		$this->assertIsInt( $response['request']['data']['id'] );
+	}
+
 	/**
 	 * Test formscrm_debug_message with WP_DEBUG enabled.
 	 */