Merge pull request #11923 from lcdservices/GL-44
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 13 Aug 2018 10:31:56 +0000 (22:31 +1200)
committerGitHub <noreply@github.com>
Mon, 13 Aug 2018 10:31:56 +0000 (22:31 +1200)
GL-44 admin price field options on event info page

CRM/Event/Page/EventInfo.php

index 9f58bddb3009705349107430a82ccfe8fc8d2204..e7bb4ea2a3ec99b5d9a7d10129bf4ce067194180 100644 (file)
@@ -152,6 +152,12 @@ class CRM_Event_Page_EventInfo extends CRM_Core_Page {
             $displayOpt = CRM_Utils_Array::value('tax_display_settings', $invoiceSettings);
             $invoicing = CRM_Utils_Array::value('invoicing', $invoiceSettings);
             foreach ($fieldValues['options'] as $optionId => $optionVal) {
+              if (CRM_Utils_Array::value('visibility_id', $optionVal) != array_search('public', $visibility) &&
+                $adminFieldVisible == FALSE
+              ) {
+                continue;
+              }
+
               $values['feeBlock']['isDisplayAmount'][$fieldCnt] = CRM_Utils_Array::value('is_display_amounts', $fieldValues);
               if ($invoicing && isset($optionVal['tax_amount'])) {
                 $values['feeBlock']['value'][$fieldCnt] = CRM_Price_BAO_PriceField::getTaxLabel($optionVal, 'amount', $displayOpt, $taxTerm);