From dd3976b1312e72448b4fd52bfefaaffe13d947dd Mon Sep 17 00:00:00 2001
From: Remco Tolsma <869674+remcotolsma@users.noreply.github.com>
Date: Tue, 28 May 2024 11:06:01 +0200
Subject: [PATCH] Revert "Add consumer bank account name and IBAN merge tags."

This reverts commit 17e006f7b89a1c9fea6cffe7e8ba8ff195de7989.
---
 phpstan.neon.dist |  2 +-
 src/Admin.php     | 12 +-----------
 src/Extension.php | 19 +------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 4211441..8d5aa2a 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -4,4 +4,4 @@ parameters:
 		- src/
 		- views/
 	scanDirectories:
-		- wp-content/plugins/gravityforms
+		- vendor/pronamic/gravityforms
diff --git a/src/Admin.php b/src/Admin.php
index ca594b3..5a2c7fe 100644
--- a/src/Admin.php
+++ b/src/Admin.php
@@ -167,16 +167,6 @@ public static function custom_merge_tags( $merge_tags ) {
 			'tag'   => '{pronamic_payment_bank_transfer_recipient_account_number}',
 		];
 
-		$merge_tags[] = [
-			'label' => __( 'Pronamic consumer bank account name', 'pronamic_ideal' ),
-			'tag'   => '{pronamic_payment_consumer_bank_account_name}',
-		];
-
-		$merge_tags[] = [
-			'label' => __( 'Pronamic consumer IBAN', 'pronamic_ideal' ),
-			'tag'   => '{pronamic_payment_consumer_iban}',
-		];
-
 		// Subscription.
 		$merge_tags[] = [
 			'label' => __( 'Pronamic Subscription ID', 'pronamic_ideal' ),
@@ -213,7 +203,7 @@ public static function custom_merge_tags( $merge_tags ) {
 
 	/**
 	 * Maybe redirect to Gravity Forms entry.
-	 *
+	 * 
 	 * @return void
 	 */
 	public static function maybe_redirect_to_entry() {
diff --git a/src/Extension.php b/src/Extension.php
index d8753bd..d416c7a 100644
--- a/src/Extension.php
+++ b/src/Extension.php
@@ -1205,7 +1205,7 @@ public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html
 
 		/**
 		 * Bank transfer recipient details.
-		 *
+		 * 
 		 * Use bank transfer details from last subscription payment if available.
 		 */
 		$payment = null;
@@ -1247,21 +1247,6 @@ public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html
 			}
 		}
 
-		/**
-		 * Consumer bank account details.
-		 */
-		$consumer_bank_account_name = '';
-		$consumer_iban              = '';
-
-		if ( null !== $payment ) {
-			$consumer_bank_details = $payment->get_consumer_bank_details();
-
-			if ( null !== $consumer_bank_details ) {
-				$consumer_bank_account_name = \strval( $consumer_bank_details->get_name() );
-				$consumer_iban              = \strval( $consumer_bank_details->get_iban() );
-			}
-		}
-
 		// Pay again URL.
 		$pay_again_url = \rgar( $entry, 'source_url' );
 
@@ -1291,8 +1276,6 @@ public function replace_merge_tags( $text, $form, $entry, $url_encode, $esc_html
 			'{pronamic_payment_bank_transfer_recipient_city}' => $bank_transfer_recipient_city,
 			'{pronamic_payment_bank_transfer_recipient_country}' => $bank_transfer_recipient_country,
 			'{pronamic_payment_bank_transfer_recipient_account_number}' => $bank_transfer_recipient_account_number,
-			'{pronamic_payment_consumer_bank_account_name}' => $consumer_bank_account_name,
-			'{pronamic_payment_consumer_iban}'     => $consumer_iban,
 			'{pronamic_subscription_id}'           => $subscription_id,
 			'{pronamic_subscription_payment_id}'   => $subscription_payment_id,
 			'{pronamic_subscription_amount}'       => $subscription_amount,