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

Updated waiting list to show country for international people

Browse Source
This commit is contained in:
Nathan Coad
2013-10-25 10:15:52 +11:00
parent c791dbaf97
commit b8b9fa4085
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
booking.reports.inc
View File

@@ -290,9 +290,9 @@ function booking_waitinglist_page() {
$booking_limit = variable_get('booking_regn_limit','350'); $booking_limit = variable_get('booking_regn_limit','350');
$rows = array(); $rows = array();
$result = db_query('SELECT DISTINCT nid, booking_firstname, booking_lastname, booking_state, booking_readinggroup $result = db_query('SELECT DISTINCT nid, booking_firstname, booking_lastname, booking_state, booking_readinggroup, booking_country
FROM ( FROM (
SELECT p.nid, p.booking_firstname, p.booking_lastname, p.booking_state, p.booking_readinggroup, pay.booking_payment_date SELECT p.nid, p.booking_firstname, p.booking_lastname, p.booking_state, p.booking_country, p.booking_readinggroup, pay.booking_payment_date
FROM {booking_person} p, {booking_payment} pay FROM {booking_person} p, {booking_payment} pay
WHERE booking_status = 2 and booking_event_id = :eid and p.nid = pay.booking_person_nid WHERE booking_status = 2 and booking_event_id = :eid and p.nid = pay.booking_person_nid
) AS booking ) AS booking
@@ -307,7 +307,7 @@ function booking_waitinglist_page() {
'!last' => ucwords($person->booking_lastname))), '!last' => ucwords($person->booking_lastname))),
//only for when we have readings groups //only for when we have readings groups
//t('!group',array('!group' => $person->booking_readinggroup)), //t('!group',array('!group' => $person->booking_readinggroup)),
t('!state', array('!state' => $person->booking_state)), t('!state', array('!state' => $person->booking_country == 'Australia' ? $person->booking_state : $person->booking_country)),
t($count++), t($count++),
); );
} }