diff --git a/CRM/Grant/Form/PaymentSearch.php b/CRM/Grant/Form/PaymentSearch.php
index 96688387117479f3f1dbe8d6e1fba05ee6526203..4675cea64f375614496e516011a6f3b20b9c4557 100755
--- a/CRM/Grant/Form/PaymentSearch.php
+++ b/CRM/Grant/Form/PaymentSearch.php
@@ -238,7 +238,7 @@ class CRM_Grant_Form_PaymentSearch extends CRM_Core_Form {
$this->addElement('text', 'payment_batch_number', ts('Batch Number'), array('size' => 8, 'maxlength' => 8));
- $this->addElement('text', 'payment_number', ts('Payment Number'), array('size' => 8, 'maxlength' => 8));
+ $this->addElement('text', 'payment_number', ts('Payment Number'), array('size' => 10, 'maxlength' => 10));
$this->addDate('payment_created_date_low', ts('From'), FALSE, array('formatType' => 'searchDate'));
$this->addDate('payment_created_date_high', ts('To'), FALSE, array('formatType' => 'searchDate'));
diff --git a/CRM/Grant/Form/Task/GrantPayment.php b/CRM/Grant/Form/Task/GrantPayment.php
index 32787c0d39fc2381e3bd9132467537467ec23555..fca8364b2fbfa650f2718742749ef3d1524711eb 100755
--- a/CRM/Grant/Form/Task/GrantPayment.php
+++ b/CRM/Grant/Form/Task/GrantPayment.php
@@ -203,7 +203,7 @@ class CRM_Grant_Form_Task_GrantPayment extends CRM_Core_Form
$contactGrants[$dao->grant_id] = $dao->id;
- $curr_id = $dao->id;
+ $grantAmount[$dao->id] += $dao->total_amount;
if ( !$this->_prid ) {
$grantProgramSql = "SELECT is_auto_email FROM civicrm_grant_program WHERE id = ".$dao->grant_program_id;
$mailParams[$dao->grant_id]['is_auto_email'] = CRM_Grant_DAO_GrantProgram::singleValueQuery( $grantProgramSql );
@@ -263,10 +263,6 @@ class CRM_Grant_Form_Task_GrantPayment extends CRM_Core_Form
$grantPayment[$grantKey]['total_in_words'] = $grantInfo['total_in_words'] =
$grantValues['total_in_words'] = $amountInWords;
$grantPayment[$grantKey]['amount'] = $grantInfo['amount'];
- if ($curr_id == $grantKey) {
- $grantTotalPayment[$grantKey] = $grantPayment[$grantKey];
- $grantTotalPayment[$grantKey]['amount'] = $amountsTotal[$grantKey];
- }
// Save payment
$savePayment = $grantPayment[$grantKey];
$savePayment['payable_to_address'] = str_replace('<br /> ', '', $savePayment['payable_to_address']);
@@ -286,12 +282,15 @@ class CRM_Grant_Form_Task_GrantPayment extends CRM_Core_Form
}
$downloadNameCSV = check_plain('grantPayment');
$downloadNameCSV .= '_'.date('Ymdhis');
- $this->assign('grantPayment', $grantTotalPayment);
+ $this->assign('grantPayment', $grantPayment);
$downloadNameCSV .= '.csv';
$fileName = CRM_Utils_File::makeFileName( $downloadNameCSV );
$config = CRM_Core_Config::singleton();
$file_name = $config->customFileUploadDir . $fileName;
- CRM_Grant_BAO_GrantPayment::createCSV($file_name, $grantTotalPayment);
+ foreach($grantAmount as $id => $value) {
+ $grantPayment[$id]['amount'] = $value;
+ }
+ CRM_Grant_BAO_GrantPayment::createCSV($file_name, $grantPayment);
$files[] = $fileName;
$this->assign('date', date('Y-m-d'));
@@ -305,7 +304,7 @@ class CRM_Grant_Form_Task_GrantPayment extends CRM_Core_Form
$checkRegisterFile = check_plain('CheckRegister');
$checkRegisterFile .= '.pdf';
$checkFile = CRM_Utils_File::makeFileName( $checkRegisterFile );
- $checkRegister = CRM_Grant_BAO_GrantPayment::makeReport( $checkFile, $grantTotalPayment );
+ $checkRegister = CRM_Grant_BAO_GrantPayment::makeReport( $checkFile, $grantPayment );
$files[] = $checkRegister;
diff --git a/grantprograms.php b/grantprograms.php
index 890558e97950fceb19494da5a59072317db46c1c..d312e7c1c7ee229a0f59bf29f5386e880ccef177 100644
--- a/grantprograms.php
+++ b/grantprograms.php
@@ -238,6 +238,18 @@ function grantprograms_civicrm_permission(&$permissions) {
*
*/
function grantprograms_civicrm_buildForm($formName, &$form) {
+
+ if ($formName == 'CRM_Activity_Form_Activity'
+ && ($form->getVar('_action') == CRM_Core_Action::UPDATE || $form->getVar('_action') == CRM_Core_Action::VIEW)) {
+ $activityType = CRM_Core_PseudoConstant::activityType();
+ $activityValues = $form->getVar('_values');
+ if (array_search('Grant Status Change', $activityType) != $activityValues['activity_type_id']) {
+ return FALSE;
+ }
+ $grantUrl = CRM_Utils_System::url('civicrm/contact/view/grant',
+ 'reset=1&action=view&id=' . $activityValues['source_record_id'] . '&cid=' . current($activityValues['assignee_contact']));
+ $form->assign('grantUrl', $grantUrl);
+ }
if ($formName == 'CRM_Grant_Form_Grant' && ($form->getVar('_action') != CRM_Core_Action::DELETE)) {
$form->_key = CRM_Utils_Request::retrieve('key', 'String', $form);
@@ -916,6 +928,7 @@ function grantprograms_civicrm_searchTasks($objectName, &$tasks) {
}
function grantprograms_getOptionValueLabel($optioGroupID, $value) {
+ $value = CRM_Core_DAO::escapeString($value);
$query = "SELECT label FROM civicrm_option_value WHERE option_group_id = {$optioGroupID} AND value = '{$value}' ";
return CRM_Core_DAO::singleValueQuery($query);
}
diff --git a/templates/CRM/Activity/Form/Activity.extra.tpl b/templates/CRM/Activity/Form/Activity.extra.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..f7b713827342ddaab8cfdf215c31cdf156e5356f
--- /dev/null
+++ b/templates/CRM/Activity/Form/Activity.extra.tpl
@@ -0,0 +1,37 @@
+{*
+ +--------------------------------------------------------------------+
+ | 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 $grantUrl}
+ <a title="View Grant" class="view-grant button" href="{$grantUrl}"><span><div class="icon view-icon"></div>View Grant</span></a>
+
+<script type="text/javascript">
+{literal}
+ if (!cj('.crm-submit-buttons a').hasClass('view-grant')) {
+ cj('.view-grant').insertBefore('.crm-submit-buttons .crm-button-type-cancel');
+ }
+{/literal}
+</script>
+
+{/if}
\ No newline at end of file