X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContribute%2FBAO%2FContributionSoft.php;h=a5eaeb3cac2b445b14e9e391fbef49cb8a945875;hb=2f0647c7ae0cf29bc75cf7ab5e4da896a01a8a99;hp=c0a7ac8a107ee054d12e0596a284f89ff418ad64;hpb=22fd90d480014f0a551b25bea675a03d2153de78;p=civicrm-core.git diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php index c0a7ac8a10..a5eaeb3cac 100644 --- a/CRM/Contribute/BAO/ContributionSoft.php +++ b/CRM/Contribute/BAO/ContributionSoft.php @@ -1,7 +1,7 @@ copyValues($params); if ($contributionSoft->find(TRUE)) { @@ -83,16 +83,15 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio } /** - * Delete soft credits + * Delete soft credits. * * @param array $params * - * @static */ - static function del($params) { + public static function del($params) { //delete from contribution soft table $contributionSoft = new CRM_Contribute_DAO_ContributionSoft(); - foreach($params as $column => $value) { + foreach ($params as $column => $value) { $contributionSoft->$column = $value; } $contributionSoft->delete(); @@ -104,7 +103,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * * @return array */ - static function getSoftContributionTotals($contact_id, $isTest = 0) { + public static function getSoftContributionTotals($contact_id, $isTest = 0) { $query = ' SELECT SUM(amount) as amount, AVG(total_amount) as average, cc.currency FROM civicrm_contribution_soft ccs @@ -112,8 +111,10 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio WHERE cc.is_test = %2 AND ccs.contact_id = %1 GROUP BY currency'; - $params = array(1 => array($contact_id, 'Integer'), - 2 => array($isTest, 'Integer')); + $params = array( + 1 => array($contact_id, 'Integer'), + 2 => array($isTest, 'Integer'), + ); $cs = CRM_Core_DAO::executeQuery($query, $params); @@ -143,12 +144,13 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * Retrieve soft contributions for contribution record. * * @param int $contributionID - * @param boolean $all include PCP data + * @param bool $all + * Include PCP data. * - * @return array of soft contribution ids, amounts, and associated contact ids - * @static + * @return array + * Array of soft contribution ids, amounts, and associated contact ids */ - static function getSoftContribution($contributionID, $all = FALSE) { + public static function getSoftContribution($contributionID, $all = FALSE) { $pcpFields = array( 'pcp_id', 'pcp_title', @@ -188,7 +190,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio 'amount' => $dao->amount, 'contact_name' => $dao->display_name, 'soft_credit_type' => $dao->soft_credit_type_id, - 'soft_credit_type_label' => CRM_Core_OptionGroup::getLabel('soft_credit_type', $dao->soft_credit_type_id) + 'soft_credit_type_label' => CRM_Core_OptionGroup::getLabel('soft_credit_type', $dao->soft_credit_type_id), ); $count++; } @@ -203,7 +205,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * * @return array */ - static function getSoftCreditIds($contributionID , $isPCP = FALSE) { + public static function getSoftCreditIds($contributionID, $isPCP = FALSE) { $query = " SELECT id FROM civicrm_contribution_soft @@ -233,14 +235,15 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio /** * Function to retrieve the list of soft contributions for given contact. * - * @param int $contact_id contact id - * @param int $isTest - * @param string $filter additional filter criteria, later used in where clause + * @param int $contact_id + * Contact id. + * @param string $filter + * @param int $isTest + * Additional filter criteria, later used in where clause. * * @return array - * @static */ - static function getSoftContributionList($contact_id, $filter = NULL, $isTest = 0) { + public static function getSoftContributionList($contact_id, $filter = NULL, $isTest = 0) { $query = ' SELECT ccs.id, ccs.amount as amount, ccs.contribution_id, @@ -276,7 +279,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio $params = array( 1 => array($contact_id, 'Integer'), - 2 => array($isTest, 'Integer') + 2 => array($isTest, 'Integer'), ); $cs = CRM_Core_DAO::executeQuery($query, $params); $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); @@ -304,21 +307,17 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio return $result; } - /* - * Function to assign honor profile fields to template/form, if $honorId (as soft-credit's contact_id) - * is passed then whole honoreeprofile fields with title/value assoc array assigned or only honoreeName - * is assigned - * - * @static - */ - /** + * Function to assign honor profile fields to template/form, if $honorId (as soft-credit's contact_id) + * is passed then whole honoreeprofile fields with title/value assoc array assigned or only honoreeName + * is assigned + * * @param CRM_Core_Form $form * @param array $params * @param int $honoreeprofileId * @param int $honorId */ - static function formatHonoreeProfileFields($form, $params, $honoreeprofileId, $honorId = NULL) { + public static function formatHonoreeProfileFields($form, $params, $honoreeprofileId, $honorId = NULL) { $profileContactType = CRM_Core_BAO_UFGroup::getContactType($honoreeprofileId); $profileFields = CRM_Core_BAO_UFGroup::getFields($honoreeprofileId); $honoreeProfileFields = $values = array(); @@ -344,24 +343,26 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio ); unset($profileFields['prefix_id']); } - $honorName .= ' ' . $params['first_name'] . ' ' . $params['last_name']; - unset($profileFields['first_name']); - unset($profileFields['last_name']); - if (array_key_exists('suffix_id', $params)) { - $honorName .= ' ' . CRM_Utils_Array::value(CRM_Utils_Array::value('suffix_id', $params), + $honorName .= ' ' . $params['first_name'] . ' ' . $params['last_name']; + unset($profileFields['first_name']); + unset($profileFields['last_name']); + if (array_key_exists('suffix_id', $params)) { + $honorName .= ' ' . CRM_Utils_Array::value(CRM_Utils_Array::value('suffix_id', $params), CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id') ); - unset($profileFields['suffix_id']); - } - break; - case 'Organization': - $honorName = $params['organization_name']; - unset($profileFields['organization_name']); - break; - case 'Household': - $honorName = $params['household_name']; - unset($profileFields['household_name']); - break; + unset($profileFields['suffix_id']); + } + break; + + case 'Organization': + $honorName = $params['organization_name']; + unset($profileFields['organization_name']); + break; + + case 'Household': + $honorName = $params['household_name']; + unset($profileFields['household_name']); + break; } if ($honorId) { @@ -376,5 +377,5 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio $form->assign('honorName', $honorName); } } -} +}