projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #24153 from agileware/CIVICRM-2025
[civicrm-core.git]
/
CRM
/
Event
/
Page
/
EventInfo.php
diff --git
a/CRM/Event/Page/EventInfo.php
b/CRM/Event/Page/EventInfo.php
index 4c302e57c490e23c2ec6bb9f6ca4d7ec82237d27..778549e3e58e6266d78e16d95fbc44a885a0efd5 100644
(file)
--- a/
CRM/Event/Page/EventInfo.php
+++ b/
CRM/Event/Page/EventInfo.php
@@
-129,10
+129,6
@@
class CRM_Event_Page_EventInfo extends CRM_Core_Page {
else {
$labelClass = 'price_set_field-label';
}
else {
$labelClass = 'price_set_field-label';
}
- // show tax rate with amount
- $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
- $taxTerm = Civi::settings()->get('tax_term');
- $displayOpt = $invoiceSettings['tax_display_settings'] ?? NULL;
foreach ($fieldValues['options'] as $optionId => $optionVal) {
if (CRM_Utils_Array::value('visibility_id', $optionVal) != array_search('public', $visibility) &&
foreach ($fieldValues['options'] as $optionId => $optionVal) {
if (CRM_Utils_Array::value('visibility_id', $optionVal) != array_search('public', $visibility) &&
@@
-143,7
+139,7
@@
class CRM_Event_Page_EventInfo extends CRM_Core_Page {
$values['feeBlock']['isDisplayAmount'][$fieldCnt] = $fieldValues['is_display_amounts'] ?? NULL;
if (Civi::settings()->get('invoicing') && isset($optionVal['tax_amount'])) {
$values['feeBlock']['isDisplayAmount'][$fieldCnt] = $fieldValues['is_display_amounts'] ?? NULL;
if (Civi::settings()->get('invoicing') && isset($optionVal['tax_amount'])) {
- $values['feeBlock']['value'][$fieldCnt] = CRM_Price_BAO_PriceField::getTaxLabel($optionVal, 'amount', $
displayOpt, $taxTerm, $
eventCurrency);
+ $values['feeBlock']['value'][$fieldCnt] = CRM_Price_BAO_PriceField::getTaxLabel($optionVal, 'amount', $eventCurrency);
$values['feeBlock']['tax_amount'][$fieldCnt] = $optionVal['tax_amount'];
}
else {
$values['feeBlock']['tax_amount'][$fieldCnt] = $optionVal['tax_amount'];
}
else {