Skip to content

GitLab

G
grant_program
Commit 8ce39eb9 authored by Monish Deb's avatar Monish Deb
Browse files
Options

Fix 'Find Grant' search form and other refactoring changes

parent 469da524
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 857 additions and 920 deletions
CRM/Grant/BAO/GrantPayment.php
View file @ 8ce39eb9
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment { class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment {
const
STOP = 1,
REPRINT = 2;
/** /**
* static field for all the grant information that we can potentially export * static field for all the grant information that we can potentially export
* @var array * @var array
...@@ -93,7 +95,7 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment { ...@@ -93,7 +95,7 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment {
'data_type' => CRM_Utils_Type::T_INT 'data_type' => CRM_Utils_Type::T_INT
), ),
'payment_number' => array( 'payment_number' => array(
'title' => 'Payment Number', 'title' => 'Check Number',
'name' => 'payment_number', 'name' => 'payment_number',
'data_type' => CRM_Utils_Type::T_INT 'data_type' => CRM_Utils_Type::T_INT
), ),
...@@ -170,26 +172,19 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment { ...@@ -170,26 +172,19 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment {
* @static * @static
* @return object * @return object
*/ */
static function add(&$params, &$ids) { static function add(&$params, &$ids = []) {
if (empty($params)) { if (empty($params)) {
return; return;
} }
if (isset( $params['total_amount'])) { if (isset($params['total_amount'])) {
$params[$field] = CRM_Utils_Rule::cleanMoney($params['total_amount']); $params[$field] = CRM_Utils_Rule::cleanMoney($params['total_amount']);
} }
// convert dates to mysql format // convert dates to mysql format
$dates = array( if (isset($params['payment_created_date'])) {
'payment_date', $params['payment_created_date'] = CRM_Utils_Date::processDate($params['payment_created_date'], NULL, TRUE);
'payment_created_date'
);
foreach ($dates as $date) {
if (isset($params[$date])) {
$params[$date] = CRM_Utils_Date::processDate($params[$date], NULL, TRUE);
}
} }
$grantPayment = new CRM_Grant_DAO_GrantPayment(); $grantPayment = new CRM_Grant_DAO_GrantPayment();
$grantPayment->id = CRM_Utils_Array::value('id', $ids); $grantPayment->id = CRM_Utils_Array::value('id', $ids);
...@@ -321,9 +316,7 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment { ...@@ -321,9 +316,7 @@ class CRM_Grant_BAO_GrantPayment extends CRM_Grant_DAO_GrantPayment {
$grantDao->fetch(); $grantDao->fetch();
if (!$grantDao->N) { if (!$grantDao->N) {
if ($params['messageTemplateID']) { CRM_Core_Error::fatal(ts('No such message template.'));
CRM_Core_Error::fatal(ts('No such message template.'));
}
} }
$subject = $grantDao->subject; $subject = $grantDao->subject;
$html = $grantDao->html; $html = $grantDao->html;
......
CRM/Grant/BAO/GrantProgram.php
View file @ 8ce39eb9
...@@ -309,14 +309,12 @@ WHERE civicrm_contact.id = $id "; ...@@ -309,14 +309,12 @@ WHERE civicrm_contact.id = $id ";
if (CRM_Utils_Array::value('is_auto_email', $values)) { if (CRM_Utils_Array::value('is_auto_email', $values)) {
list($displayName, $email) = CRM_Contact_BAO_Contact_Location::getEmailDetails($contactID); list($displayName, $email) = CRM_Contact_BAO_Contact_Location::getEmailDetails($contactID);
if (isset($email)) { if (isset($email)) {
$grantStatuses = CRM_Core_OptionGroup::values('grant_status', FALSE, FALSE, FALSE, NULL, 'name'); $valueName = strtolower($grantStatus);
$grantStatuses = $grantStatuses[$values['status_id']]; if ($grantStatus == 'Awaiting Information') {
$valueName = strtolower($grantStatuses); $explode = explode(' ', $grantStatuse);
if ($grantStatuses == 'Awaiting Information') {
$explode = explode(' ', $grantStatuses);
$valueName = strtolower($explode[0]) . '_info'; $valueName = strtolower($explode[0]) . '_info';
} }
elseif (strstr($grantStatuses, 'Approved')) { elseif (strstr($grantStatus, 'Approved')) {
$valueName = strtolower('Approved'); $valueName = strtolower('Approved');
} }
$sendTemplateParams = array( $sendTemplateParams = array(
...@@ -451,4 +449,121 @@ WHERE civicrm_contact.id = $id "; ...@@ -451,4 +449,121 @@ WHERE civicrm_contact.id = $id ";
); );
CRM_Activity_BAO_Activity::create($params); CRM_Activity_BAO_Activity::create($params);
} }
public static function getAssetFinancialAccountID() {
$relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('financial_account_type', NULL, " AND v.name LIKE 'Asset' "));
return CRM_Core_DAO::singleValueQuery(
"SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = %1",
[1 => [$relationTypeId, 'Integer']]
);
}
public static function convertNumberToWords($number) {
$hyphen = '-';
$conjunction = ' and ';
$separator = ', ';
$negative = 'negative ';
$decimal = ' and ';
$dictionary = array(
0 => 'zero',
1 => 'one',
2 => 'two',
3 => 'three',
4 => 'four',
5 => 'five',
6 => 'six',
7 => 'seven',
8 => 'eight',
9 => 'nine',
10 => 'ten',
11 => 'eleven',
12 => 'twelve',
13 => 'thirteen',
14 => 'fourteen',
15 => 'fifteen',
16 => 'sixteen',
17 => 'seventeen',
18 => 'eighteen',
19 => 'nineteen',
20 => 'twenty',
30 => 'thirty',
40 => 'fourty',
50 => 'fifty',
60 => 'sixty',
70 => 'seventy',
80 => 'eighty',
90 => 'ninety',
100 => 'hundred',
1000 => 'thousand',
1000000 => 'million',
1000000000 => 'billion',
1000000000000 => 'trillion',
1000000000000000 => 'quadrillion',
1000000000000000000 => 'quintillion'
);
if (!is_numeric($number)) {
return FALSE;
}
if (($number >= 0 && (int) $number < 0) || (int) $number < 0 - PHP_INT_MAX) {
// overflow
trigger_error(
'convertNumberToWords only accepts numbers between -' . PHP_INT_MAX . ' and ' . PHP_INT_MAX,
E_USER_WARNING
);
return FALSE;
}
if ($number < 0) {
return $negative . self::convertNumberToWords(abs($number));
}
$string = $fraction = NULL;
if (strpos($number, '.') !== FALSE) {
list($number, $fraction) = explode('.', $number);
}
switch (TRUE) {
case $number < 21:
$string = $dictionary[$number];
break;
case $number < 100:
$tens = ((int) ($number / 10)) * 10;
$units = $number % 10;
$string = $dictionary[$tens];
if ($units) {
$string .= $hyphen . $dictionary[$units];
}
break;
case $number < 1000:
$hundreds = $number / 100;
$remainder = $number % 100;
$string = $dictionary[$hundreds] . ' ' . $dictionary[100];
if ($remainder) {
$string .= $conjunction . self::convertNumberToWords(abs($remainder));
}
break;
default:
$baseUnit = pow(1000, floor(log($number, 1000)));
$numBaseUnits = (int) ($number / $baseUnit);
$remainder = $number % $baseUnit;
$string = self::convertNumberToWords($numBaseUnits) . ' ' . $dictionary[$baseUnit];
if ($remainder) {
$string .= $remainder < 100 ? $conjunction : $separator;
$string .= self::convertNumberToWords($remainder);
}
break;
}
if (NULL !== $fraction && is_numeric($fraction)) {
$string .= $decimal;
$string .= $fraction . '/100';
}
return $string;
}
} }
CRM/Grant/BAO/PaymentSearch.php
View file @ 8ce39eb9
This diff is collapsed.
CRM/Grant/DAO/GrantPayment.php
View file @ 8ce39eb9
...@@ -86,30 +86,7 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO ...@@ -86,30 +86,7 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO
* @var int unsigned * @var int unsigned
*/ */
public $id; public $id;
/** public $financial_trxn_id;
* Payment Batch Nnumber
*
* @var int unsigned
*/
public $payment_batch_number;
/**
* Payment Number
*
* @var int unsigned
*/
public $payment_number;
/**
* Financial Type ID
*
* @var int unsigned
*/
public $financial_type_id;
/**
* Contact ID
*
* @var int unsigned
*/
public $contact_id;
/** /**
* Payment Created Date. * Payment Created Date.
* *
...@@ -122,35 +99,6 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO ...@@ -122,35 +99,6 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO
* @var date * @var date
*/ */
public $payment_date; public $payment_date;
/**
* Payable To Name.
*
* @var string
*/
public $payable_to_name;
/**
* Payable To Address.
*
* @var string
*/
public $payable_to_address;
/**
* Requested grant amount, in default currency.
*
* @var float
*/
public $amount;
/**
* 3 character string, value from config setting or input via user.
*
* @var string
*/
public $currency;
/**
* Payment Reason.
*
* @var string
*/
public $payment_reason; public $payment_reason;
/** /**
* Payment Status ID * Payment Status ID
...@@ -196,46 +144,13 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO ...@@ -196,46 +144,13 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO
'dataPattern' => '', 'dataPattern' => '',
'export' => true, 'export' => true,
) , ) ,
'payment_batch_number' => array( 'financial_trxn_id' => array(
'name' => 'payment_batch_number', 'name' => 'financial_trxn_id',
'type' => CRM_Utils_Type::T_INT, 'type' => CRM_Utils_Type::T_INT,
'title' => ts('Payment Batch Nnumber') , 'title' => ts('Financial Trxn ID') ,
'required' => true, 'required' => true,
'import' => true, 'import' => true,
'where' => 'civicrm_payment.payment_batch_number', 'where' => 'civicrm_payment.financial_trxn_id',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'payment_number' => array(
'name' => 'payment_number',
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Payment Number') ,
'required' => true,
'import' => true,
'where' => 'civicrm_payment.payment_number',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'financial_type_id' => array(
'name' => 'financial_type_id',
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Financial Type ID') ,
'required' => true,
'import' => true,
'where' => 'civicrm_payment.financial_type_id',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'contact_id' => array(
'name' => 'contact_id',
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Contact ID') ,
'required' => true,
'import' => true,
'where' => 'civicrm_payment.contact_id',
'headerPattern' => '', 'headerPattern' => '',
'dataPattern' => '', 'dataPattern' => '',
'export' => true, 'export' => true,
...@@ -250,63 +165,6 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO ...@@ -250,63 +165,6 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO
'dataPattern' => '', 'dataPattern' => '',
'export' => true, 'export' => true,
) , ) ,
'payment_date' => array(
'name' => 'payment_date',
'type' => CRM_Utils_Type::T_DATE,
'title' => ts('Payment Date') ,
'import' => true,
'where' => 'civicrm_payment.payment_date',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'payable_to_name' => array(
'name' => 'payable_to_name',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Payable To Name') ,
'maxlength' => 255,
'size' => CRM_Utils_Type::HUGE,
'import' => true,
'where' => 'civicrm_payment.payable_to_name',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'payable_to_address' => array(
'name' => 'payable_to_address',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Payable To Address') ,
'maxlength' => 255,
'size' => CRM_Utils_Type::HUGE,
'import' => true,
'where' => 'civicrm_payment.payable_to_address',
'headerPattern' => '',
'dataPattern' => '',
'export' => true,
) ,
'amount' => array(
'name' => 'amount',
'type' => CRM_Utils_Type::T_MONEY,
'title' => ts('Amount') ,
'required' => true,
'import' => true,
'where' => 'civicrm_payment.amount',
'headerPattern' => '',
'dataPattern' => '/^\d+(\.\d{2})?$/',
'export' => true,
) ,
'currency' => array(
'name' => 'currency',
'type' => CRM_Utils_Type::T_STRING,
'title' => ts('Currency') ,
'maxlength' => 3,
'size' => CRM_Utils_Type::FOUR,
'import' => true,
'where' => 'civicrm_payment.currency',
'headerPattern' => '/cur(rency)?/i',
'dataPattern' => '/^[A-Z]{3}$/i',
'export' => true,
) ,
'payment_reason' => array( 'payment_reason' => array(
'name' => 'payment_reason', 'name' => 'payment_reason',
'type' => CRM_Utils_Type::T_STRING, 'type' => CRM_Utils_Type::T_STRING,
...@@ -323,6 +181,9 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO ...@@ -323,6 +181,9 @@ class CRM_Grant_DAO_GrantPayment extends CRM_Core_DAO
'name' => 'payment_status_id', 'name' => 'payment_status_id',
'type' => CRM_Utils_Type::T_INT, 'type' => CRM_Utils_Type::T_INT,
'title' => ts('Payment Status') , 'title' => ts('Payment Status') ,
'pseudoconstant' => [
'optionGroupName' => 'grant_payment_status',
]
) , ) ,
'replaces_payment_id' => array( 'replaces_payment_id' => array(
'name' => 'replaces_payment_id', 'name' => 'replaces_payment_id',
......
CRM/Grant/Form/Task/GrantPayment.php
View file @ 8ce39eb9
This diff is collapsed.
CRM/Grant/Form/Task/Pay.php
View file @ 8ce39eb9
...@@ -41,121 +41,76 @@ require_once 'CRM/Grant/Form/Task.php'; ...@@ -41,121 +41,76 @@ require_once 'CRM/Grant/Form/Task.php';
* participations. This class provides functionality for the actual * participations. This class provides functionality for the actual
* deletion. * deletion.
*/ */
class CRM_Grant_Form_Task_Pay extends CRM_Grant_Form_Task class CRM_Grant_Form_Task_Pay extends CRM_Grant_Form_Task {
{ /**
/** * Are we operating in "single mode", i.e. deleting one
* Are we operating in "single mode", i.e. deleting one * specific participation?
* specific participation? *
* * @var boolean
* @var boolean */
*/ protected $_single = false;
protected $_single = false;
/** function preProcess() {
* build all the data structures needed to build the form parent::preProcess();
* if (!CRM_Core_Permission::check('create payments in CiviGrant')) {
* @return void CRM_Core_Error::fatal(ts( 'You do not have permission to access this page'));
* @access public }
*/ }
function preProcess( )
{
parent::preProcess( );
//check permission for delete. function buildQuickForm() {
if ( !CRM_Core_Permission::checkActionPermission( 'CiviGrant', CRM_Core_Action::PAY ) ) { $message = [];
CRM_Core_Error::fatal( ts( 'You do not have permission to access this page' ) ); $paidGrantCount = civicrm_api3('Grant', 'getcount', [
} 'status_id' => 'Paid',
$grantStatus = CRM_Core_OptionGroup::values('grant_status', TRUE, FALSE, FALSE, NULL, 'name'); 'id' => ['IN' => $this->_grantIds]
]);
$this->_approvedGrants = (array) civicrm_api3('Grant', 'get', [
'status_id' => 'Approved for Payment',
'id' => ['IN' => $this->_grantIds]
])['values'];
$paidGrants = $approvedGrants = array(); $notApproved = count($this->_grantIds) - $paidGrantCount - count($this->_approvedGrants);
CRM_Core_PseudoConstant::populate($paidGrants, 'CRM_Grant_DAO_Grant', true, 'status_id', false, " id in (".implode ( ', ' , $this->_grantIds ).") AND status_id = {$grantStatus['Paid']}"); $currencyCount = count(array_flip(CRM_Utils_Array::collect('currency', $this->_approvedGrants)));
CRM_Core_PseudoConstant::populate($approvedGrants, 'CRM_Grant_DAO_Grant', true, 'status_id', false, " id in (".implode ( ', ' , $this->_grantIds ).") AND status_id = {$grantStatus['Approved for Payment']}"); if (count($this->_approvedGrants)) {
if ($paidGrantCount) {
$this->_paidGrants = $paidGrants; $message[] = sprintf("<br> %d of the %d selected grants have already been paid.", $paidGrantCount, count($this->_grantIds));
$this->_notApproved = count($this->_grantIds) - count( $this->_paidGrants ) - count( $approvedGrants ); }
if ($notApproved) {
$message[] = sprintf("%d of the %d selected grants are not eligible.", $notApproved, count($this->_grantIds));
}
if ($currencyCount > 1) {
$message[] = sprintf("%d of the %d grants have different currency of same user.", $currencyCount, count($this->_grantIds));
}
$message[] = 'Would you like to proceed to paying the ' . count($this->_approvedGrants) . ' eligible or approved for payment but unpaid grants?';
CRM_Core_Session::setStatus(ts(implode('<br>', $message)), 'Payment Details', 'no-popup');
foreach ( $approvedGrants as $key => $value ) { $this->addButtons( array(
$grantProgram = new CRM_Grant_DAO_Grant( ); array (
$grantArray = array( 'id' => $key ); 'type' => 'next',
$grantProgram->copyValues( $grantArray ); 'name' => ts('Continue >>'),
$grantProgram->find( true ); 'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
$currencyDetails[$grantProgram->contact_id][$grantProgram->currency] = $key; 'isDefault' => true,
} ),
//$this->_currency = $currencyDetails; array (
$curency = 0; 'type' => 'cancel',
if ( !empty( $currencyDetails ) ) { 'name' => ts('Cancel'),
foreach ( $currencyDetails as $key => $value ) { ),
if ( count($value) > 1 ) { )
foreach ( $value as $unsetKey => $unsetVal ) { );
unset( $approvedGrants[$unsetVal] );
$curency++;
}
}
}
$this->_curency = $curency;
}
$this->_approvedGrants = $approvedGrants;
} }
else {
/** CRM_Core_Session::setStatus(ts('Please select at least one grant that has been approved for payment or eligible and not been paid.'), NULL, 'no-popup');
* Build the form $this->addButtons(array(
* array (
* @access public 'type' => 'cancel',
* @return void 'name' => ts('Cancel') ),
*/ )
function buildQuickForm( ) );
{
$message = "";
if (count($this->_approvedGrants)) {
if (count($this->_paidGrants)) {
$message = count( $this->_paidGrants ).' of the '.count($this->_grantIds).' selected grants have already been paid. ';
}
if ($this->_notApproved) {
$message .= $this->_notApproved.' of the '.count($this->_grantIds).' selected grants are not eligible. ';
}
if ($this->_curency) {
$message .= $this->_curency.' of '.count($this->_grantIds).' grants have different currency of same user. ';
}
if (count( $this->_approvedGrants )) {
$message .= 'Would you like to proceed to paying the '.count( $this->_approvedGrants ).' eligible or approved for payment but unpaid grants?';
CRM_Core_Session::setStatus(ts($message), NULL, 'no-popup');
}
$this->addButtons( array(
array (
'type' => 'next',
'name' => ts('Continue >>'),
'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
'isDefault' => true,
),
array (
'type' => 'cancel',
'name' => ts('Cancel'),
),
)
);
}
else {
CRM_Core_Session::setStatus(ts('Please select at least one grant that has been approved for payment or eligible and not been paid.'), NULL, 'no-popup');
$this->addButtons(array(
array (
'type' => 'cancel',
'name' => ts('Cancel') ),
)
);
}
} }
}
/** public function postProcess() {
* process the form after the input has been submitted and validated $this->set('approvedGrants', $this->_approvedGrants);
* $this->controller->resetPage('GrantPayment');
* @access public }
* @return None
*/
public function postProcess( )
{
$this->set( 'approvedGrants', $this->_approvedGrants );
$this->controller->resetPage( 'GrantPayment' );
}
} }
CRM/Grant/Form/Task/Reprint.php
View file @ 8ce39eb9
This diff is collapsed.
CRM/Grant/Selector/PaymentSearch.php
View file @ 8ce39eb9
This diff is collapsed.
CRM/Grant/Words.php deleted 100755 → 0
View file @ 469da524
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2011 |
+--------------------------------------------------------------------+
| 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-2011
* $Id$
*
*/
/**
* class to represent the actions that can be performed on a group of contacts