From: Pradeep Nayak <pradeep@pradeep.(none)>
Date: Thu, 30 May 2013 15:49:28 +0000 (+0530)
Subject: -- worked on CRM-12665
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3ec41c6b94fbc14be782f4f8badd5cee72b64206;p=civicrm-core.git

-- worked on CRM-12665

----------------------------------------
* CRM-12665: Remove unwanted files in Grant
  http://issues.civicrm.org/jira/browse/CRM-12665
---

diff --git a/CRM/Grant/Controller/PaymentSearch.php b/CRM/Grant/Controller/PaymentSearch.php
deleted file mode 100644
index 0f5064876d..0000000000
--- a/CRM/Grant/Controller/PaymentSearch.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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$
- *
- */
-
-require_once 'CRM/Core/Controller.php';
-require_once 'CRM/Core/Session.php';
-
-/**
- * This class is used by the Search functionality.
- *
- *  - the search controller is used for building/processing multiform
- *    searches.
- *
- * Typically the first form will display the search criteria and it's results
- *
- * The second form is used to process search results with the asscociated actions
- *
- */
-class CRM_Grant_Controller_PaymentSearch extends CRM_Core_Controller
-{
-    /**
-     * class constructor
-     */
-    function __construct( $title = null, $action = CRM_Core_Action::NONE, $modal = true )
-    {
-        require_once 'CRM/Grant/StateMachine/PaymentSearch.php';
-        
-        parent::__construct( $title, $modal );
-        
-        $this->_stateMachine = new CRM_Grant_StateMachine_PaymentSearch( $this, $action );
-        
-        // create and instantiate the pages
-        $this->addPages( $this->_stateMachine, $action );
-        
-        // add all the actions
-        $config = CRM_Core_Config::singleton( );
-        $this->addActions( );
-    }
-}
-
diff --git a/CRM/Grant/Page/GrantProgram.php b/CRM/Grant/Page/GrantProgram.php
deleted file mode 100644
index 4d25de60da..0000000000
--- a/CRM/Grant/Page/GrantProgram.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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$
- *
- */
-
-require_once 'CRM/Core/Page.php';
-require_once 'CRM/Grant/BAO/GrantProgram.php';
-
-
-/**
- * Page for displaying list of contribution types
- */
-class CRM_Grant_Page_GrantProgram extends CRM_Core_Page
-{
-
-    protected $_id;
-    /**
-     * The action links that we need to display for the browse screen
-     *
-     * @var array
-     */
-    private static $_links;
-    /**
-     * Get action Links
-     *
-     * @return array (reference) of action links
-     */
-    function &links()
-        {
-            if (!(self::$_links)) {
-                self::$_links = array(
-                                      CRM_Core_Action::VIEW  => array(
-                                                                      'name'  => ts('View'),
-                                                                      'url'   => 'civicrm/grant_program',
-                                                                      'qs'    => 'action=view&id=%%id%%&reset=1',
-                                                                      'title' => ts('View Grant Program') 
-                                                                      ),
-                                      CRM_Core_Action::UPDATE  => array(
-                                                                        'name'  => ts('Edit'),
-                                                                        'url'   => 'civicrm/grant_program',
-                                                                        'qs'    => 'action=update&id=%%id%%&reset=1',
-                                                                        'title' => ts('Edit Grant Program') 
-                                                                        ),
-                                      CRM_Core_Action::DELETE  => array(
-                                                                        'name'  => ts('Delete'),
-                                                                        'url'   => 'civicrm/grant_program',
-                                                                        'qs'    => 'action=delete&id=%%id%%',
-                                                                        'title' => ts('Delete Grant Program') 
-                                                                        )
-                                      );
-            }
-            return self::$_links;
-        }
-    
-    function browse( ) {
-        
-        $grantProgram = array();
-        require_once 'CRM/Grant/DAO/GrantProgram.php';
-        $dao = new CRM_Grant_DAO_GrantProgram();
-        
-        $dao->orderBy('label');
-        $dao->find();
-        
-        while ($dao->fetch()) {
-            $grantProgram[$dao->id] = array();
-            CRM_Core_DAO::storeValues( $dao, $grantProgram[$dao->id]);
-            $action = array_sum(array_keys($this->links()));
-
-            $grantProgram[$dao->id]['action'] = CRM_Core_Action::formLink(self::links(), $action, 
-                                                                          array('id' => $dao->id));
-        }
-        require_once 'CRM/Grant/PseudoConstant.php';
-        $grantType   = CRM_Grant_PseudoConstant::grantType( );
-        $grantStatus = CRM_Grant_PseudoConstant::grantProgramStatus( );
-        foreach ( $grantProgram as $key => $value ) {
-            $grantProgram[$key]['grant_type_id'] = $grantType[CRM_Grant_BAO_GrantProgram::getOptionValue($grantProgram[$key]['grant_type_id'])];
-            $grantProgram[$key]['status_id'] = $grantStatus[CRM_Grant_BAO_GrantProgram::getOptionValue($grantProgram[$key]['status_id'])];
-        }
-        $this->assign('rows',$grantProgram );
-    }
-    
-    function run( ) 
-    {
-        $action = CRM_Utils_Request::retrieve('action', 'String',
-                                              $this, false, 0 );
-        if ( $action & CRM_Core_Action::VIEW ) { 
-            $this->view( $action); 
-        } else if ( $action & ( CRM_Core_Action::UPDATE | CRM_Core_Action::ADD | CRM_Core_Action::DELETE ) ) {
-            $this->edit( $action);
-        } else {
-            $this->browse( ); 
-        }
-        $this->assign('action', $action);
-        return parent::run( );
-    }
-
-    function edit($action)
-    {
-        $controller = new CRM_Core_Controller_Simple('CRM_Grant_Form_GrantProgram', ts(''), $action);
-        $controller->setEmbedded(true);
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-
-    function view( $action ) 
-    {   
-        $controller = new CRM_Core_Controller_Simple( 'CRM_Grant_Form_GrantProgramView', ts(''), $action );
-        $controller->setEmbedded( true );  
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-}
diff --git a/CRM/Grant/Page/Payment.php b/CRM/Grant/Page/Payment.php
deleted file mode 100644
index 13ec19bfd8..0000000000
--- a/CRM/Grant/Page/Payment.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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$
- *
- */
-
-require_once 'CRM/Core/Page.php';
-require_once 'CRM/Grant/BAO/GrantProgram.php';
-
-
-/**
- * Page for displaying list of contribution types
- */
-class CRM_Grant_Page_Payment extends CRM_Core_Page
-{
-
-    
-    function run( ) 
-    {
-        $action = CRM_Utils_Request::retrieve('action', 'String',
-                                              $this, false, 0 );
-        if ( $action & CRM_Core_Action::VIEW ) { 
-            $this->view( $action ); 
-        } elseif ( $action & ( CRM_Core_Action::STOP) ) {
-            $this->stop( $action );
-        } elseif ( $action & ( CRM_Core_Action::REPRINT ) ) {
-            $this->reprint( $action ); 
-        } else {
-            $this->withdraw( $action ); 
-        }
-        $this->assign('action', $action);
-        return parent::run( );
-    }
-
-
-    function view( $action ) 
-    {   
-        $controller = new CRM_Core_Controller_Simple( 'CRM_Grant_Form_Payment_View', ts(''), $action );
-        $controller->setEmbedded( true );  
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-
-    function stop( $action ) 
-    {   
-        $controller = new CRM_Core_Controller_Simple( 'CRM_Grant_Form_Payment_View', ts(''), $action );
-        $controller->setEmbedded( true );  
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-
-    function reprint( $action ) 
-    {   
-        $controller = new CRM_Core_Controller_Simple( 'CRM_Grant_Form_Payment_View', ts(''), $action );
-        $controller->setEmbedded( true );  
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-
-    function withdraw( $action ) 
-    {   
-        $controller = new CRM_Core_Controller_Simple( 'CRM_Grant_Form_Payment_View', ts(''), $action );
-        $controller->setEmbedded( true );  
-        $result = $controller->process();
-        $result = $controller->run();
-    }
-}
diff --git a/CRM/Grant/Selector/PaymentSearch.php b/CRM/Grant/Selector/PaymentSearch.php
deleted file mode 100644
index 5ef5734c88..0000000000
--- a/CRM/Grant/Selector/PaymentSearch.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?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$
- *
- */
-
-require_once 'CRM/Core/Selector/Base.php';
-require_once 'CRM/Core/Selector/API.php';
-
-require_once 'CRM/Utils/Pager.php';
-require_once 'CRM/Utils/Sort.php';
-
-require_once 'CRM/Grant/BAO/PaymentSearch.php';
-
-/**
- * This class is used to retrieve and display a range of
- * contacts that match the given criteria (specifically for
- * results of advanced search options.
- *
- */
-class CRM_Grant_Selector_PaymentSearch extends CRM_Core_Selector_Base implements CRM_Core_Selector_API 
-{
-    
-    /**
-     * This defines two actions- View and Edit.
-     *
-     * @var array
-     * @static
-     */
-    static $_links = null;
-
-    /**
-     * we use desc to remind us what that column is, name is used in the tpl
-     *
-     * @var array
-     * @static
-     */
-    static $_columnHeaders;
-
-    /**
-     * Properties of contact we're interested in displaying
-     * @var array
-     * @static
-     */
-    static $_properties = array( 'id',
-                                 'payable_to_name',
-                                 'payment_batch_number',
-                                 'payment_number',
-                                 'payment_status_id',
-                                 'payment_created_date',
-                                 'amount',
-                                 );
-
-    /** 
-     * are we restricting ourselves to a single contact 
-     * 
-     * @access protected   
-     * @var boolean   
-     */   
-    protected $_single = false;
-
-    /**  
-     * are we restricting ourselves to a single contact  
-     *  
-     * @access protected    
-     * @var boolean    
-     */    
-    protected $_limit = null;
-
-    /**
-     * what context are we being invoked from
-     *   
-     * @access protected     
-     * @var string
-     */     
-    protected $_context = null;
-
-    /**
-     * queryParams is the array returned by exportValues called on
-     * the HTML_QuickForm_Controller for that page.
-     *
-     * @var array
-     * @access protected
-     */
-    public $_queryParams; 
-
-    /**
-     * represent the type of selector
-     *
-     * @var int
-     * @access protected
-     */
-    protected $_action;
-
-    /** 
-     * The additional clause that we restrict the search with 
-     * 
-     * @var string 
-     */ 
-    protected $_grantClause = null;
-
-    /** 
-     * The query object
-     * 
-     * @var string 
-     */ 
-    protected $_query;
-
-    /**
-     * Class constructor
-     *
-     * @param array   $queryParams array of parameters for query
-     * @param int     $action - action of search basic or advanced.
-     * @param string  $grantClause if the caller wants to further restrict the search 
-     * @param boolean $single are we dealing only with one contact?
-     * @param int     $limit  how many participations do we want returned
-     *
-     * @return CRM_Contact_Selector
-     * @access public
-     */
-    function __construct(&$queryParams,
-                         $action = CRM_Core_Action::NONE,
-                         $grantClause = null,
-                         $single = false,
-                         $limit = null,
-                         $context = 'search' ) 
-    {
-        // submitted form values
-        $this->_queryParams =& $queryParams;
-        
-
-        $this->_single  = $single;
-        $this->_limit   = $limit;
-        $this->_context = $context;
-
-        $this->_grantClause = $grantClause;
-
-        // type of selector
-        $this->_action = $action;
-
-        $this->_query = new CRM_Grant_BAO_PaymentSearch( $this->_queryParams, null, null, false, false,
-                                                         CRM_Grant_BAO_PaymentSearch::MODE_GRANT_PAYMENT );
-     
-        
-        $this->_query->_distinctComponentClause = " civicrm_payment.id";
-        $this->_query->_groupByComponentClause  = " GROUP BY civicrm_payment.id";
-      
-    }//end of constructor
-
-
-    /**
-     * This method returns the links that are given for each search row.
-     * currently the links added for each row are 
-     * 
-     * - View
-     * - Edit
-     *
-     * @return array
-     * @access public
-     *
-     */
-    static function &links( $key = null )
-    {       
-        $id = CRM_Utils_Request::retrieve('id', 'Integer', $this);
-        $extraParams = ( $key ) ? "&key={$key}" : null;
-        
-        if (!(self::$_links)) {
-            self::$_links = array(
-                                  CRM_Core_Action::VIEW     => array(
-                                                                     'name'     => ts('View'),
-                                                                     'url'      => 'civicrm/grant/payment',
-                                                                     'qs'       => 'reset=1&id=%%id%%&action=view&context=%%cxt%%&selectedChild=grant'.$extraParams,
-                                                                     'title'    => ts('View Grant'),
-                                                                     ), 
-                                  CRM_Core_Action::STOP     => array(
-                                                                     'name'     => ts('Stop'),
-                                                                     'url'      => 'civicrm/grant/payment',
-                                                                     'qs'       => 'reset=1&action=stop&id=%%id%%&context=%%cxt%%'.$extraParams,
-                                                                     'title'    => ts('Edit Grant'),
-                                                                     ),
-                                  CRM_Core_Action::REPRINT  => array(
-                                                                     'name'     => ts('Reprint'),
-                                                                     'url'      => 'civicrm/grant/payment',
-                                                                     'qs'       => 'reset=1&action=reprint&id=%%id%%&context=%%cxt%%'.$extraParams,
-                                                                     'title'    => ts('Edit Grant'),
-                                                                     ),
-                                  CRM_Core_Action::WITHDRAW => array(
-                                                                     'name'     => ts('Withdraw'),
-                                                                     'url'      => 'civicrm/grant/payment',
-                                                                     'qs'       => 'reset=1&action=withdraw&id=%%id%%&context=%%cxt%%'.$extraParams,
-                                                                     'title'    => ts('Edit Grant'),
-                                                                     )
-                                  );
-            
-            self::$_links =  self::$_links  ;
-           
-        }
-       
-        
-        return self::$_links;
-    } //end of function
-        
-    /**
-     * getter for array of the parameters required for creating pager.
-     *
-     * @param 
-     * @access public
-     */
-    function getPagerParams($action, &$params) 
-    {
-        $params['status']       = ts('Grant') . ' %%StatusMessage%%';
-        $params['csvString']    = null;
-        if ( $this->_limit ) {
-            $params['rowCount']     = $this->_limit;
-        } else {
-            $params['rowCount']     = CRM_Utils_Pager::ROWCOUNT;
-        }
-
-        $params['buttonTop']    = 'PagerTopButton';
-        $params['buttonBottom'] = 'PagerBottomButton';
-    } //end of function
-
-    /**
-     * Returns total number of rows for the query.
-     *
-     * @param 
-     * @return int Total number of rows 
-     * @access public
-     */
-    function getTotalCount($action)
-    { 
-        return $this->_query->searchQuery( 0, 0, null,
-                                           true, false, 
-                                           false, false, 
-                                           false, 
-                                           $this->_grantClause );
-       
-    }
-
-    
-    /**
-     * returns all the rows in the given offset and rowCount     *
-     * @param enum   $action   the action being performed
-     * @param int    $offset   the row number to start from
-     * @param int    $rowCount the number of rows to return
-     * @param string $sort     the sql string that describes the sort order
-     * @param enum   $output   what should the result set include (web/email/csv)
-     *
-     * @return int   the total number of rows for this action
-     */
-     function &getRows($action, $offset, $rowCount, $sort, $output = null) 
-     {  
-         $result = $this->_query->searchQuery( $offset, $rowCount, $sort,
-                                               false, false, 
-                                               false, false, 
-                                               false, 
-                                               $this->_grantClause );
-       
-         
-         
-
-         // process the result of the query
-         $rows = array( );
-         
-         //CRM-4418 check for view, edit, delete
-         $permissions = array( CRM_Core_Permission::VIEW );
-         if ( CRM_Core_Permission::check( 'edit grants' ) ) {
-             $permissions[] = CRM_Core_Permission::EDIT;
-         }
-         if ( CRM_Core_Permission::check( 'delete in CiviGrant' ) ) {
-             $permissions[] = CRM_Core_Permission::DELETE;
-         }
-         $mask = CRM_Core_Action::mask( $permissions ); 
-   
-        
-         while ( $result->fetch()) {
-             $row = array();
-             
-             // the columns we are interested in
-             foreach (self::$_properties as $property) {
-                 if ( isset( $result->$property ) ) {
-                     if ( $property == 'payment_status_id' ) {
-                         require_once 'CRM/Core/OptionGroup.php';
-                         $paymentStatus = CRM_Core_OptionGroup::values( 'grant_payment_status' );
-                         $row[$property] = $paymentStatus[$result->$property];
-                     } else {
-                         $row[$property] = $result->$property;
-                     }
-                 }
-             }
-             // if ($this->_context == 'search') {
-             //     $row['checkbox'] = CRM_Core_Form::CB_PREFIX . $result->id;
-             // }
-             $this->id = $result->id; 
-             $link = self::links( $this->_key);
-             if ( $result->payment_status_id == 2 || $result->payment_status_id == 4 ) {
-                unset($link[CRM_Core_Action::STOP]); 
-                unset($link[CRM_Core_Action::REPRINT]);
-                unset($link[CRM_Core_Action::WITHDRAW]);
-             }
-             
-             $row['action']   = CRM_Core_Action::formLink( $link, 
-                                                           $mask,
-                                                           array( 'id'  => $result->id,
-                                                                  'cxt' => $this->_context ) );
-
-             $rows[] = $row;
-         }
-         return $rows;
-     }
-     
-     
-     /**
-      * @return array              $qill         which contains an array of strings
-      * @access public
-      */
-     
-     // the current internationalisation is bad, but should more or less work
-     // for most of "European" languages
-     public function getQILL( )
-     { 
-         return $this->_query->qill( );
-     }
-     
-     /** 
-      * returns the column headers as an array of tuples: 
-     * (name, sortName (key to the sort array)) 
-     * 
-     * @param string $action the action being performed 
-     * @param enum   $output what should the result set include (web/email/csv) 
-     * 
-     * @return array the column headers that need to be displayed 
-     * @access public 
-     */ 
-    public function &getColumnHeaders( $action = null, $output = null ) 
-    {       
-        if ( ! isset( self::$_columnHeaders ) ) {
-            self::$_columnHeaders = array(
-                                          array('name'      => ts('Status'),
-                                                'sort'      => 'payment_status_id',
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array(
-                                                'name'      => ts('Batch Number'),
-                                                'sort'      => 'payment_batch_number',
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array(
-                                                'name'      => ts('Payment Number'),
-                                                'sort'      => 'payment_number',
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array(
-                                                'name'      => ts('Date'),
-                                                'sort'      => 'payment_created_date',
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array(
-                                                'name'      => ts('Payee name'),
-                                                'sort'      => 'payable_to_name',                                                
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array(
-                                                'name'      => ts('Amount'),
-                                                'sort'      => 'amount',                                                
-                                                'direction' => CRM_Utils_Sort::DONTCARE,
-                                                ),
-                                          array('desc' => ts('Actions') ),
-                                          );
-        }
-        return self::$_columnHeaders;
-    }
-    
-    function &getQuery( ) {
-        return $this->_query;
-    }
-
-    /** 
-     * name of export file. 
-     * 
-     * @param string $output type of output 
-     * @return string name of the file 
-     */ 
-     function getExportFileName( $output = 'csv') { 
-         return ts('CiviCRM Grant Search'); 
-     } 
-
-}//end of class
-
-
diff --git a/templates/CRM/Grant/Form/Task/Update.tpl b/templates/CRM/Grant/Form/Task/Update.tpl
index 85be5f228f..e637fb0027 100644
--- a/templates/CRM/Grant/Form/Task/Update.tpl
+++ b/templates/CRM/Grant/Form/Task/Update.tpl
@@ -28,44 +28,18 @@
     <p>{ts}Enter values for the fields you wish to update. Leave fields blank to preserve existing values.{/ts}</p>
     <table class="form-layout-compressed">
         {* Loop through all defined search criteria fields (defined in the buildForm() function). *}
-     <tr class="crm-contact-custom-search-form-row-status_id">
-       <td class="label">{$form.status_id.label}</td>
-       <td>{$form.status_id.html}</td>
-    </tr>
-    <tr class="crm-contact-custom-search-form-row-radio_ts">
-       <td class="label">{$form.radio_ts.amount_granted.label}</td>
-       <td>{$form.radio_ts.amount_granted.html}</td>
-    </tr>
-    <tr class="crm-contact-custom-search-form-row-radio_ts">
-       <td class="label"></td>
-       <td>{$form.amount_granted.html}</td>
-    </tr>
-    <tr class="crm-contact-custom-search-form-row-radio_ts">
-       <td class="label">{$form.radio_ts.amount_total.label}</td>
-       <td>{$form.radio_ts.amount_total.html}</td>
-    </tr>
-
-    <tr class="crm-contact-custom-search-form-row-decision_date">
-       <td class="label">{$form.decision_date.label}</td>
+        {foreach from=$elements item=element}
+            <tr class="crm-contact-custom-search-form-row-{$element}">
+                <td class="label">{$form.$element.label}</td>
+                {if $element eq 'decision_date'}
                     <td>{include file="CRM/common/jcalendar.tpl" elementName=decision_date}<br />
                     <span class="description">{ts}Date on which the grant decision was finalized.{/ts}</span></td>
+                {else}
+                    <td>{$form.$element.html}</td>
+                {/if}
             </tr>
+        {/foreach}
     </table>
     <p>{ts 1=$totalSelectedGrants}Number of selected grants: %1{/ts}</p>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div><!-- /.crm-form-block -->
-
-<script type="text/javascript">
-    {literal} 
-
-cj("#CIVICRM_QFID_amount_total_4").click(function() {
-   cj("#amount_total").show();
-   cj("#amount_granted").hide();
-   cj("#amount_granted").val(null);
-});
-
-cj("#CIVICRM_QFID_amount_granted_2").click(function() {
-   cj("#amount_granted").show();
-});
-    {/literal}
-</script>
\ No newline at end of file
diff --git a/templates/CRM/Grant/Page/Payment.tpl b/templates/CRM/Grant/Page/Payment.tpl
deleted file mode 100644
index ab5e7d1ff2..0000000000
--- a/templates/CRM/Grant/Page/Payment.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | 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        |
- +--------------------------------------------------------------------+
-*}
-{if $action eq 4 or $action eq 524288 or $action eq 1048576 or $action eq 2097152 }
-        {include file="CRM/Grant/Form/Payment/View.tpl"}
-{/if}
diff --git a/xml/templates/message_templates/grant_approved_html.tpl b/xml/templates/message_templates/grant_approved_html.tpl
deleted file mode 100644
index 233e270ee1..0000000000
--- a/xml/templates/message_templates/grant_approved_html.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
-  </head>
-  <body>
-    {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
-    {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
-    {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
-    <p>Dear {contact.display_name},</p>
-    <p>This is being sent to you as a receipt of {$grant_status} grant.</p>
-Grant Program Name: {$grant_programs} <br>
-Grant  Type             : {$grant_type}<br>
-Total Amount            : {$params.amount_total}<br>
-{if customField}
-{foreach from=$customField key=key item=data}
-<b>{$customGroup.$key}</b><br>
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
- </body>
-</html>
diff --git a/xml/templates/message_templates/grant_approved_subject.tpl b/xml/templates/message_templates/grant_approved_subject.tpl
deleted file mode 100644
index faed123a7f..0000000000
--- a/xml/templates/message_templates/grant_approved_subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Receipt for {if $events_in_cart} Event Registration{/if}
diff --git a/xml/templates/message_templates/grant_approved_text.tpl b/xml/templates/message_templates/grant_approved_text.tpl
deleted file mode 100644
index 45e577153b..0000000000
--- a/xml/templates/message_templates/grant_approved_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Dear {contact.display_name},
-        This is being sent to you as a receipt of {$grant_status} grant.
-Grant Program Name: {$grant_programs}  <br>
-Grant  Type    {$grant_type}
-Total Amount: {$params.amount_total}
-{if customField}
-{foreach from=$customField key=key item=data}
-{$customGroup.$key}
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
\ No newline at end of file
diff --git a/xml/templates/message_templates/grant_awaiting_info_html.tpl b/xml/templates/message_templates/grant_awaiting_info_html.tpl
deleted file mode 100644
index 233e270ee1..0000000000
--- a/xml/templates/message_templates/grant_awaiting_info_html.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
-  </head>
-  <body>
-    {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
-    {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
-    {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
-    <p>Dear {contact.display_name},</p>
-    <p>This is being sent to you as a receipt of {$grant_status} grant.</p>
-Grant Program Name: {$grant_programs} <br>
-Grant  Type             : {$grant_type}<br>
-Total Amount            : {$params.amount_total}<br>
-{if customField}
-{foreach from=$customField key=key item=data}
-<b>{$customGroup.$key}</b><br>
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
- </body>
-</html>
diff --git a/xml/templates/message_templates/grant_awaiting_info_subject.tpl b/xml/templates/message_templates/grant_awaiting_info_subject.tpl
deleted file mode 100644
index faed123a7f..0000000000
--- a/xml/templates/message_templates/grant_awaiting_info_subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Receipt for {if $events_in_cart} Event Registration{/if}
diff --git a/xml/templates/message_templates/grant_awaiting_info_text.tpl b/xml/templates/message_templates/grant_awaiting_info_text.tpl
deleted file mode 100644
index 45e577153b..0000000000
--- a/xml/templates/message_templates/grant_awaiting_info_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Dear {contact.display_name},
-        This is being sent to you as a receipt of {$grant_status} grant.
-Grant Program Name: {$grant_programs}  <br>
-Grant  Type    {$grant_type}
-Total Amount: {$params.amount_total}
-{if customField}
-{foreach from=$customField key=key item=data}
-{$customGroup.$key}
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
\ No newline at end of file
diff --git a/xml/templates/message_templates/grant_paid_html.tpl b/xml/templates/message_templates/grant_paid_html.tpl
deleted file mode 100644
index 233e270ee1..0000000000
--- a/xml/templates/message_templates/grant_paid_html.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
-  </head>
-  <body>
-    {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
-    {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
-    {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
-    <p>Dear {contact.display_name},</p>
-    <p>This is being sent to you as a receipt of {$grant_status} grant.</p>
-Grant Program Name: {$grant_programs} <br>
-Grant  Type             : {$grant_type}<br>
-Total Amount            : {$params.amount_total}<br>
-{if customField}
-{foreach from=$customField key=key item=data}
-<b>{$customGroup.$key}</b><br>
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
- </body>
-</html>
diff --git a/xml/templates/message_templates/grant_paid_subject.tpl b/xml/templates/message_templates/grant_paid_subject.tpl
deleted file mode 100644
index d28dac9ede..0000000000
--- a/xml/templates/message_templates/grant_paid_subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Receipt for {if $events_in_cart} Paid Grant{/if}
diff --git a/xml/templates/message_templates/grant_paid_text.tpl b/xml/templates/message_templates/grant_paid_text.tpl
deleted file mode 100644
index 45e577153b..0000000000
--- a/xml/templates/message_templates/grant_paid_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Dear {contact.display_name},
-        This is being sent to you as a receipt of {$grant_status} grant.
-Grant Program Name: {$grant_programs}  <br>
-Grant  Type    {$grant_type}
-Total Amount: {$params.amount_total}
-{if customField}
-{foreach from=$customField key=key item=data}
-{$customGroup.$key}
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
\ No newline at end of file
diff --git a/xml/templates/message_templates/grant_rejected_html.tpl b/xml/templates/message_templates/grant_rejected_html.tpl
deleted file mode 100644
index 233e270ee1..0000000000
--- a/xml/templates/message_templates/grant_rejected_html.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
-  </head>
-  <body>
-    {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
-    {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
-    {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
-    <p>Dear {contact.display_name},</p>
-    <p>This is being sent to you as a receipt of {$grant_status} grant.</p>
-Grant Program Name: {$grant_programs} <br>
-Grant  Type             : {$grant_type}<br>
-Total Amount            : {$params.amount_total}<br>
-{if customField}
-{foreach from=$customField key=key item=data}
-<b>{$customGroup.$key}</b><br>
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
- </body>
-</html>
diff --git a/xml/templates/message_templates/grant_rejected_subject.tpl b/xml/templates/message_templates/grant_rejected_subject.tpl
deleted file mode 100644
index faed123a7f..0000000000
--- a/xml/templates/message_templates/grant_rejected_subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Receipt for {if $events_in_cart} Event Registration{/if}
diff --git a/xml/templates/message_templates/grant_rejected_text.tpl b/xml/templates/message_templates/grant_rejected_text.tpl
deleted file mode 100644
index 45e577153b..0000000000
--- a/xml/templates/message_templates/grant_rejected_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Dear {contact.display_name},
-        This is being sent to you as a receipt of {$grant_status} grant.
-Grant Program Name: {$grant_programs}  <br>
-Grant  Type    {$grant_type}
-Total Amount: {$params.amount_total}
-{if customField}
-{foreach from=$customField key=key item=data}
-{$customGroup.$key}
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
\ No newline at end of file
diff --git a/xml/templates/message_templates/grant_submitted_html.tpl b/xml/templates/message_templates/grant_submitted_html.tpl
deleted file mode 100644
index 233e270ee1..0000000000
--- a/xml/templates/message_templates/grant_submitted_html.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
-  </head>
-  <body>
-    {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture}
-    {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
-    {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
-
-    <p>Dear {contact.display_name},</p>
-    <p>This is being sent to you as a receipt of {$grant_status} grant.</p>
-Grant Program Name: {$grant_programs} <br>
-Grant  Type             : {$grant_type}<br>
-Total Amount            : {$params.amount_total}<br>
-{if customField}
-{foreach from=$customField key=key item=data}
-<b>{$customGroup.$key}</b><br>
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
- </body>
-</html>
diff --git a/xml/templates/message_templates/grant_submitted_subject.tpl b/xml/templates/message_templates/grant_submitted_subject.tpl
deleted file mode 100644
index faed123a7f..0000000000
--- a/xml/templates/message_templates/grant_submitted_subject.tpl
+++ /dev/null
@@ -1 +0,0 @@
-Receipt for {if $events_in_cart} Event Registration{/if}
diff --git a/xml/templates/message_templates/grant_submitted_text.tpl b/xml/templates/message_templates/grant_submitted_text.tpl
deleted file mode 100644
index 45e577153b..0000000000
--- a/xml/templates/message_templates/grant_submitted_text.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-Dear {contact.display_name},
-        This is being sent to you as a receipt of {$grant_status} grant.
-Grant Program Name: {$grant_programs}  <br>
-Grant  Type    {$grant_type}
-Total Amount: {$params.amount_total}
-{if customField}
-{foreach from=$customField key=key item=data}
-{$customGroup.$key}
-{foreach from=$data key=dkey item=ddata}
-{$ddata.label} : {$ddata.value}<br>
-{/foreach}
-{/foreach}
-{/if}
\ No newline at end of file