From a83cb1e13cf978d868832908e940e4b2a145db33 Mon Sep 17 00:00:00 2001 From: Allen Shaw Date: Thu, 2 May 2013 17:02:40 -0700 Subject: [PATCH] Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464 ---------------------------------------- * CRM-12464: Search improvements in 4.4 http://issues.civicrm.org/jira/browse/CRM-12464 --- CRM/Admin/Form/OptionValue.php | 4 +-- CRM/Admin/Form/Options.php | 4 +-- CRM/Admin/Form/PaymentProcessor.php | 4 +-- CRM/Batch/BAO/Batch.php | 2 +- CRM/Batch/Form/Entry.php | 2 +- CRM/Contribute/BAO/Contribution.php | 9 +++--- CRM/Core/BAO/FinancialTrxn.php | 4 +-- CRM/Core/PseudoConstant.php | 32 ------------------- CRM/Event/BAO/Participant.php | 2 +- CRM/Financial/BAO/FinancialAccount.php | 2 +- CRM/Financial/BAO/FinancialItem.php | 2 +- CRM/Financial/BAO/FinancialType.php | 2 +- CRM/Financial/BAO/FinancialTypeAccount.php | 2 +- CRM/Financial/BAO/PaymentProcessor.php | 2 +- CRM/Financial/Form/Export.php | 2 +- CRM/Financial/Form/FinancialAccount.php | 2 +- CRM/Financial/Form/FinancialBatch.php | 4 +-- CRM/Financial/Form/FinancialTypeAccount.php | 5 ++- CRM/Financial/Page/AJAX.php | 6 ++-- CRM/Financial/Page/FinancialAccount.php | 2 +- CRM/Financial/Page/FinancialTypeAccount.php | 4 +-- CRM/Upgrade/Incremental/php/FourThree.php | 6 ++-- .../BAO/FinancialTypeAccountTest.php | 10 +++--- tests/phpunit/api/v3/ContributionTest.php | 4 +-- 24 files changed, 42 insertions(+), 76 deletions(-) diff --git a/CRM/Admin/Form/OptionValue.php b/CRM/Admin/Form/OptionValue.php index 9cd7e54a4f..dacf2c780a 100644 --- a/CRM/Admin/Form/OptionValue.php +++ b/CRM/Admin/Form/OptionValue.php @@ -162,7 +162,7 @@ class CRM_Admin_Form_OptionValue extends CRM_Admin_Form { // CRM-11516 if ($this->_gName == 'payment_instrument') { - $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' "); + $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' "); $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType)); $this->add('select', 'financial_account_id', ts('Financial Account'), @@ -272,7 +272,7 @@ class CRM_Admin_Form_OptionValue extends CRM_Admin_Form { $optionValue = CRM_Core_BAO_OptionValue::add($params, $ids); // CRM-11516 if (CRM_Utils_Array::value('financial_account_id', $params)) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $params = array( 'entity_table' => 'civicrm_option_value', 'entity_id' => $optionValue->id, diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php index 32ae6c12f8..400e9fd622 100644 --- a/CRM/Admin/Form/Options.php +++ b/CRM/Admin/Form/Options.php @@ -190,7 +190,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { } // CRM-11516 if ($this->_gName == 'payment_instrument') { - $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' "); + $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' "); $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType)); $this->add('select', 'financial_account_id', ts('Financial Account'), @@ -405,7 +405,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { // CRM-11516 if (CRM_Utils_Array::value('financial_account_id', $params)) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $params = array( 'entity_table' => 'civicrm_option_value', 'entity_id' => $optionValue->id, diff --git a/CRM/Admin/Form/PaymentProcessor.php b/CRM/Admin/Form/PaymentProcessor.php index bc34146d0e..aa5de9ca3f 100644 --- a/CRM/Admin/Form/PaymentProcessor.php +++ b/CRM/Admin/Form/PaymentProcessor.php @@ -189,7 +189,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { ); // Financial Account of account type asset CRM-11515 - $accountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' "); + $accountType = CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' "); $financialAccount = CRM_Contribute_PseudoConstant::financialAccount(NULL, key($accountType)); if ($fcount = count($financialAccount)) { $this->assign('financialAccount', $fcount); @@ -380,7 +380,7 @@ class CRM_Admin_Form_PaymentProcessor extends CRM_Admin_Form { //CRM-11515 - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $params = array( 'entity_table' => 'civicrm_payment_processor', 'entity_id' => $dao->id, diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php index 706e4b93f1..829eb3bae2 100644 --- a/CRM/Batch/BAO/Batch.php +++ b/CRM/Batch/BAO/Batch.php @@ -596,7 +596,7 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { } static function closeReOpen($batchIds = array(), $status) { - $batchStatus = CRM_Core_PseudoConstant::accountOptionValues( 'batch_status' ); + $batchStatus = CRM_Core_OptionGroup::values('batch_status'); $params['status_id'] = CRM_Utils_Array::key( $status, $batchStatus ); $session = CRM_Core_Session::singleton( ); $params['modified_date'] = date('YmdHis'); diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index 2bdd049f2a..eb42bc55de 100644 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -366,7 +366,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { $this->_priceSet = current(CRM_Price_BAO_Set::getSetDetail($priceSetId)); $fieldID = key($this->_priceSet['fields']); - $assetRelation = key(CRM_CORE_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $assetRelation = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); if (isset($params['field'])) { foreach ($params['field'] as $key => $value) { diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 6e56b0c763..b77eda42be 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2505,7 +2505,7 @@ WHERE contribution_id = %1 "; !(CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', $contributionStatuses) && !$params['contribution']->is_pay_later)) { $skipRecords = TRUE; if (CRM_Utils_Array::value('contribution_status_id', $params) == array_search('Pending', $contributionStatuses)) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' ")); $params['to_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $relationTypeId); } elseif (CRM_Utils_Array::value('payment_processor', $params)) { @@ -2597,7 +2597,7 @@ WHERE contribution_id = %1 "; //if financial type is changed if (CRM_Utils_Array::value('financial_type_id', $params) && $params['contribution']->financial_type_id != $params['prevContribution']->financial_type_id) { - $incomeTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' ")); + $incomeTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' ")); $oldFinancialAccount = CRM_Contribute_PseudoConstant::financialAccountType($params['prevContribution']->financial_type_id, $incomeTypeId); $newFinancialAccount = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $incomeTypeId); if ($oldFinancialAccount != $newFinancialAccount) { @@ -2689,8 +2689,7 @@ WHERE contribution_id = %1 "; $params['trxnParams']['to_financial_account_id'] = NULL; $params['trxnParams']['total_amount'] = - $params['total_amount']; } - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, - " AND v.name LIKE 'Accounts Receivable Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' ")); $params['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType( $financialTypeID, $relationTypeId); } @@ -2700,7 +2699,7 @@ WHERE contribution_id = %1 "; if ($params['prevContribution']->payment_instrument_id != null && $params['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatus) && $params['contribution']->contribution_status_id == array_search('Pending', $contributionStatus)) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' ")); $params['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id'], $relationTypeId); } elseif ($params['prevContribution']->payment_instrument_id != null) { diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php index 95a675df66..c7a42c4fe1 100644 --- a/CRM/Core/BAO/FinancialTrxn.php +++ b/CRM/Core/BAO/FinancialTrxn.php @@ -286,7 +286,7 @@ WHERE ceft.entity_id = %1"; if (CRM_Utils_Array::value('cost', $params)) { $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); $financialAccountType = CRM_Contribute_PseudoConstant::financialAccountType($params['financial_type_id']); - $accountRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND label IN ('Premiums Inventory Account is', 'Cost of Sales Account is')"); + $accountRelationship = CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND label IN ('Premiums Inventory Account is', 'Cost of Sales Account is')"); $toFinancialAccount = CRM_Utils_Array::value('isDeleted', $params) ? 'Premiums Inventory Account is' : 'Cost of Sales Account is'; $fromFinancialAccount = CRM_Utils_Array::value('isDeleted', $params) ? 'Cost of Sales Account is': 'Premiums Inventory Account is'; $accountRelationship = array_flip($accountRelationship); @@ -329,7 +329,7 @@ WHERE ceft.entity_id = %1"; */ static function recordFees($params) { - $expenseTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Expense Account is' ")); + $expenseTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Expense Account is' ")); $domainId = CRM_Core_Config::domainID(); $amount = 0; if (CRM_Utils_Array::value('prevContribution', $params)) { diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index 656bed77e6..e795035c22 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -196,13 +196,6 @@ class CRM_Core_PseudoConstant { */ private static $extensions; - /** - * Financial Account Type - * @var array - * @static - */ - private static $accountOptionValues; - /** * Get options for a given field. * @param String $daoName @@ -1638,30 +1631,5 @@ WHERE id = %1 public static function getModuleExtensions($fresh = FALSE) { return CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles($fresh); } - - /** - * Get all options values - * - * The static array option values is returned - * - * @access public - * @static - * - * @param boolean $optionGroupName - get All Option Group values- default is to get only active ones. - * - * @return array - array reference of all Option Group Name - * - */ - public static function accountOptionValues($optionGroupName, $id = null, $condition = null) { - $cacheKey = $optionGroupName . '_' . $condition; - if (empty(self::$accountOptionValues[$cacheKey])) { - self::$accountOptionValues[$cacheKey] = CRM_Core_OptionGroup::values($optionGroupName, false, false, false, $condition); - } - if ($id) { - return CRM_Utils_Array::value($id, self::$accountOptionValues[$cacheKey]); - } - - return self::$accountOptionValues[$cacheKey]; - } } diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index 134e56e3e8..7939e02192 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -1745,7 +1745,7 @@ WHERE cpf.price_set_id = %1 AND cpfv.label LIKE %2"; $params = array(1 => array($priceSetId, 'Integer'), 2 => array($feeLevel, 'String')); $mainAmount = CRM_Core_DAO::singleValueQuery($query, $params); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Discounts Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Discounts Account is' ")); $contributionParams['trxnParams']['from_financial_account_id'] = CRM_Contribute_PseudoConstant::financialAccountType( $contributionParams['contribution']->financial_type_id, $relationTypeId); if (CRM_Utils_Array::value('from_financial_account_id', $contributionParams['trxnParams'])) { diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php index 9c53bf618e..be96c9bdb3 100644 --- a/CRM/Financial/BAO/FinancialAccount.php +++ b/CRM/Financial/BAO/FinancialAccount.php @@ -159,7 +159,7 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * @static */ static function getAccountingCode($financialTypeId) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' ")); $query = "SELECT cfa.accounting_code FROM civicrm_financial_type cft LEFT JOIN civicrm_entity_financial_account cefa ON cefa.entity_id = cft.id AND cefa.entity_table = 'civicrm_financial_type' diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php index 6db9134a47..fbea50dca8 100644 --- a/CRM/Financial/BAO/FinancialItem.php +++ b/CRM/Financial/BAO/FinancialItem.php @@ -78,7 +78,7 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { */ static function add($lineItem, $contribution) { $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); - $financialItemStatus = CRM_Core_PseudoConstant::accountOptionValues('financial_item_status'); + $financialItemStatus = CRM_Core_OptionGroup::values('financial_item_status'); if ($contribution->contribution_status_id == array_search('Completed', $contributionStatuses)) { $itemStatus = array_search('Paid', $financialItemStatus); } diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index 197474f4d6..60b1854540 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -171,7 +171,7 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { // Financial Type $financialType = CRM_Contribute_PseudoConstant::financialType(); $revenueFinancialType = array(); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' ")); CRM_Core_PseudoConstant::populate( $revenueFinancialType, 'CRM_Financial_DAO_EntityFinancialAccount', diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php index d4e74c0f6c..a39f637439 100644 --- a/CRM/Financial/BAO/FinancialTypeAccount.php +++ b/CRM/Financial/BAO/FinancialTypeAccount.php @@ -112,7 +112,7 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin static function del($financialTypeAccountId, $accountId = null) { //checking if financial type is present $check = false; - $relationValues = CRM_Core_PseudoConstant::accountOptionValues('account_relationship'); + $relationValues = CRM_Core_OptionGroup::values('account_relationship'); $financialTypeId = CRM_Core_DAO::getFieldValue( 'CRM_Financial_DAO_EntityFinancialAccount', $financialTypeAccountId, 'entity_id' ); //check dependencies diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php index e536683819..1d48156d23 100644 --- a/CRM/Financial/BAO/PaymentProcessor.php +++ b/CRM/Financial/BAO/PaymentProcessor.php @@ -69,7 +69,7 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces // CRM-11826, add entry in civicrm_entity_financial_account // if financial_account_id is not NULL if (CRM_Utils_Array::value('financial_account_id', $params)) { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $values = array( 'entity_table' => 'civicrm_payment_processor', 'entity_id' => $processor->id, diff --git a/CRM/Financial/Form/Export.php b/CRM/Financial/Form/Export.php index 99a4cca314..7fda32c47d 100644 --- a/CRM/Financial/Form/Export.php +++ b/CRM/Financial/Form/Export.php @@ -95,7 +95,7 @@ class CRM_Financial_Form_Export extends CRM_Core_Form { $this->_batchIds = $this->_id; } - $allBatchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status'); + $allBatchStatus = CRM_Core_OptionGroup::values('batch_status'); $this->_exportStatusId = CRM_Utils_Array::key('Exported', $allBatchStatus); //check if batch status is valid, do not allow exported batches to export again diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php index c418a31580..55a4eacc71 100644 --- a/CRM/Financial/Form/FinancialAccount.php +++ b/CRM/Financial/Form/FinancialAccount.php @@ -114,7 +114,7 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form { $element->freeze(); } - $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type'); + $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type'); if (!empty($financialAccountType)) { $element = $this->add('select', 'financial_account_type_id', ts('Financial Account Type'), array('' => '- select -') + $financialAccountType, TRUE); diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php index a06021dcc9..fb6e99a1a9 100644 --- a/CRM/Financial/Form/FinancialBatch.php +++ b/CRM/Financial/Form/FinancialBatch.php @@ -121,7 +121,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form { ); if ($this->_action & CRM_Core_Action::UPDATE && $this->_id) { - $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status'); + $batchStatus = CRM_Core_OptionGroup::values('batch_status'); //unset exported status $exportedStatusId = CRM_Utils_Array::key('Exported', $batchStatus ); @@ -210,7 +210,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form { $session = CRM_Core_Session::singleton(); $ids = array(); $params = $this->exportValues(); - $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status'); + $batchStatus = CRM_Core_OptionGroup::values('batch_status'); if ($this->_id) { $ids['batchID'] = $this->_id; $params['id'] = $this->_id; diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php index 28644ffd4f..4256bc3917 100644 --- a/CRM/Financial/Form/FinancialTypeAccount.php +++ b/CRM/Financial/Form/FinancialTypeAccount.php @@ -162,7 +162,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form { //hidden field to catch the field id in profile $this->add('hidden', 'account_type_id', $this->_id); } - $AccountTypeRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship'); + $AccountTypeRelationship = CRM_Core_OptionGroup::values('account_relationship'); if (!empty($AccountTypeRelationship)) { $element = $this->add('select', 'account_relationship', @@ -255,8 +255,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form { $errorMsg = array(); $errorFlag = FALSE; if ($self->_action == CRM_Core_Action::DELETE) { - $groupName = 'account_relationship'; - $relationValues = CRM_Core_PseudoConstant::accountOptionValues($groupName); + $relationValues = CRM_Core_OptionGroup::values('account_relationship'); if (CRM_Utils_Array::value('financial_account_id', $values) != 'select') { if ($relationValues[$values['account_relationship']] == 'Premiums Inventory Account is' || $relationValues[$values['account_relationship']] == 'Cost of Sales Account is') { $premiumsProduct = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_PremiumsProduct', $values['financial_type_id'], 'product_id', 'financial_type_id'); diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php index 5913e692aa..05cd383323 100644 --- a/CRM/Financial/Page/AJAX.php +++ b/CRM/Financial/Page/AJAX.php @@ -98,7 +98,7 @@ class CRM_Financial_Page_AJAX { } if ($_GET['_value'] == 'select') { - $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship'); + $result = CRM_Core_OptionGroup::values('account_relationship'); } else { $financialAccountType = array( @@ -108,7 +108,7 @@ class CRM_Financial_Page_AJAX { '4' => array(7), //cost of sales ); $financialAccountTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $_GET['_value'], 'financial_account_type_id'); - $result = CRM_Core_PseudoConstant::accountOptionValues('account_relationship'); + $result = CRM_Core_OptionGroup::values('account_relationship'); } $elements = array( @@ -216,7 +216,7 @@ class CRM_Financial_Page_AJAX { case 'reopen': $status = $op == 'close' ? 'Closed' : 'Open'; $ids['batchID'] = $recordID; - $batchStatus = CRM_Core_PseudoConstant::accountOptionValues('batch_status'); + $batchStatus = CRM_Core_OptionGroup::values('batch_status'); $params['status_id'] = CRM_Utils_Array::key($status, $batchStatus); $session = CRM_Core_Session::singleton(); $params['modified_date'] = date('YmdHis'); diff --git a/CRM/Financial/Page/FinancialAccount.php b/CRM/Financial/Page/FinancialAccount.php index 5581502b3d..f9d734d658 100644 --- a/CRM/Financial/Page/FinancialAccount.php +++ b/CRM/Financial/Page/FinancialAccount.php @@ -133,7 +133,7 @@ class CRM_Financial_Page_FinancialAccount extends CRM_Core_Page_Basic { $dao = new CRM_Financial_DAO_FinancialAccount(); $dao->orderBy('financial_account_type_id, name'); $dao->find(); - $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type'); + $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type'); while ($dao->fetch()) { $contributionType[$dao->id] = array(); diff --git a/CRM/Financial/Page/FinancialTypeAccount.php b/CRM/Financial/Page/FinancialTypeAccount.php index ac1685f68a..e8b021e5f9 100644 --- a/CRM/Financial/Page/FinancialTypeAccount.php +++ b/CRM/Financial/Page/FinancialTypeAccount.php @@ -137,8 +137,8 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page { $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' ")); $this->_title = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType', $this->_aid, 'name'); CRM_Utils_System::setTitle($this->_title .' - '.ts( 'Assigned Financial Accounts')); - $financialAccountType = CRM_Core_PseudoConstant::accountOptionValues('financial_account_type'); - $accountRelationship = CRM_Core_PseudoConstant::accountOptionValues('account_relationship'); + $financialAccountType = CRM_Core_OptionGroup::values('financial_account_type'); + $accountRelationship = CRM_Core_OptionGroup::values('account_relationship'); $dao->copyValues($params); $dao->find(); while ($dao->fetch()) { diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php index 29798f0b09..878c0dccac 100644 --- a/CRM/Upgrade/Incremental/php/FourThree.php +++ b/CRM/Upgrade/Incremental/php/FourThree.php @@ -390,7 +390,7 @@ AND ceft.entity_table = 'civicrm_contribution' 3 => array($cancelledStatus, 'Integer') ); - $accountType = key(CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name = 'Asset' ")); + $accountType = key(CRM_Core_OptionGroup::values('financial_account_type', false, false, false, " AND v.name = 'Asset' ")); $query = " SELECT id FROM civicrm_financial_account @@ -399,14 +399,14 @@ AND financial_account_type_id = {$accountType} "; $financialAccountId = CRM_Core_DAO::singleValueQuery($query); - $accountRelationsips = CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL); + $accountRelationsips = CRM_Core_OptionGroup::values('account_relationship'); $accountsReceivableAccount = array_search('Accounts Receivable Account is', $accountRelationsips); $incomeAccountIs = array_search('Income Account is', $accountRelationsips); $assetAccountIs = array_search('Asset Account is', $accountRelationsips); $expenseAccountIs = array_search('Expense Account is', $accountRelationsips); - $financialItemStatus = CRM_Core_PseudoConstant::accountOptionValues('financial_item_status'); + $financialItemStatus = CRM_Core_OptionGroup::values('financial_item_status'); $unpaidStatus = array_search('Unpaid', $financialItemStatus); $paidStatus = array_search('Paid', $financialItemStatus); diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php index 975ac1f849..2b0017aee3 100755 --- a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php +++ b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php @@ -58,7 +58,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids); $params['name'] = 'test_financialType1'; $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Income Account is' ")); $financialParams = array( 'entity_table' => 'civicrm_financial_type', 'entity_id' => $financialType->id, @@ -93,7 +93,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids); $params['name'] = 'test_financialType2'; $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Expense Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Expense Account is' ")); $financialParams = array( 'entity_table' => 'civicrm_financial_type', 'entity_id' => $financialType->id, @@ -121,7 +121,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids); $params['name'] = 'test_financialType3'; $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $financialParams = array( 'entity_table' => 'civicrm_financial_type', 'entity_id' => $financialType->id, @@ -182,7 +182,7 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { 'value' => $paymentInstrumentValue, ); $optionValue = CRM_Core_BAO_OptionValue::retrieve($optionParams, $defaults); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $financialParams = array( 'entity_table' => 'civicrm_option_value', 'entity_id' => $optionValue->id, @@ -195,4 +195,4 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { $this->assertEquals( $financialAccountId, $financialAccount->id, 'Verify Payment Instrument'); } -} \ No newline at end of file +} diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index 3ab0882576..2e9b3cf587 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -1525,7 +1525,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { 'id' => $trxn['financial_trxn_id'], ); if ($context == 'payLater') { - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Accounts Receivable Account is' ")); $compareParams = array( 'status_id' => 1, 'from_financial_account_id' => CRM_Contribute_PseudoConstant::financialAccountType($contribution['financial_type_id'], $relationTypeId), @@ -1589,7 +1589,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { 'version' => 3, ); $optionValue = civicrm_api('option_value', 'create', $optionParams); - $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Asset Account is' ")); + $relationTypeId = key(CRM_Core_OptionGroup::values('account_relationship', false, false, false, " AND v.name LIKE 'Asset Account is' ")); $financialParams = array( 'entity_table' => 'civicrm_option_value', 'entity_id' => $optionValue['id'], -- 2.25.1