From e3091336d7f12a75e6cb8ee3feba0848589d02e0 Mon Sep 17 00:00:00 2001
From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com>
Date: Sat, 14 Mar 2026 00:42:03 +0300
Subject: [PATCH 1/2] Fix After Payment setting not imported for Payment
 actions

---
 classes/helpers/FrmFieldsHelper.php | 10 ++++++++++
 classes/models/FrmFormAction.php    |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php
index 2c0bf810d2..2dfa8f442e 100644
--- a/classes/helpers/FrmFieldsHelper.php
+++ b/classes/helpers/FrmFieldsHelper.php
@@ -1826,6 +1826,10 @@ public static function switch_field_ids( $val ) {
 
 		foreach ( $val as $k => $v ) {
 			if ( ! is_string( $v ) ) {
+				if ( is_array( $v ) ) {
+					$val[ $k ] = self::switch_field_ids( $v );
+					unset( $k, $v );
+				}
 				continue;
 			}
 
@@ -1835,6 +1839,12 @@ public static function switch_field_ids( $val ) {
 				continue;
 			}
 
+			if ( isset( $frm_duplicate_ids[ $v ] ) ) {
+				$val[ $k ] = $frm_duplicate_ids[ $v ];
+				unset( $k, $v );
+				continue;
+			}
+
 			$val[ $k ] = str_replace( $replace, $replace_with, $v );
 			unset( $k, $v );
 		}
diff --git a/classes/models/FrmFormAction.php b/classes/models/FrmFormAction.php
index 0f0ec7d1f7..27dccad89c 100644
--- a/classes/models/FrmFormAction.php
+++ b/classes/models/FrmFormAction.php
@@ -402,6 +402,8 @@ public function duplicate_one( $action, $form_id ) {
 				foreach ( $switch[ $key ] as $subkey ) {
 					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
 				}
+			} elseif ( is_array( $val ) ) {
+				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
 			}
 
 			unset( $key, $val );

From ba04d2516e22eecbf8ba6dae97e088a16378f394 Mon Sep 17 00:00:00 2001
From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com>
Date: Mon, 16 Mar 2026 14:26:51 +0300
Subject: [PATCH 2/2] Add //end foreach comment

---
 classes/helpers/FrmFieldsHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php
index 2dfa8f442e..df59f88389 100644
--- a/classes/helpers/FrmFieldsHelper.php
+++ b/classes/helpers/FrmFieldsHelper.php
@@ -1847,7 +1847,7 @@ public static function switch_field_ids( $val ) {
 
 			$val[ $k ] = str_replace( $replace, $replace_with, $v );
 			unset( $k, $v );
-		}
+		}//end foreach
 
 		return $val;
 	}