Move paymentTableID to processor class

paymentid

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 96615a9da980cc827d7999a72aa35abfef2255b4..7614d268c43769d4ed87035d19976efb2246e954 100644 (file)
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -256,41 +256,6 @@ class CRM_Export_BAO_Export {
     return $groupBy;
   }
 
-  /**
-   * Define extra properties for the export based on query mode
-   *
-   * @param string $queryMode
-   *   Query Mode
-   * @return array $extraProperties
-   *   Extra Properties
-   */
-  public static function defineExtraProperties($queryMode) {
-    switch ($queryMode) {
-      case CRM_Contact_BAO_Query::MODE_EVENT:
-        $paymentTableId = 'participant_id';
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_MEMBER:
-        $paymentTableId = 'membership_id';
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_PLEDGE:
-        $paymentTableId = 'pledge_payment_id';
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_CASE:
-        $paymentTableId = '';
-        break;
-
-      default:
-        $paymentTableId = '';
-    }
-    $extraProperties = array(
-      'paymentTableId' => $paymentTableId,
-    );
-    return $extraProperties;
-  }
-
   /**
    * Get the list the export fields.
    *
@@ -344,6 +309,8 @@ class CRM_Export_BAO_Export {
     $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator);
     $returnProperties = array();
     $selectedPaymentFields = FALSE;
+    // @todo - this variable is overwritten later - it should be wholly definable in the processor fn.
+    $paymentTableId = $processor->getPaymentTableID();
 
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     // Warning - this imProviders var is used in a somewhat fragile way - don't rename it
@@ -441,9 +408,6 @@ class CRM_Export_BAO_Export {
         }
       }
 
-      $extraProperties = self::defineExtraProperties($queryMode);
-      $paymentTableId = $extraProperties['paymentTableId'];
-
       $returnProperties = array_merge($returnProperties, $processor->getAdditionalReturnProperties());
 
       if ($queryMode != CRM_Contact_BAO_Query::MODE_CONTACTS) {

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index e5d21a9177f633aa66d64397b7fe012cbc001559..449792fdb3ee08f4cd98d33e778fd666bd1f9069 100644 (file)
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -252,7 +252,7 @@ class CRM_Export_BAO_ExportProcessor {
    */
   public function isExportPaymentFields() {
     if ($this->getRequestedFields() === NULL
-      &&  in_array($this->getExportMode(), [
+      &&  in_array($this->getQueryMode(), [
         CRM_Contact_BAO_Query::MODE_EVENT,
         CRM_Contact_BAO_Query::MODE_MEMBER,
         CRM_Contact_BAO_Query::MODE_PLEDGE,