add missed update

This commit is contained in:
2017-06-29 15:45:43 +10:00
parent ac8ed27d63
commit 7e908389dd

View File

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