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 #21513 from JKingsnorth/core-2846-1-improve-start-end-date-validation
[civicrm-core.git]
/
CRM
/
Event
/
Form
/
ParticipantFeeSelection.php
diff --git
a/CRM/Event/Form/ParticipantFeeSelection.php
b/CRM/Event/Form/ParticipantFeeSelection.php
index 19a0a1174e424266d4a9171c47f5466d8cc0e7f7..ba6f5f4e1c0472941a52c583bbe43592e57154b6 100644
(file)
--- a/
CRM/Event/Form/ParticipantFeeSelection.php
+++ b/
CRM/Event/Form/ParticipantFeeSelection.php
@@
-285,7
+285,7
@@
class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
$this->assign('module', 'Event Registration');
//use of the message template below requires variables in different format
$event = $events = [];
$this->assign('module', 'Event Registration');
//use of the message template below requires variables in different format
$event = $events = [];
- $returnProperties = ['fee_label', 'start_date', 'end_date', '
event_tz', '
is_show_location', 'title'];
+ $returnProperties = ['fee_label', 'start_date', 'end_date', 'is_show_location', 'title'];
//get all event details.
CRM_Core_DAO::commonRetrieveAll('CRM_Event_DAO_Event', 'id', $params['event_id'], $events, $returnProperties);
//get all event details.
CRM_Core_DAO::commonRetrieveAll('CRM_Event_DAO_Event', 'id', $params['event_id'], $events, $returnProperties);
@@
-293,8
+293,6
@@
class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
unset($event['start_date']);
unset($event['end_date']);
unset($event['start_date']);
unset($event['end_date']);
- CRM_Event_BAO_Event::setOutputTimeZone($event);
-
$role = CRM_Event_PseudoConstant::participantRole();
$participantRoles = $params['role_id'] ?? NULL;
if (is_array($participantRoles)) {
$role = CRM_Event_PseudoConstant::participantRole();
$participantRoles = $params['role_id'] ?? NULL;
if (is_array($participantRoles)) {
@@
-358,14
+356,16
@@
class CRM_Event_Form_ParticipantFeeSelection extends CRM_Core_Form {
$this->assign('isOnWaitlist', TRUE);
}
$this->assign('contactID', $this->_contactId);
$this->assign('isOnWaitlist', TRUE);
}
$this->assign('contactID', $this->_contactId);
- $this->assign('participantID', $this->_participantId);
$sendTemplateParams = [
$sendTemplateParams = [
- 'groupName' => 'msg_tpl_workflow_event',
- 'valueName' => 'event_offline_receipt',
+ 'workflow' => 'event_offline_receipt',
'contactId' => $this->_contactId,
'isTest' => FALSE,
'PDFFilename' => ts('confirmation') . '.pdf',
'contactId' => $this->_contactId,
'isTest' => FALSE,
'PDFFilename' => ts('confirmation') . '.pdf',
+ 'modelProps' => [
+ 'participantID' => $this->_participantId,
+ 'eventID' => $params['event_id'],
+ ],
];
// try to send emails only if email id is present
];
// try to send emails only if email id is present