From 7e908389dd9b2f76a4b9addd59244c976ef370ea Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 29 Jun 2017 15:45:43 +1000 Subject: [PATCH] add missed update --- booking.earlyaccess_admin.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/booking.earlyaccess_admin.inc b/booking.earlyaccess_admin.inc index 5687d18..505d93e 100644 --- a/booking.earlyaccess_admin.inc +++ b/booking.earlyaccess_admin.inc @@ -19,14 +19,14 @@ function booking_earlyaccess_admin() { $prefix = t("

Early Access Codes

"); $header = array( - 'booking_regn_earlyaccess_code' => array('data' => t('Code'), 'field' => 'c.booking_regn_earlyaccess_code', 'sort' => 'asc'), - 'booking_regn_earlyaccess_code_avail' => array('data' => t('Available?'), 'field' => 'c.booking_regn_earlyaccess_code_avail'), + 'booking_earlyaccess_code' => array('data' => t('Code'), 'field' => 'c.booking_earlyaccess_code', 'sort' => 'asc'), + 'booking_earlyaccess_code_avail' => array('data' => t('Available?'), 'field' => 'c.booking_earlyaccess_code_avail'), 'booking_firstname' => array('data' => t('First Name'), 'field' => 'p.booking_firstname'), 'booking_lastname' => array('data' => t('Last Name'), 'field' => 'p.booking_lastname'), ); //get a list of all the early access codes for this event - $codelist_query = db_select('booking_regn_earlyaccess_codes', 'c'); + $codelist_query = db_select('booking_earlyaccess_codes', 'c'); $codelist_query->leftJoin('booking_person', 'p', 'c.cid = p.booking_earlyaccess_code_id'); $codelist_query->condition('c.booking_eventid', $event->eid, '=') ->fields('c') @@ -38,8 +38,8 @@ function booking_earlyaccess_admin() { foreach($result as $data) { $rows[] = array( 'data' => array( - $data->booking_regn_earlyaccess_code, - $data->booking_regn_earlyaccess_code_avail == 'Y' ? 'Yes' : 'No', + $data->booking_earlyaccess_code, + $data->booking_earlyaccess_code_avail == 'Y' ? 'Yes' : 'No', $data->booking_firstname, $data->booking_lastname, ), @@ -75,7 +75,7 @@ function booking_earlyaccess_generate_codes() { $code_length = 6; //determine number of currently available access codes for this event - $codecount_query = db_query("SELECT count(*) as num_codes FROM {booking_regn_earlyaccess_codes} where booking_eventid = :eventid and booking_regn_earlyaccess_code_avail = 'Y'", + $codecount_query = db_query("SELECT count(*) as num_codes FROM {booking_earlyaccess_codes} where booking_eventid = :eventid and booking_earlyaccess_code_avail = 'Y'", array(':eventid' => $event->eid)) ->fetchObject(); $num_codes_available = $codecount_query->num_codes; @@ -85,18 +85,18 @@ function booking_earlyaccess_generate_codes() { watchdog('booking_debug', "Creating $num_codes_to_add early access codes."); //use the multi-insert query type at https://drupal.org/node/310079 - $insert_query = db_insert('booking_regn_earlyaccess_codes') + $insert_query = db_insert('booking_earlyaccess_codes') ->fields(array( 'booking_eventid', - 'booking_regn_earlyaccess_code', - 'booking_regn_earlyaccess_code_avail', + 'booking_earlyaccess_code', + 'booking_earlyaccess_code_avail', )); for ($i = 0; $i < $num_codes_to_add; $i++) { $insert_query->values(array( 'booking_eventid' => $event->eid, - 'booking_regn_earlyaccess_code' => booking_getToken($code_length), - 'booking_regn_earlyaccess_code_avail' => 'Y', + 'booking_earlyaccess_code' => booking_getToken($code_length), + 'booking_earlyaccess_code_avail' => 'Y', )); } $insert_query->execute(); @@ -141,9 +141,9 @@ function booking_earlyaccess_csv_report() { $enclosure_esc = preg_quote($enclosure, '/'); //get a list of all the early access codes for this event - $codelist_query = db_select('booking_regn_earlyaccess_codes', 'c'); + $codelist_query = db_select('booking_earlyaccess_codes', 'c'); $codelist_query->condition('c.booking_eventid', $event->eid, '=') - ->fields('c', array('booking_regn_earlyaccess_code', 'booking_regn_earlyaccess_code_avail')) + ->fields('c', array('booking_earlyaccess_code', 'booking_earlyaccess_code_avail')) ->orderBy('cid'); $result = $codelist_query->execute();