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

fix function call

Browse Source
This commit is contained in:
Nathan Coad
2016-05-26 11:22:04 +10:00
parent a9d35ca97f
commit fa969ee4a0
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
booking.emails.inc
View File

@@ -47,7 +47,7 @@ function booking_manual_email()
), ),
); );
$header = array( $header = array(
'booking_nid' => array('data' => t('Id'), 'field' => 'nid', 'sort' => 'asc'), 'booking_nid' => array('data' => t('Id'), 'field' => 'nid', 'sort' => 'asc'),
'booking_name' => array('data' => t('Name'), 'field' => 'booking_lastname'), 'booking_name' => array('data' => t('Name'), 'field' => 'booking_lastname'),
@@ -61,7 +61,7 @@ function booking_manual_email()
'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'), 'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'),
'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'), 'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'),
); );
/*
if (variable_get('booking_enable_studygroups', 0) == 1) if (variable_get('booking_enable_studygroups', 0) == 1)
{ {
//select entries from the study groups mapping table //select entries from the study groups mapping table
@@ -120,11 +120,11 @@ function booking_manual_email()
$values[$data->nid] = ($data->booking_payment_complete == 'Y' || $data->booking_status != 1) ? FALSE : TRUE; $values[$data->nid] = ($data->booking_payment_complete == 'Y' || $data->booking_status != 1) ? FALSE : TRUE;
} }
*/
$form['table'] = array ( $form['table'] = array (
'#type' => 'tableselect', '#type' => 'tableselect',
'#header' => $header, '#header' => $header,
'#options' => $options, '#options' => _booking_manual_email_generate_options(),
'#default_value' => $values, '#default_value' => $values,
'#empty' => t('No attendees found.'), '#empty' => t('No attendees found.'),
'#attributes' => array('id' => 'sort-table'), '#attributes' => array('id' => 'sort-table'),
@@ -146,25 +146,11 @@ function booking_manual_email()
); );
} }
function _booking_manual_email_generate_tableselect() { function _booking_manual_email_generate_options() {
global $event; global $event;
$form = array (); $form = array ();
$options = array (); $options = array ();
$header = array(
'booking_nid' => array('data' => t('Id'), 'field' => 'nid', 'sort' => 'asc'),
'booking_name' => array('data' => t('Name'), 'field' => 'booking_lastname'),
'booking_gender' => array('data' => t('Gender'), 'field' => 'booking_gender'),
'booking_email' => array('data' => t('Email'), 'field' => 'booking_email'),
'booking_state' => array('data' => t('State'), 'field' => 'booking_state'),
'booking_status' => array('data' => t('Status'), 'field' => 'booking_status'),
'amount_paid' => array('data' => t('Payment To Date'), 'field' => 'booking_amount_paid'),
'amount_reqd' => array('data' => t('Total Payment Required'), 'field' => 'booking_total_pay_reqd'),
'booking_fully_paid' => array('data' => t('Fully paid?'), 'field' => 'booking_payment_complete'),
'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'),
'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'),
);
if (variable_get('booking_enable_studygroups', 0) == 1) if (variable_get('booking_enable_studygroups', 0) == 1)
{ {
//select entries from the study groups mapping table //select entries from the study groups mapping table