X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FEvent%2FForm%2FParticipant.php;h=59ccd6772a104c4fece32b5d44b3da11b826ea2c;hb=c71d4550ef1244cbbc814714d2c1df9f32119223;hp=e99eb186dfedc7c78a3ace5d54c52561da92cabb;hpb=9c5284f15ed8fd68bfc3b96345588385276d8d10;p=civicrm-core.git diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index e99eb186df..59ccd6772a 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -1499,7 +1499,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment } } } - $this->assign('totalTaxAmount', $totalTaxAmount); $this->assign('taxTerm', $this->getSalesTaxTerm()); $this->assign('dataArray', $dataArray); } @@ -1516,13 +1515,16 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment $eventAmount = array_merge($eventAmount, $additionalParticipantDetails); $this->assign('amount', $eventAmount); } - + $this->assign('totalTaxAmount', $totalTaxAmount ?? 0); $sendTemplateParams = [ - 'groupName' => 'msg_tpl_workflow_event', - 'valueName' => 'event_offline_receipt', + 'workflow' => 'event_offline_receipt', 'contactId' => $contactID, 'isTest' => !empty($this->_defaultValues['is_test']), 'PDFFilename' => ts('confirmation') . '.pdf', + 'modelProps' => [ + 'participantID' => $this->_id, + 'eventID' => $params['event_id'], + ], ]; // try to send emails only if email id is present @@ -1657,8 +1659,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment CRM_Event_Form_Registration::initEventFee($form, $event['id'], FALSE); CRM_Event_Form_Registration_Register::buildAmount($form, TRUE, $form->_discountId); $lineItem = []; - $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); - $invoicing = $invoiceSettings['invoicing'] ?? NULL; $totalTaxAmount = 0; if (!CRM_Utils_System::isNull(CRM_Utils_Array::value('line_items', $form->_values))) { $lineItem[] = $form->_values['line_items']; @@ -1666,9 +1666,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment $totalTaxAmount = $value['tax_amount'] + $totalTaxAmount; } } - if ($invoicing) { - $form->assign('totalTaxAmount', $totalTaxAmount); - } + $form->assign('totalTaxAmount', Civi::settings()->get('invoicing') ? ($totalTaxAmount ?? NULL) : NULL); $form->assign('lineItem', empty($lineItem) ? FALSE : $lineItem); $discounts = []; if (!empty($form->_values['discount'])) { @@ -1892,7 +1890,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment protected function assignEventDetailsToTpl($eventID, $participantRoles, $receiptText, $isPaidEvent) { //use of the message template below requires variables in different format $events = []; - $returnProperties = ['event_type_id', 'fee_label', 'start_date', 'end_date', 'event_tz', 'is_show_location', 'title']; + $returnProperties = ['event_type_id', 'fee_label', 'start_date', 'end_date', 'is_show_location', 'title']; //get all event details. CRM_Core_DAO::commonRetrieveAll('CRM_Event_DAO_Event', 'id', $eventID, $events, $returnProperties); @@ -1900,8 +1898,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment unset($event['start_date']); unset($event['end_date']); - CRM_Event_BAO_Event::setOutputTimeZone($event); - $role = CRM_Event_PseudoConstant::participantRole(); if (is_array($participantRoles)) {