From 6dcdb829a881824d846d8a9a4e74ed8e314c019d Mon Sep 17 00:00:00 2001
From: Stan Dragnev <sdragnev@rnao.org>
Date: Tue, 10 Sep 2013 13:43:20 -0400
Subject: [PATCH] Fixes issue with missing words and some formatting problems
for cheque reprints. Refs #48 in bitbucket.
---
CRM/Grant/Form/Task/Reprint.php | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/CRM/Grant/Form/Task/Reprint.php b/CRM/Grant/Form/Task/Reprint.php
index 39b1d4c..bc5f608 100755
--- a/CRM/Grant/Form/Task/Reprint.php
+++ b/CRM/Grant/Form/Task/Reprint.php
@@ -102,6 +102,7 @@ class CRM_Grant_Form_Task_Reprint extends CRM_Grant_Form_PaymentTask
$reprinted = count($this->_grantPaymentIds);
$stopped = $selectedPayments - $reprinted;
if ( count($this->_grantPaymentIds ) ) {
+ $this->assign( 'payments', 1 );
CRM_Core_Session::setStatus(ts( $stopped.' of the '.$selectedPayments.' selected grant payments have already been stopped. '.count($this->_grantPaymentIds).' of the '.count($this->_grantPaymentIds).' selected grant payments are printed or reprinted.'), NULL, 'no-popup');
$this->applyFilter('__ALL__','trim');
$attributes = CRM_Core_DAO::getAttribute( 'CRM_Grant_DAO_GrantProgram' );
@@ -198,9 +199,9 @@ class CRM_Grant_Form_Task_Reprint extends CRM_Grant_Form_PaymentTask
$grantDAO->find(true);
if ( !empty( $payment_details[$newEntityDAO->payment_id] ) ) {
- $payment_details[$newEntityDAO->payment_id] .= '</td></tr><tr><td width="15%" >'.date("Y-m-d", strtotime($values['payment_date'])).'</td><td width="15%" >'.$entityDAO->entity_id.'</td><td width="50%" >'.CRM_Grant_BAO_GrantProgram::getDisplayName( $result->contact_id ).'</td><td width="20%" >CAD :'.CRM_Utils_Money::format( $grantDAO->amount_granted,null, null,false );
+ $payment_details[$newEntityDAO->payment_id] .= '</td></tr><tr><td width="15%" >'.date("Y-m-d", strtotime($values['payment_date'])).'</td><td width="15%" >'.$entityDAO->entity_id.'</td><td width="50%" >'.CRM_Grant_BAO_GrantProgram::getDisplayName( $result->contact_id ).'</td><td width="20%" >'.CRM_Utils_Money::format( $grantDAO->amount_granted,null, null,false );
} else {
- $payment_details[$newEntityDAO->payment_id] = date("Y-m-d", strtotime($values['payment_date'])).'</td><td width="15%" >'.$entityDAO->entity_id.'</td><td width="50%" >'.CRM_Grant_BAO_GrantProgram::getDisplayName( $result->contact_id ).'</td><td width="20%" >CAD :'.CRM_Utils_Money::format( $grantDAO->amount_granted,null, null,false );
+ $payment_details[$newEntityDAO->payment_id] = date("Y-m-d", strtotime($values['payment_date'])).'</td><td width="15%" >'.$entityDAO->entity_id.'</td><td width="50%" >'.CRM_Grant_BAO_GrantProgram::getDisplayName( $result->contact_id ).'</td><td width="20%" >'.CRM_Utils_Money::format( $grantDAO->amount_granted,null, null,false );
}
}
@@ -212,12 +213,22 @@ class CRM_Grant_Form_Task_Reprint extends CRM_Grant_Form_PaymentTask
$grantPayment[$newEntityDAO->payment_id]['payment_created_date'] = date('Y-m-d');
$grantPayment[$newEntityDAO->payment_id]['payable_to_name' ] = CRM_Grant_BAO_GrantProgram::getDisplayName( $result->contact_id );
$grantPayment[$newEntityDAO->payment_id]['payable_to_address' ] = CRM_Utils_Array::value( 'address', CRM_Grant_BAO_GrantProgram::getAddress( $result->contact_id ) );
- $grantPayment[$newEntityDAO->payment_id]['amount' ] = CRM_Utils_Money::format( $result->amount,null, null,false ) ;
+ $grantPayment[$newEntityDAO->payment_id]['amount' ] = $result->amount;
$grantPayment[$newEntityDAO->payment_id]['currency' ] = $result->currency;
$grantPayment[$newEntityDAO->payment_id]['payment_status_id' ] = 3;
$grantPayment[$newEntityDAO->payment_id]['payment_reason' ] = $result->payment_reason;
$grantPayment[$newEntityDAO->payment_id]['replaces_payment_id'] = $result->replaces_payment_id;
+ foreach ( $grantPayment as $grantKey => $values ) {
+ $row = array();
+ $grantValues = $values;
+ require_once 'CRM/Grant/Words.php';
+ $words = new CRM_Grant_Words();
+ $amountInWords = ucwords($words->convert_number_to_words($values['amount']));
+ $grantPayment[$grantKey]['total_in_words'] = $values['total_in_words'] = $grantValues['total_in_words'] = $amountInWords;
+ $grantPayment[$grantKey]['amount'] = $values['amount'];
+ }
+
if ( $makePdf ) {
$grantPayment[$newEntityDAO->payment_id]['payment_details'] = $payment_details[$newEntityDAO->payment_id];
$grantPayment[$newEntityDAO->payment_id]['payment_id'] = $values['payment_number'];
--
GitLab