[Fix] Action not been triggered

Author: mariovalney

CONTRIBUTING.md

@@ -45,6 +45,27 @@ And please, create a Issue about your PR.
 
 ## Development
 
+### Pre-commit
+
+Run `nano .git/hooks/pre-commit` to create a pre-commit file and past the content:
+
+```
+#!/bin/bash
+
+SOURCE_FILE="README.md"
+DESTINATION_FILE="docs/README.md"
+
+if [ -f "$SOURCE_FILE" ]; then
+    cp "$SOURCE_FILE" "$DESTINATION_FILE"
+    git add "$DESTINATION_FILE"
+else
+    echo "Erro: $SOURCE_FILE not found."
+    exit 1
+fi
+```
+
+And run `chmod +x .git/hooks/pre-commit` to make it executable.
+
 ### Templates
 
 Templates are Header / Body values.

README.md

@@ -5,7 +5,7 @@
 **Tags:** cf7, contact form, zapier, integration, webhook  
 **Requires at least:** 4.7  
 **Tested up to:** 6.8  
-**Stable tag:** 4.0.0  
+**Stable tag:** 4.0.1  
 **Requires PHP:** 7.4  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
@@ -159,6 +159,11 @@ Yes! Visit [GitHub repository](https://github.com/mariovalney/cf7-to-zapier) or
 
 ## Changelog ##
 
+### 4.0.1 ###
+
+* Fixes 'ctz_post_request_result' action not triggering on errors.
+* Added 'ctz_post_request_ignore_errors' filter to ignore error handle.
+
 ### 4.0.0 ###
 
 * New feature: [TEMPLATES](https://wordpress.org/support/topic/how-templates-works).
@@ -296,7 +301,7 @@ Props to @shoreline-chrism
 
 ## Upgrade Notice ##
 
-### 4.0.0 ###
+### 4.0.1 ###
 
 We have a lot of new features and a new UI!
 The most cool new feature is templates! Take a look!

docs/README.md

@@ -5,7 +5,7 @@
 **Tags:** cf7, contact form, zapier, integration, webhook  
 **Requires at least:** 4.7  
 **Tested up to:** 6.8  
-**Stable tag:** 4.0.0  
+**Stable tag:** 4.0.1  
 **Requires PHP:** 7.4  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
@@ -159,6 +159,11 @@ Yes! Visit [GitHub repository](https://github.com/mariovalney/cf7-to-zapier) or
 
 ## Changelog ##
 
+### 4.0.1 ###
+
+* Fixes 'ctz_post_request_result' action not triggering on errors.
+* Added 'ctz_post_request_ignore_errors' filter to ignore error handle.
+
 ### 4.0.0 ###
 
 * New feature: [TEMPLATES](https://wordpress.org/support/topic/how-templates-works).
@@ -296,7 +301,7 @@ Props to @shoreline-chrism
 
 ## Upgrade Notice ##
 
-### 4.0.0 ###
+### 4.0.1 ###
 
 We have a lot of new features and a new UI!
 The most cool new feature is templates! Take a look!

modules/cf7/class-module-cf7.php

@@ -355,19 +355,6 @@ public function wpcf7_mail_sent( $contact_form ) {
                         'exception' => $exception,
                     );
 
-                    /**
-                     * Filter: ctz_trigger_webhook_error_message
-                     *
-                     * The 'ctz_trigger_webhook_error_message' filter change the message in case of error.
-                     * Default is CF7 error message, but you can access exception to create your own.
-                     *
-                     * You can ignore errors returning false:
-                     * add_filter( 'ctz_trigger_webhook_error_message', '__return_empty_string' );
-                     *
-                     * @since 1.4.0
-                     */
-                    $error_message =  apply_filters( 'ctz_trigger_webhook_error_message', $contact_form->message( 'mail_sent_ng' ), $exception );
-
                     /**
                      * Filter: ctz_trigger_webhook_error_mails
                      *
@@ -437,6 +424,19 @@ public function wpcf7_mail_sent( $contact_form ) {
                         );
                     }
 
+                    /**
+                     * Filter: ctz_trigger_webhook_error_message
+                     *
+                     * The 'ctz_trigger_webhook_error_message' filter change the message in case of error.
+                     * Default is CF7 error message, but you can access exception to create your own.
+                     *
+                     * You can ignore errors returning false:
+                     * add_filter( 'ctz_trigger_webhook_error_message', '__return_empty_string' );
+                     *
+                     * @since 1.4.0
+                     */
+                    $error_message =  apply_filters( 'ctz_trigger_webhook_error_message', $contact_form->message( 'mail_sent_ng' ), $exception );
+
                     // If empty ignore after sending notification
                     if ( empty( $error_message ) ) continue;
 

modules/zapier/class-module-zapier.php

@@ -125,6 +125,29 @@ public function pull_the_trigger( array $data, $hook_url, $properties, $contact_
              */
             $result = wp_remote_request( $hook_url, apply_filters( 'ctz_post_request_args', $args, $properties, $contact_form ) );
 
+            /**
+             * Action: ctz_post_request_result
+             *
+             * You can perform a action with the result of the request.
+             * By default we will thrown a CFTZ_Exception in webhook errors to send a notification.
+             *
+             * @since    1.4.0
+             */
+            do_action( 'ctz_post_request_result', $result, $hook_url );
+
+            /**
+             * Filter: ctz_post_request_ignore_errors
+             *
+             * The 'ctz_post_request_ignore_errors' filter can be used to ignore core error handler (notifications and success statuses).
+             *
+             * add_filter( 'ctz_post_request_ignore_errors', '__return_true' );
+             *
+             * @since    4.0.1
+             */
+            if ( apply_filters( 'ctz_post_request_ignore_errors', false, $hook_url, $result, $contact_form ) ) {
+                return;
+            }
+
             // If result is a WP Error, throw a Exception with the message.
             if ( is_wp_error( $result ) ) {
                 throw new CFTZ_Exception( $result );
@@ -137,16 +160,6 @@ public function pull_the_trigger( array $data, $hook_url, $properties, $contact_
                 $error->add( $code, __( 'Webhook returned a error code.', 'cf7-to-zapier' ), [ 'result' => $result ] );
                 throw new CFTZ_Exception( $error );
             }
-
-            /**
-             * Action: ctz_post_request_result
-             *
-             * You can perform a action with the result of the request.
-             * By default we do nothing but you can throw a Exception in webhook errors.
-             *
-             * @since    1.4.0
-             */
-            do_action( 'ctz_post_request_result', $result, $hook_url );
         }
 
         /**

readme.txt

@@ -5,7 +5,7 @@ Donate link: https://www.paypal.com/donate?campaign_id=9AA82JCSNWNFS
 Tags: cf7, contact form, zapier, integration, webhook
 Requires at least: 4.7
 Tested up to: 6.8
-Stable tag: 4.0.0
+Stable tag: 4.0.1
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -153,6 +153,11 @@ Yes! Visit [GitHub repository](https://github.com/mariovalney/cf7-to-zapier) or
 
 == Changelog ==
 
+= 4.0.1 =
+
+* Fixes 'ctz_post_request_result' action not triggering on errors.
+* Added 'ctz_post_request_ignore_errors' filter to ignore error handle.
+
 = 4.0.0 =
 
 * New feature: [TEMPLATES](https://wordpress.org/support/topic/how-templates-works).
@@ -290,7 +295,7 @@ Props to @shoreline-chrism
 
 == Upgrade Notice ==
 
-= 4.0.0 =
+= 4.0.1 =
 
 We have a lot of new features and a new UI!
 The most cool new feature is templates! Take a look!