Merge pull request #57 from pronamic/56-remove-action-gform_ideal_fulfillment

Remove action `gform_ideal_fulfillment`.

Author: rvdsteege

pronamic-pay-gravity-forms.php

@@ -6,7 +6,7 @@
  *
  * Version: 4.10.2
  * Requires at least: 4.7
- * Requires PHP: 7.4
+ * Requires PHP: 8.1
  *
  * Author: Pronamic
  * Author URI: https://www.pronamic.eu/

src/Extension.php

@@ -146,6 +146,8 @@ public function init() {
 
 		\add_filter( 'gform_payment_statuses', [ $this, 'gform_payment_statuses' ] );
 
+		\add_action( 'gform_post_payment_completed', $this->fulfill_order( ... ) );
+
 		$this->maybe_display_confirmation();
 	}
 
@@ -639,9 +641,6 @@ public function update_status( Payment $payment, $can_redirect = false ) {
 					$this->payment_action( 'create_subscription', $lead, $action );
 				}
 
-				// Fulfill order.
-				$this->fulfill_order( $lead );
-
 				break;
 			case PaymentStatus::OPEN:
 			default:
@@ -971,13 +970,20 @@ public function payment_action( $type, $lead, $action, $payment_status = null )
 	 * @param array $entry Gravity Forms entry.
 	 */
 	public function fulfill_order( $entry ) {
+		$entry_id = \rgar( $entry, 'id' );
+
+		// Check if one of our feeds is linked to the entry.
+		$feed_id = \gform_get_meta( $entry_id, 'ideal_feed_id' );
+
+		if ( empty( $feed_id ) ) {
+			return;
+		}
+		
 		// Check if already fulfilled.
 		if ( Entry::is_fulfilled( $entry ) ) {
 			return;
 		}
 
-		$entry_id = rgar( $entry, 'id' );
-
 		// Get entry with current payment status.
 		$entry = RGFormsModel::get_lead( $entry_id );
 
@@ -1053,18 +1059,6 @@ public function fulfill_order( $entry ) {
 
 		// Store entry payment fulfillment in custom meta.
 		gform_update_meta( $entry_id, 'pronamic_pay_payment_fulfilled', true );
-
-		/**
-		 * Execute payment fulfillment action (PayPal uses `gform_paypal_fulfillment`).
-		 *
-		 * @link https://docs.gravityforms.com/gform_paypal_fulfillment/
-		 * @link https://docs.gravityforms.com/entry-object/
-		 * @since 1.0.0
-		 * @param object $entry The entry used to generate the (iDEAL) payment.
-		 * @param object $feed  The feed configuration data used to generate the payment.
-		 * @deprecated Fulfillment of payments without amount (free) will be removed in the future. Use `gform_post_payment_completed` action instead.
-		 */
-		\do_action( 'gform_ideal_fulfillment', $entry, $feed );
 	}
 
 	/**