CiviWare/com.megaphonetech.ftoverride
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CiviWare:9f05f9fb135100a0278c2de712df95e6ed195804
Branches Tags
CiviWare:master
..
compare: CiviWare:53ddc10ca10d00d6be3e07105d166f035ff8f851
Branches Tags
CiviWare:master

No commits in common. "9f05f9fb135100a0278c2de712df95e6ed195804" and "53ddc10ca10d00d6be3e07105d166f035ff8f851" have entirely different histories.
9f05f9fb13 ... 53ddc10ca1

2 changed files with 6 additions and 52 deletions
Show Stats Expand all files Collapse all files

37
ftoverride.php
View File

@ -240,9 +240,6 @@ function ftoverride_civicrm_buildForm($formName, &$form) {
$submitValues = $form->_params; $submitValues = $form->_params;
if (!empty($submitValues['designation'])) { if (!empty($submitValues['designation'])) {
$form->assign('contribution_designation', $submitValues['designation']); $form->assign('contribution_designation', $submitValues['designation']);
if ($submitValues['designation'] == 'other_financial_type') {
$form->_params['contribution_note'] = $submitValues['designation_note'];
}
} }
} }
@ -263,11 +260,6 @@ function ftoverride_civicrm_buildForm($formName, &$form) {
FALSE, FALSE,
['class' => 'crm-select2'] ['class' => 'crm-select2']
); );
$form->add(
'text',
'designation_note',
''
);
CRM_Core_Region::instance('page-body')->add(array( CRM_Core_Region::instance('page-body')->add(array(
'template' => 'CRM/Contribute/Form/ContributionMain/common.tpl', 'template' => 'CRM/Contribute/Form/ContributionMain/common.tpl',
)); ));
@ -288,12 +280,8 @@ function ftoverride_civicrm_pre($op, $objectName, $id, &$params) {
if ($op == 'create' && $objectName == 'Contribution' && !empty($params['contribution_page_id'])) { if ($op == 'create' && $objectName == 'Contribution' && !empty($params['contribution_page_id'])) {
$designation = CRM_Core_Smarty::singleton()->get_template_vars('contribution_designation'); $designation = CRM_Core_Smarty::singleton()->get_template_vars('contribution_designation');
if (!empty($designation)) { if (!empty($designation)) {
if ($designation == 'other_financial_type') {
// Ignore
}
else {
$params['financial_type_id'] = $designation; $params['financial_type_id'] = $designation;
} CRM_Core_Smarty::singleton()->assign('contribution_designation', '');
} }
} }
@ -316,22 +304,6 @@ function ftoverride_civicrm_pre($op, $objectName, $id, &$params) {
} }
} }
/**
* Implements hook_civicrm_validateForm().
*
* @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_validateForm
*/
function ftoverride_civicrm_validateForm($formName, &$fields, &$files, &$form, &$errors) {
if ('CRM_Contribute_Form_Contribution_Main' == $formName) {
if (!empty($fields['designation'])
&& $fields['designation'] == 'other_financial_type'
&& empty($fields['designation_note'])
) {
$errors['designation_note'] = ts('Please provide other information about designation.');
}
}
}
/** /**
* Implements hook_civicrm_buildAmount(). * Implements hook_civicrm_buildAmount().
* *
@ -340,7 +312,7 @@ function ftoverride_civicrm_validateForm($formName, &$fields, &$files, &$form, &
function ftoverride_civicrm_buildAmount($pageType, &$form, &$amount) { function ftoverride_civicrm_buildAmount($pageType, &$form, &$amount) {
if (!empty($amount) && $form->_flagSubmitted) { if (!empty($amount) && $form->_flagSubmitted) {
$submitValues = $form->_submitValues; $submitValues = $form->_submitValues;
if (!empty($submitValues['designation']) && $submitValues['designation'] != 'other_financial_type') { if (!empty($submitValues['designation'])) {
foreach ($amount as &$priceFields) { foreach ($amount as &$priceFields) {
foreach ($priceFields['options'] as &$options) { foreach ($priceFields['options'] as &$options) {
$options['financial_type_id'] = $submitValues['designation']; $options['financial_type_id'] = $submitValues['designation'];
@ -366,9 +338,6 @@ function ftoverride_get_designation($pageId) {
function ftoverride_get_financialType($action) { function ftoverride_get_financialType($action) {
$financialTypes = []; $financialTypes = [];
CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes, $action); CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes, $action);
if (empty($financialTypes)) {
return $financialTypes;
}
$result = civicrm_api3('FinancialType', 'get', [ $result = civicrm_api3('FinancialType', 'get', [
'return' => ["description"], 'return' => ["description"],
'description' => ['!=' => ""], 'description' => ['!=' => ""],
@ -378,5 +347,5 @@ function ftoverride_get_financialType($action) {
if (!empty($result['values'])) { if (!empty($result['values'])) {
$descFinancialType = array_column($result['values'], 'description', 'id'); $descFinancialType = array_column($result['values'], 'description', 'id');
} }
return $descFinancialType + $financialTypes + ['other_financial_type' => ts('Other')]; return $descFinancialType + $financialTypes;
} }

17
templates/CRM/Contribute/Form/ContributionMain/common.tpl
View File

@ -2,26 +2,11 @@
<div class="label">{$form.designation.label}</div> <div class="label">{$form.designation.label}</div>
<div class="content">{$form.designation.html}</div> <div class="content">{$form.designation.html}</div>
<div class="clear"></div> <div class="clear"></div>
<div class="content designation_note-div">{$form.designation_note.html}</div> </div>
<div class="clear"></div>
</div>
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
CRM.$(function($) { CRM.$(function($) {
$('div#priceset:first').after($('div.ft_override_designation-section')); $('div#priceset:first').after($('div.ft_override_designation-section'));
hideShowDesignation();
$('#designation').change(hideShowDesignation);
function hideShowDesignation() {
var fT = $('#designation').val();
if (fT == 'other_financial_type') {
$('div.ft_override_designation-section div.designation_note-div').show();
}
else {
$('div.ft_override_designation-section div.designation_note-div').hide();
}
}
}); });
</script> </script>
{/literal} {/literal}