CRM-20987, added batch transaction column #10789
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
---------------------------------------- * CRM-20987: Add transaction date field to listings of transactions https://issues.civicrm.org/jira/browse/CRM-20987
|
test failure looks like code just needs adjusting |
CRM/Financial/Page/AJAX.php
Outdated
| @@ -255,6 +255,7 @@ public static function getFinancialTransactionsList() { | |||
| 3 => 'amount', | |||
| 4 => 'trxn_id', | |||
| 5 => 'transaction_date', | |||
| 5 => 'receive_date', | |||
There was a problem hiding this comment.
You have double indexed here. Might need to renumber?
|
The changed function is only accessed from the BatchTransction.tpl file - which relates to financial batches. I haven't tested this yet (maybe @lcdservices has) but the code side of it appears safe & ok except for my comment about array indexing |
---------------------------------------- * CRM-20987: Add transaction date field to listings of transactions https://issues.civicrm.org/jira/browse/CRM-20987 fixed indexes
|
@eileenmcnaughton i have fixed the indexing. |
|
tested and confirmed. looks good. |
|
Adding merge on pass based on Brian's feedback |
|
jenkins, retest this please |
|
Merging as per tag |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.civicrm.org/jira/browse/CRM-20987
Overview
Financial batch listing page lists transaction with transaction date derived from civicrm_financial_trxn table(column name = Received). This PR fixes
Before
After