Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ref] Minor code extraction #18739

Merged
merged 1 commit into from
Oct 19, 2020
Merged

[Ref] Minor code extraction #18739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 55 additions & 50 deletions CRM/Price/BAO/PriceSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ public static function processAmount($fields, &$params, &$lineItem, $priceSetID
continue;
}

list($params, $lineItem) = self::getLine($params, $lineItem, $priceSetID, $field, $id);
[$params, $lineItem] = self::getLine($params, $lineItem, $priceSetID, $field, $id);
}

$amount_level = [];
Expand Down Expand Up @@ -884,55 +884,7 @@ public static function buildPriceSet(&$form) {
// Call the buildAmount hook.
CRM_Utils_Hook::buildAmount($component, $form, $feeBlock);

// CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
$adminFieldVisible = FALSE;
if (CRM_Core_Permission::check('administer CiviCRM')) {
$adminFieldVisible = TRUE;
}

$hideAdminValues = TRUE;
if (CRM_Core_Permission::check('edit contributions')) {
$hideAdminValues = FALSE;
}

foreach ($feeBlock as $id => $field) {
if (CRM_Utils_Array::value('visibility', $field) == 'public' ||
(CRM_Utils_Array::value('visibility', $field) == 'admin' && $adminFieldVisible == TRUE) ||
!$validFieldsOnly
) {
$options = $field['options'] ?? NULL;
if ($className == 'CRM_Contribute_Form_Contribution_Main' && $component = 'membership') {
$userid = $form->getVar('_membershipContactID');
$checklifetime = self::checkCurrentMembership($options, $userid);
if ($checklifetime) {
$form->assign('ispricelifetime', TRUE);
}
}

$formClasses = ['CRM_Contribute_Form_Contribution', 'CRM_Member_Form_Membership'];

if (!is_array($options) || !in_array($id, $validPriceFieldIds)) {
continue;
}
elseif ($hideAdminValues && !in_array($className, $formClasses)) {
foreach ($options as $key => $currentOption) {
if ($currentOption['visibility_id'] == CRM_Price_BAO_PriceField::getVisibilityOptionID('admin')) {
unset($options[$key]);
}
}
}
if (!empty($options)) {
CRM_Price_BAO_PriceField::addQuickFormElement($form,
'price_' . $field['id'],
$field['id'],
FALSE,
CRM_Utils_Array::value('is_required', $field, FALSE),
NULL,
$options
);
}
}
}
self::addPriceFieldsToForm($form, $feeBlock, $validFieldsOnly, $className, $validPriceFieldIds);
}

/**
Expand Down Expand Up @@ -1771,4 +1723,57 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id):
return [$params, $lineItem];
}

/**
* Add the relevant price fields to the form.
*
* @param \CRM_Core_Form $form
* @param array $feeBlock
* @param bool $validFieldsOnly
* @param string $className
* @param array $validPriceFieldIds
*/
protected static function addPriceFieldsToForm(CRM_Core_Form $form, $feeBlock, bool $validFieldsOnly, string $className, array $validPriceFieldIds) {
$hideAdminValues = !CRM_Core_Permission::check('edit contributions');
// CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
$adminFieldVisible = CRM_Core_Permission::check('administer CiviCRM');
foreach ($feeBlock as $id => $field) {
if (CRM_Utils_Array::value('visibility', $field) == 'public' ||
(CRM_Utils_Array::value('visibility', $field) == 'admin' && $adminFieldVisible == TRUE) ||
!$validFieldsOnly
) {
$options = $field['options'] ?? NULL;
if ($className == 'CRM_Contribute_Form_Contribution_Main' && $component = 'membership') {
$userid = $form->getVar('_membershipContactID');
$checklifetime = self::checkCurrentMembership($options, $userid);
if ($checklifetime) {
$form->assign('ispricelifetime', TRUE);
}
}

$formClasses = ['CRM_Contribute_Form_Contribution', 'CRM_Member_Form_Membership'];

if (!is_array($options) || !in_array($id, $validPriceFieldIds)) {
continue;
}
elseif ($hideAdminValues && !in_array($className, $formClasses)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eileenmcnaughton I think this needs to be !$hideAdminValues because in the original code if the Perm check is true then hideAdminValues gets set to FALSE https://github.com/civicrm/civicrm-core/pull/18739/files#diff-9bb0aa4010a43713521df361cca72fe6L895 where was in your code it will be set to TRUE

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @seamuslee001 - I've fixed to

$hideAdminValues = !CRM_Core_Permission::check('edit contributions');

foreach ($options as $key => $currentOption) {
if ($currentOption['visibility_id'] == CRM_Price_BAO_PriceField::getVisibilityOptionID('admin')) {
unset($options[$key]);
}
}
}
if (!empty($options)) {
CRM_Price_BAO_PriceField::addQuickFormElement($form,
'price_' . $field['id'],
$field['id'],
FALSE,
CRM_Utils_Array::value('is_required', $field, FALSE),
NULL,
$options
);
}
}
}
}

}