From cd15501da85cd9481300d9efecf1295551e55a01 Mon Sep 17 00:00:00 2001
From: Guanhuan Chen <oooomic@gmail.com>
Date: Fri, 2 Oct 2015 16:35:14 +0100
Subject: [PATCH] Condense credit note number query

---
 CRM/Contribute/BAO/Contribution.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index fb47a665c5..8f8d3c7d73 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -142,7 +142,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
       if (($params['contribution_status_id'] == array_search('Refunded', $contributionStatus)
           || $params['contribution_status_id'] == array_search('Cancelled', $contributionStatus))
       ) {
-        if (is_null($params['creditnote_id']) || $params['creditnote_id'] == "null") {
+        if (empty($params['creditnote_id']) || $params['creditnote_id'] == "null") {
           $params['creditnote_id'] = self::createCreditNoteId();
         }
       }
@@ -332,7 +332,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
       if (($params['contribution_status_id'] == array_search('Refunded', $contributionStatus)
           || $params['contribution_status_id'] == array_search('Cancelled', $contributionStatus))
       ) {
-        if (is_null($params['creditnote_id']) || $params['creditnote_id'] == "null") {
+        if (empty($params['creditnote_id']) || $params['creditnote_id'] == "null") {
           $params['creditnote_id'] = self::createCreditNoteId();
         }
       }
@@ -3021,7 +3021,7 @@ WHERE  contribution_id = %1 ";
           || $params['contribution']->contribution_status_id == array_search('Cancelled', $contributionStatus))
       ) {
         $params['trxnParams']['total_amount'] = -$params['total_amount'];
-        if (is_null($params['contribution']->creditnote_id) || $params['contribution']->creditnote_id == "null") {
+        if (empty($params['contribution']->creditnote_id) || $params['contribution']->creditnote_id == "null") {
           $creditNoteId = self::createCreditNoteId();
           CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Contribution', $params['contribution']->id, 'creditnote_id', $creditNoteId);
         }
@@ -3764,7 +3764,7 @@ WHERE con.id = {$contributionId}
   }
 
   /**
-   * Generate credit note id with next avaible number 
+   * Generate credit note id with next avaible number
    *
    * @return string
    *   Credit Note Id.
@@ -3772,12 +3772,9 @@ WHERE con.id = {$contributionId}
   public static function createCreditNoteId() {
     $prefixValue = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::CONTRIBUTE_PREFERENCES_NAME, 'contribution_invoice_settings');
 
-    $query = "select count(creditnote_id) as creditnote_number from civicrm_contribution";
-    $dao = CRM_Core_DAO::executeQuery($query);
-    $dao->fetch();
-    $creditNoteNum = $dao->creditnote_number;
+    $creditNoteNum = CRM_Core_DAO::singleValueQuery("SELECT count(creditnote_id) as creditnote_number FROM civicrm_contribution");
     $creditNoteId = NULL;
-    
+
     do {
       $creditNoteNum++;
       $creditNoteId = CRM_Utils_Array::value('credit_notes_prefix', $prefixValue) . "" . $creditNoteNum;
-- 
2.25.1