[ready for core team review] CRM-20677, used generalized function to retrieve financial account id #10463
Conversation
|
|
||
| return $paymentInstrumentValue ? self::$financialAccount[$paymentInstrumentValue] : self::$financialAccount; | ||
| public static function getInstrumentFinancialAccount($paymentInstrumentValue) { | ||
| $paymentInstrument = civicrm_api3('OptionValue', 'getsingle', array( |
There was a problem hiding this comment.
@pradpnayak this is what is causing the test to fail would there be a reason why there is 2 payment_instruments with the same option value? Maybe its a test problem
There was a problem hiding this comment.
@seamuslee001 you are right and I have fixed that test failure. Thanks for bringing that glitch into notice :)
|
Jenkin test this please |
monishdeb
changed the title
---------------------------------------- * CRM-20677: Use generalised function to retrieve financial account https://issues.civicrm.org/jira/browse/CRM-20677
---------------------------------------- * CRM-20677: Use generalised function to retrieve financial account https://issues.civicrm.org/jira/browse/CRM-20677 CRM-20677. more changes ---------------------------------------- * CRM-20677: Use generalised function to retrieve financial account https://issues.civicrm.org/jira/browse/CRM-20677
| */ | ||
| public static function getInstrumentFinancialAccount($paymentInstrumentValue = NULL) { |
There was a problem hiding this comment.
Just a small note -- this was technically a change in the function signature (dropping the NULL default). Not a huge deal because it's an internal function, but there was a stale reference in sql/GenerateData.php (which is used for regen.sh) where it calls:
$financialAccountId = CRM_Financial_BAO_FinancialTypeAccount::getInstrumentFinancialAccount();To work around it, I grepped forgetInstrumentFinancialAccount and saw a test written with the hard-coded value getInstrumentFinancialAccount(4). Not sure if it's the right thing, but using 4 does seem to get regen.sh running.
In [civicrm#10463](civicrm#10463), the function signature of `getInstrumentFinancialAccount()` changed slightly -- in that the parameter became mandatory. Grepping for other calls to `getInstrumentFinancialAccount()` shows that one of the unit-tests works with example input `4`, so this does the same. Before ====== Running "regen.sh" fails -- because `getInstrumentFinancialAccount` is called without a parameter. After ===== Running "regen.sh" completes -- because `getInstrumentFinancialAccount` is called with `4`. Acceptance Prompts ================== * The example data produced by `regen.sh` should contain suitable/similar values for financial records. * Determine whether `4` is a suitable value.
https://issues.civicrm.org/jira/browse/CRM-20677