+ (Finance) Fixed an issue where the Transaction Matching block can p…

…resent Transactions out of order. (Fixes #5676)
SparkDevNetwork · Mar 1, 2024 · a76d9d9 · a76d9d9
1 parent 8f7513d
commit a76d9d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/RockWeb/Blocks/Finance/TransactionMatching.ascx b/RockWeb/Blocks/Finance/TransactionMatching.ascx
@@ -498,8 +498,7 @@
                     });
                 }
                 else {
-                    // do the Postback (which will save the changes)
-                    window.location = successLocation;
+                    // Do the Postback wired up via the button's OnClick handler (which will save the changes).
                 }
             }
         </script>

diff --git a/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs b/RockWeb/Blocks/Finance/TransactionMatching.ascx.cs
@@ -640,7 +640,14 @@ private void NavigateToTransaction( Direction direction )
                 var financialPersonBankAccountService = new FinancialPersonBankAccountService( rockContext );
                 var financialTransactionService = new FinancialTransactionService( rockContext );
                 var qryTransactionsToMatch = financialTransactionService.Queryable()
-                    .Where( a => a.AuthorizedPersonAliasId == null && a.ProcessedByPersonAliasId == null );
+                    .Where( a =>
+                        a.AuthorizedPersonAliasId == null
+                        &&
+                        (
+                            a.ProcessedByPersonAliasId == null
+                            || a.ProcessedByPersonAliasId == CurrentPersonAliasId
+                        )
+                    );
 
                 if ( batchId != 0 )
                 {