Merge pull request #12482 from mattwire/nfc_cc_premium_financial

NFC cleanup to financial classes
civicrm · Jul 17, 2018 · d77cfac · d77cfac
2 parents d727eac + a2fb468
commit d77cfac
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -4852,7 +4852,7 @@ public function loadRelatedMembershipObjects($ids = []) {
    *
    * @param array $params
    *
-   * @return object
+   * @return CRM_Financial_DAO_FinancialTrxn
    */
   public static function recordPartialPayment($contribution, $params) {
     $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');

diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php
@@ -350,7 +350,6 @@ public static function createPremiumTrxn($params) {
       $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
       $toFinancialAccountType = !empty($params['isDeleted']) ? 'Premiums Inventory Account is' : 'Cost of Sales Account is';
       $fromFinancialAccountType = !empty($params['isDeleted']) ? 'Cost of Sales Account is' : 'Premiums Inventory Account is';
-      $accountRelationship = array_flip($accountRelationship);
       $financialtrxn = array(
         'to_financial_account_id' => CRM_Contribute_PseudoConstant::getRelationalFinancialAccount($params['financial_type_id'], $toFinancialAccountType),
         'from_financial_account_id' => CRM_Contribute_PseudoConstant::getRelationalFinancialAccount($params['financial_type_id'], $fromFinancialAccountType),
@@ -387,7 +386,7 @@ public static function createPremiumTrxn($params) {
    * @param array $params
    *   To create trxn entries.
    *
-   * @return bool
+   * @return bool|void
    */
   public static function recordFees($params) {
     $domainId = CRM_Core_Config::domainID();
@@ -482,7 +481,6 @@ public static function getPartialPaymentWithType($entityId, $entityName = 'parti
 ";
 
       $ftTotalAmt = CRM_Core_DAO::singleValueQuery($sqlFtTotalAmt);
-      $value = 0;
       if (!$ftTotalAmt) {
         $ftTotalAmt = 0;
       }

diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php
@@ -32,11 +32,6 @@
  */
 class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAccount {
 
-  /**
-   * Static holder for the default LT.
-   */
-  static $_defaultContributionType = NULL;
-
   /**
    * Class constructor.
    */

diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
@@ -247,7 +247,7 @@ public static function retrieveEntityFinancialTrxn($params, $maxId = FALSE) {
    * @param array $error
    *   Error to display.
    *
-   * @return array
+   * @return array|bool
    */
   public static function checkContactPresent($contactIds, &$error) {
     if (empty($contactIds)) {