Skip to content
Snippets Groups Projects
Commit 726bc573 authored by Edselopez's avatar Edselopez
Browse files

RG-133 Modified query to add links for grant

parent dd640f94
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
CRM/Batch/BAO/Batch.php
+ 8
− 3
View file @ 726bc573
......@@ -641,8 +641,10 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch {
LEFT JOIN civicrm_entity_financial_trxn ON civicrm_entity_financial_trxn.financial_trxn_id = civicrm_financial_trxn.id
LEFT JOIN civicrm_entity_batch ON civicrm_entity_batch.entity_id = civicrm_financial_trxn.id
LEFT JOIN civicrm_contribution ON civicrm_contribution.id = civicrm_entity_financial_trxn.entity_id
LEFT JOIN civicrm_grant ON civicrm_grant.id = civicrm_entity_financial_trxn.entity_id
LEFT JOIN civicrm_financial_type ON civicrm_financial_type.id = civicrm_contribution.financial_type_id
LEFT JOIN civicrm_contact contact_a ON contact_a.id = civicrm_contribution.contact_id
LEFT JOIN civicrm_contact contact_id_grant ON contact_id_grant.id = civicrm_grant.contact_id
LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id = civicrm_contribution.id
";
......@@ -710,7 +712,8 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id
}
if (!empty($query->_where[0])) {
$where = implode(' AND ', $query->_where[0]) .
" AND civicrm_entity_batch.batch_id IS NULL ";
" AND civicrm_entity_batch.batch_id IS NULL
AND (civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution' OR civicrm_entity_financial_trxn.entity_table = 'civicrm_grant')";
$searchValue = TRUE;
}
else {
......@@ -720,10 +723,12 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id
if (!$searchValue) {
if (!$notPresent) {
$where = " ( civicrm_entity_batch.batch_id = {$entityID}
AND civicrm_entity_batch.entity_table = 'civicrm_financial_trxn' )";
AND civicrm_entity_batch.entity_table = 'civicrm_financial_trxn'
AND (civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution' OR civicrm_entity_financial_trxn.entity_table = 'civicrm_grant') )";
}
else {
$where = " ( civicrm_entity_batch.batch_id IS NULL )";
$where = " ( civicrm_entity_batch.batch_id IS NULL
AND (civicrm_entity_financial_trxn.entity_table = 'civicrm_contribution' OR civicrm_entity_financial_trxn.entity_table = 'civicrm_grant') )";
}
}
......
CRM/Financial/Form/BatchTransaction.php 0 → 100644
+ 197
− 0
View file @ 726bc573
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 4.3 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
/**
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2013
* $Id$
*
*/
/**
* This class generates form components for Financial Type
*
*/
class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form {
static $_links = NULL;
static $_entityID;
/**
* Batch status
* @var
*/
protected $_batchStatusId;
function preProcess() {
self::$_entityID = CRM_Utils_Request::retrieve( 'bid' , 'Positive' ) ? CRM_Utils_Request::retrieve( 'bid' , 'Positive' ) : $_POST['batch_id'];
$this->assign('entityID', self::$_entityID);
if (isset(self::$_entityID)) {
$this->_batchStatusId = CRM_Core_DAO::getFieldValue('CRM_Batch_BAO_Batch', self::$_entityID, 'status_id');
$this->assign('statusID', $this->_batchStatusId);
$batchTitle = CRM_Core_DAO::getFieldValue('CRM_Batch_BAO_Batch', self::$_entityID, 'title');
CRM_Utils_System::setTitle(ts('Accounting Batch - %1', array(1 => $batchTitle)));
$columnHeaders =
array(
'created_by' => ts('Created By'),
'status' => ts('Status'),
'description'=> ts('Description'),
'payment_instrument' => ts('Payment Instrument'),
'item_count' => ts('Entered Transactions'),
'assigned_item_count' => ts('Assigned Transactions'),
'total' => ts('Entered Total'),
'assigned_total' => ts('Assigned Total'),
'opened_date' => ts('Opened'),
);
$this->assign('columnHeaders', $columnHeaders);
}
}
/**
* Function to build the form
*
* @return None
* @access public
*/
public function buildQuickForm() {
if ($this->_batchStatusId == 2) {
$this->add('submit', 'export_batch', ts('Export Batch'));
}
// do not build rest of form unless it is open batch
if ($this->_batchStatusId != 1 ) {
return;
}
parent::buildQuickForm();
$this->add('submit', 'close_batch', ts('Close Batch'));
$this->add('submit', 'export_batch', ts('Close & Export Batch'));
// text for sort_name
$this->addElement('text',
'sort_name',
ts('Contributor Name or Email'),
CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact',
'sort_name'
)
);
$this->_group = CRM_Core_PseudoConstant::group();
// multiselect for groups
if ($this->_group) {
$this->add('select', 'group', ts('Groups'), $this->_group, FALSE,
array('id' => 'group', 'multiple' => 'multiple', 'title' => ts('- select -'))
);
}
$contactTags = CRM_Core_BAO_Tag::getTags();
if ($contactTags) {
$this->add('select', 'contact_tags', ts('Tags'), $contactTags, FALSE,
array('id' => 'contact_tags', 'multiple' => 'multiple', 'title' => ts('- select -'))
);
}
CRM_Contribute_BAO_Query::buildSearchForm($this);
$this->addElement('checkbox', 'toggleSelects', NULL, NULL);
$this->add( 'select',
'trans_remove',
ts('Task'),
array( '' => ts( '- actions -' )) + array( 'Remove' => ts('Remove from Batch')));
$this->add('submit','rSubmit', ts('Go'),
array(
'class' => 'form-submit',
'id' => 'GoRemove',
));
self::$_entityID = CRM_Utils_Request::retrieve('bid' , 'Positive');
$this->addButtons(
array(
array('type' => 'submit',
'name' => ts('Search'),
'isDefault' => TRUE,
)
)
);
$this->addElement('checkbox', 'toggleSelect', NULL, NULL);
$this->add( 'select',
'trans_assign',
ts('Task'),
array( '' => ts( '- actions -' )) + array( 'Assign' => ts( 'Assign to Batch' )));
$this->add('submit','submit', ts('Go'),
array(
'class' => 'form-submit',
'id' => 'Go',
));
$this->applyFilter('__ALL__', 'trim');
$this->addElement('hidden', 'batch_id', self::$_entityID);
$this->add('text', 'name', ts('Batch Name'));
}
function setDefaultValues() {
// do not setdefault unless it is open batch
if ($this->_batchStatusId != 1 ) {
return;
}
if (isset(self::$_entityID)) {
$paymentInstrumentID = CRM_Core_DAO::getFieldValue('CRM_Batch_BAO_Batch', self::$_entityID, 'payment_instrument_id');
$defaults['contribution_payment_instrument_id'] = $paymentInstrumentID;
$this->assign('paymentInstrumentID', $paymentInstrumentID);
}
return $defaults;
}
function &links() {
if (!(self::$_links)) {
self::$_links = array(
'view' => array(
'name' => ts('View'),
'url' => '%%url%%',
'qs' => 'reset=1&id=%%contid%%&cid=%%cid%%&action=view&context=contribution&selectedChild=contribute',
'title' => ts('View Contribution'),
),
'assign' => array(
'name' => ts('Assign'),
'ref' => 'disable-action',
'title' => ts('Assign Transaction'),
'extra' => 'onclick = "assignRemove( %%id%%,\'' . 'assign' . '\' );"',
)
);
}
return self::$_links;
}
}
CRM/Financial/Page/AJAX.php 0 → 100644
+ 476
− 0
View file @ 726bc573
This diff is collapsed.
CRM/Financial/Page/BatchTransaction.php 0 → 100644
+ 161
− 0
View file @ 726bc573
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 4.3 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
| CiviCRM is free software; you can copy, modify, and distribute it |
| under the terms of the GNU Affero General Public License |
| Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
| |
| CiviCRM is distributed in the hope that it will be useful, but |
| WITHOUT ANY WARRANTY; without even the implied warranty of |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
| See the GNU Affero General Public License for more details. |
| |
| You should have received a copy of the GNU Affero General Public |
| License and the CiviCRM Licensing Exception along |
| with this program; if not, contact CiviCRM LLC |
| at info[AT]civicrm[DOT]org. If you have questions about the |
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*/
/**
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2013
* $Id$
*
*/
/**
* Page for displaying list of financial batches
*/
class CRM_Financial_Page_BatchTransaction extends CRM_Core_Page_Basic {
/**
* The action links that we need to display for the browse screen
*
* @var array
* @static
*/
static $_links = null;
static $_entityID;
static $_columnHeader = null;
static $_returnvalues = null;
/**
* Get BAO Name
*
* @return string Classname of BAO.
*/
function getBAOName() {
return 'CRM_Batch_BAO_Batch';
}
/**
* Get action Links
*
* @return array (reference) of action links
*/
function &links() {
if (!(self::$_links)) {
self::$_links = array(
'view' => array(
'name' => ts('View'),
'url' => '%%url%%',
'qs' => 'reset=1&id=%%contid%%&cid=%%cid%%&action=view&context=contribution&selectedChild=contribute',
'title' => ts('View Contribution'),
),
'remove' => array(
'name' => ts('Remove'),
'title' => ts('Remove Transaction'),
'extra' => 'onclick = "assignRemove( %%id%%,\'' . 'remove' . '\' );"',
),
);
}
return self::$_links;
}
/**
* Run the page.
*
* This method is called after the page is created. It checks for the
* type of action and executes that action.
* Finally it calls the parent's run method.
*
* @return void
* @access public
*
*/
function run() {
// get the requested action
$action = CRM_Utils_Request::retrieve('action', 'String', $this, false, 'browse'); // default to 'browse'
// assign vars to templates
$this->assign('action', $action);
self::$_entityID = CRM_Utils_Request::retrieve('bid' , 'Positive');
if (isset(self::$_entityID)) {
$statusID = CRM_Core_DAO::getFieldValue('CRM_Batch_BAO_Batch', self::$_entityID, 'status_id');
}
$breadCrumb =
array(
array(
'title' => ts('Accounting Batches'),
'url' => CRM_Utils_System::url('civicrm/financial/financialbatches',
"reset=1&batchStatus=$statusID"),
)
);
CRM_Utils_System::appendBreadCrumb($breadCrumb);
$this->edit($action, self::$_entityID);
return parent::run();
}
/**
* Browse all financial batch transactions
*
*
* @return void
* @access public
* @static
*/
function browse() {
}
/**
* Get name of edit form
*
* @return string Classname of edit form.
*/
function editForm() {
return 'CRM_Financial_Form_BatchTransaction';
}
/**
* Get edit form name
*
* @return string name of this page.
*/
function editName() {
return 'Batch';
}
/**
* Get user context.
*
* @return string user context.
*/
function userContext($mode = null) {
return 'civicrm/batchtransaction';
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment