From db517dfe2b1a2ae3b7e13e338aeb82d0ff48988e Mon Sep 17 00:00:00 2001 From: Noah Miller Date: Tue, 24 Oct 2017 14:02:37 -0700 Subject: [PATCH] CRM-21346: Make pledge installment count & amount exportable --- CRM/Pledge/BAO/Query.php | 12 ++++++++++++ CRM/Pledge/DAO/Pledge.php | 10 +++++++++- xml/schema/Pledge/Pledge.xml | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CRM/Pledge/BAO/Query.php b/CRM/Pledge/BAO/Query.php index 9cf75496aa..2fe08d132c 100644 --- a/CRM/Pledge/BAO/Query.php +++ b/CRM/Pledge/BAO/Query.php @@ -63,6 +63,18 @@ class CRM_Pledge_BAO_Query extends CRM_Core_BAO_Query { $query->_tables['civicrm_pledge'] = $query->_whereTables['civicrm_pledge'] = 1; } + if (!empty($query->_returnProperties['pledge_original_installment_amount'])) { + $query->_select['pledge_original_installment_amount'] = 'civicrm_pledge.original_installment_amount as pledge_original_installment_amount'; + $query->_element['pledge_original_installment_amount'] = 1; + $query->_tables['civicrm_pledge'] = $query->_whereTables['civicrm_pledge'] = 1; + } + + if (!empty($query->_returnProperties['installments'])) { + $query->_select['installments'] = 'civicrm_pledge.installments as installments'; + $query->_element['installments'] = 1; + $query->_tables['civicrm_pledge'] = $query->_whereTables['civicrm_pledge'] = 1; + } + if (!empty($query->_returnProperties['pledge_create_date'])) { $query->_select['pledge_create_date'] = 'civicrm_pledge.create_date as pledge_create_date'; $query->_element['pledge_create_date'] = 1; diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php index cda4ed3aa6..d63802f49b 100644 --- a/CRM/Pledge/DAO/Pledge.php +++ b/CRM/Pledge/DAO/Pledge.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Pledge/Pledge.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:02d420c23b3c72fc2687cd857cc7d178) + * (GenCodeChecksum:0e2129564a1877226e6dfce2840ce831) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -318,6 +318,10 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 20, 2 ) , + 'export' => true, + 'where' => 'civicrm_pledge.original_installment_amount', + 'headerPattern' => '', + 'dataPattern' => '', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', 'bao' => 'CRM_Pledge_BAO_Pledge', @@ -404,6 +408,10 @@ class CRM_Pledge_DAO_Pledge extends CRM_Core_DAO { 'type' => CRM_Utils_Type::T_INT, 'title' => ts('Pledge Number of Installments') , 'description' => 'Total number of payments to be made.', + 'export' => true, + 'where' => 'civicrm_pledge.installments', + 'headerPattern' => '', + 'dataPattern' => '', 'default' => '1', 'table_name' => 'civicrm_pledge', 'entity' => 'Pledge', diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml index 897c36e326..6d4e15e519 100644 --- a/xml/schema/Pledge/Pledge.xml +++ b/xml/schema/Pledge/Pledge.xml @@ -116,6 +116,7 @@ Text + true currency @@ -187,6 +188,7 @@ Text + true start_date -- 2.25.1