drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

email updates

Browse Source
This commit is contained in:
Nathan Coad
2017-07-02 09:08:39 +10:00
parent dc2f10fee3
commit 899fd83499
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
booking.helper.inc
View File

@@ -1512,6 +1512,8 @@ function _booking_leader_helper_email_summary($node) {
array(':eid' => $event->eid));
$studygroups = $studygroups_query->fetchAllAssoc('sid');
$rows[] = "<ul>";
foreach ($studygroups as $studygroup) {
//don't print info about the readings groups
if ($studygroup->booking_is_readinggroup == 'Y') {
@@ -1559,7 +1561,7 @@ function _booking_leader_helper_email_summary($node) {
$otherperson_phone = $other->booking_mobile;
}
$rows[] = t('!role for !descrip. Your !otherrole is !other. You can contact them on !phone or !email.',
$rows[] = t('<li>!role for !descrip. Your !otherrole is !other. You can contact them on !phone or !email.</li>',
array('!role' => $role, '!id' => $studygroup->sid, '!descrip' => $studygroup->booking_studygroup_descrip,
'!otherrole' => $otherrole, '!other' => $otherperson_name, '!phone' => $otherperson_phone, '!email' => $otherperson_email,
));
@@ -1567,6 +1569,8 @@ function _booking_leader_helper_email_summary($node) {
}
}
$rows[] = "</ul>";
//format the output to be used in an email
foreach ($rows as $key => $value) {
$rows[$key] = wordwrap($value);

20
booking.module
View File

@@ -187,14 +187,24 @@ function booking_menu() {
//'type' => MENU_LOCAL_TASK,
);
$items['admin/config/booking/emails'] = array(
'title' => 'Booking module email definitions',
'description' => 'Configure built-in workflow and custom emails used by the Booking module',
'title' => 'Booking module workflow email definitions',
'description' => 'Configure built-in workflow emails used by the Booking module',
'page callback' => 'drupal_get_form',
'page arguments' => array('booking_emails_admin'),
'access arguments' => array('administer site configuration'),
'access arguments' => array('access administration pages'),
'file' => 'booking.emails_admin.inc',
'weight' => -98,
//'type' => MENU_LOCAL_TASK,
);
);
$items['admin/config/booking/emails/custom'] = array(
'title' => 'Booking module custom email definitions',
'description' => 'Configure custom emails used by the Booking module',
'page callback' => 'booking_emails_admin',
'access arguments' => array('access administration pages'),
'file' => 'booking.emails_admin.inc',
'type' => MENU_LOCAL_ACTION,
);
$items['admin/config/booking/events'] = array(
'title' => 'Booking module event settings',
'description' => 'Configure events for the Booking module',
@@ -325,7 +335,7 @@ function booking_menu() {
//'page arguments' => array('booking_manual_email'),
'access arguments' => array('access administration pages'),
'type' => MENU_NORMAL_ITEM,
);
);
$items['admin/booking/manual-payments'] = array(
'title' => 'Manual Payment Processing',