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

Travel form tweaks

Browse Source
This commit is contained in:
Nathan Coad
2014-06-11 12:37:07 +10:00
parent 18ce42a14f
commit 5267f368b2
3 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
booking.admin.inc
View File

@@ -329,13 +329,17 @@ function booking_manual_email()
'amount_reqd' => array('data' => t('Total Payment Required'), 'field' => 'booking_total_pay_reqd'),
'booking_fully_paid' => array('data' => t('Fully paid?')),
'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'),
'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'),
);
$query = db_select('booking_person', 'p')
->fields('p')
->fields('pr', array('booking_price', 'booking_late_price'))
->condition('p.booking_event_id', $event->eid, '=');
$query = db_select('booking_person', 'p');
$query->join('booking_price', 'pr', 'pr.pid = p.booking_payment_id');
$query->leftJoin('booking_travel', 't', 'p.nid = t.booking_person_nid');
$query->fields('p')
->fields('pr', array('booking_price', 'booking_late_price'))
->fields('t')
->condition('p.booking_event_id', $event->eid, '=');
$table_sort = $query->extend('TableSort')->orderbyHeader($header);
$result = $table_sort->execute();
@@ -357,6 +361,7 @@ function booking_manual_email()
'amount_reqd' => $data->booking_total_pay_reqd,
'booking_fully_paid' => $paid == 0 ? 'Yes' : 'No',
'welfare_required' => $data->booking_welfare_required == 'Y' ? 'Yes' : 'No',
'travel_form' => $data->tid > 0 ? 'Yes' : 'No',
);
//$values[$data->nid] = ($paid == 0 || $data->booking_status != 1) ? FALSE : TRUE;
}