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

rename booking_event_id in booking_person table

Browse Source
This commit is contained in:
Nathan Coad
2016-05-03 22:49:45 +10:00
parent 80cd8d157a
commit 3ce77ebea6
14 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
booking.confirm.inc
View File

@@ -35,7 +35,7 @@ function booking_confirm_page() {
//load all the fields
$node = node_load($person->nid);
//maximum length for invoice id is 127 characters
$invoiceid = $person->nid . '_' . $node->booking_event_id . '_' . $node->booking_lastname . '-' . $node->booking_firstname;
$invoiceid = $person->nid . '_' . $node->booking_eventid . '_' . $node->booking_lastname . '-' . $node->booking_firstname;
$invoiceid = substr($invoiceid, 0, 126);
} else {
drupal_set_message("Unable to find matching session ID " . arg(1), 'error', FALSE);

2
booking.emails.inc
View File

@@ -64,7 +64,7 @@ function booking_manual_email()
$query->fields('p')
->fields('pr', array('booking_price', 'booking_late_price'))
->fields('t')
->condition('p.booking_event_id', $event->eid, '=');
->condition('p.booking_eventid', $event->eid, '=');
$table_sort = $query->extend('TableSort')->orderbyHeader($header);
$result = $table_sort->execute();

6
booking.helper.inc
View File

@@ -112,7 +112,7 @@ function _valid_australian_mobile_number($input)
function _booking_check_bookings_full()
{
global $event;
$waitinglist_query = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_event_id = :eventid and booking_status = 1",
$waitinglist_query = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_eventid = :eventid and booking_status = 1",
array(':eventid' => $event->eid))
->fetchObject();
//check the number of people registered against the defined max
@@ -139,7 +139,7 @@ function _booking_get_waitinglist_top()
$result = db_query('SELECT p.nid, p.booking_firstname, p.booking_lastname, pay.booking_payment_date
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_eventid = :eid and p.nid = pay.booking_person_nid
ORDER BY pay.booking_payment_date
LIMIT 1',
array(':eid' => $event->eid));
@@ -153,7 +153,7 @@ function _booking_get_waitinglist_top()
//in case there's no people with status waiting list, but there is some with missed payment deadline
$result = db_query('SELECT p.nid, p.booking_firstname, p.booking_lastname, pay.booking_payment_date
FROM {booking_person} p, {booking_payment} pay
WHERE booking_status = 4 and booking_event_id = :eid and p.nid = pay.booking_person_nid
WHERE booking_status = 4 and booking_eventid = :eid and p.nid = pay.booking_person_nid
ORDER BY pay.booking_payment_date
LIMIT 1',
array(':eid' => $event->eid));

12
booking.install
View File

@@ -1,5 +1,5 @@
<?php
// $Id$
function booking_update_7100() {
$spec = array('type' => 'numeric', 'not null' => FALSE, 'default' => 0, 'precision' => '7', 'scale' => '2');
db_add_field( 'booking_price', 'booking_late_price', $spec);
@@ -523,6 +523,14 @@ function booking_update_7231() {
db_add_field('booking_person', 'booking_comment_field', $spec);
}
/**
* Rename booking_event_id in booking_person table to booking_eventid
*/
function booking_update_7232() {
$spec = array('type' => 'int', 'length' => '11', 'default' => 0, 'not null' => FALSE);
db_change_field('booking_person', 'booking_event_id', 'booking_eventid', $spec);
}
/**
* Implementation of hook_install().
*/
@@ -570,7 +578,7 @@ function booking_schema() {
'fields' => array(
//identifiers
'nid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE, 'disp-width' => '10'),
'booking_event_id' => array('type' => 'int', 'length' => '11', 'default' => 0, 'not null' => FALSE),
'booking_eventid' => array('type' => 'int', 'length' => '11', 'default' => 0, 'not null' => FALSE),
'booking_tempid' => array('type' => 'varchar', 'length' => '40', 'not null' => FALSE),
'booking_timestamp' => array('type' => 'int', 'not null' => TRUE, 'disp-width' => '11'),
'booking_firstname' => array('type' => 'varchar', 'length' => '50', 'not null' => TRUE),

2
booking.manual_payment.inc
View File

@@ -79,7 +79,7 @@ function booking_manual_payment_admin($nid)
'welfare_required' => t('Welfare Required?'),
);
$result = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$result = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
foreach($result as $data)

2
booking.module
View File

@@ -821,7 +821,7 @@ function booking_generate_luckynumbers() {
$i = 0;
//query for the mappings relating to $readinggroup_studygroup_id
$attendee_query = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$attendee_query = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$attendees = $attendee_query->fetchAll();

6
booking.regn_form.inc
View File

@@ -350,7 +350,7 @@ function booking_form($node, &$form_state, $inserting = FALSE)
$partner_options[] = '';
//get a list of possible partners
$partners = db_query("SELECT nid, booking_firstname, booking_lastname, booking_partner_id FROM {booking_person} " . "where booking_event_id = :eid and booking_married='Y' order by booking_lastname, booking_firstname", array(
$partners = db_query("SELECT nid, booking_firstname, booking_lastname, booking_partner_id FROM {booking_person} " . "where booking_eventid = :eid and booking_married='Y' order by booking_lastname, booking_firstname", array(
':eid' => $event->eid
));
@@ -1105,7 +1105,7 @@ function _booking_validate($node, &$form_state)
//Verify this is not a duplicate registration
//try and find the person in the database for this event
$person = db_query("SELECT person.nid, person.booking_tempid " . "FROM {booking_person} person " . "WHERE booking_firstname = :first AND booking_lastname = :last AND booking_dob = :dob AND booking_event_id = :eid", array(
$person = db_query("SELECT person.nid, person.booking_tempid " . "FROM {booking_person} person " . "WHERE booking_firstname = :first AND booking_lastname = :last AND booking_dob = :dob AND booking_eventid = :eid", array(
':first' => $form_state['booking_firstname'],
':last' => $form_state['booking_lastname'],
':dob' => $dob_check,
@@ -1387,7 +1387,7 @@ function booking_form_submit($form, &$form_state)
//internal fields
$tempid = _booking_uuidSecure();
$node->booking_tempid = $tempid;
$node->booking_event_id = $event->eid;
$node->booking_eventid = $event->eid;
$node->booking_amount_paid = 0;
$node->booking_total_pay_reqd = $payment_total_price->booking_price;

4
booking.regn_node.inc
View File

@@ -70,7 +70,7 @@ function booking_load_query($node_ids = NULL, $fetchAssoc = FALSE)
}
else
{
$query->condition('p.booking_event_id', $event->eid, '=');
$query->condition('p.booking_eventid', $event->eid, '=');
}
//add the database fields we always want to retrieve
@@ -151,7 +151,7 @@ function booking_insert($node) {
db_insert('booking_person')
->fields(array(
'nid' => $node->nid,
'booking_event_id' => $node->booking_event_id,
'booking_eventid' => $node->booking_eventid,
'booking_firstname' => $node->booking_firstname,
'booking_lastname' => $node->booking_lastname,
'booking_dob' => $node->booking_dob,

20
booking.reports.inc
View File

@@ -72,7 +72,7 @@ function booking_report_summary() {
$db_or = db_or();
$db_or->condition('p.booking_status', 1, '=');
$db_or->condition('p.booking_status', 2, '=');
$db_and = db_and()->condition($db_or)->condition('p.booking_event_id', $event->eid, '=');
$db_and = db_and()->condition($db_or)->condition('p.booking_eventid', $event->eid, '=');
$query->condition($db_and);
$query->groupBy('p.booking_state');
$query->addExpression('COUNT(p.booking_state)', 'state_count');
@@ -117,7 +117,7 @@ function booking_report_summary() {
//bookings by ecclesia
$query = db_select('booking_person', 'p')
->fields('p', array('booking_ecclesia','booking_state'))
->condition('p.booking_event_id', $event->eid, '=');
->condition('p.booking_eventid', $event->eid, '=');
$query->groupBy('p.booking_ecclesia');
$query->addExpression('COUNT(p.booking_ecclesia)', 'ecclesia_count');
$query->orderBy('booking_state')
@@ -133,7 +133,7 @@ function booking_report_summary() {
$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->condition('p.booking_event_id', $event->eid, '=')
$query->condition('p.booking_eventid', $event->eid, '=')
->fields('p')
->fields('t')
->fields('pr', array('booking_price', 'booking_late_price'));
@@ -321,7 +321,7 @@ function booking_report_paypal_payments() {
->condition('pa.booking_eventid', $event->eid,'=');
$result = $query->execute();
//$result = db_query("SELECT * FROM {booking_person} p WHERE p.booking_event_id = :eid",
//$result = db_query("SELECT * FROM {booking_person} p WHERE p.booking_eventid = :eid",
// array(':eid' => $event->eid));
foreach ($result as $person) {
@@ -378,7 +378,7 @@ function booking_report_flight_details() {
$query->fields('p');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('p.booking_status', 1, '=');
$query->condition($db_and);
@@ -455,7 +455,7 @@ function booking_coming_page() {
$result = db_select('booking_person', 'p')
->fields('p', array('booking_firstname', 'booking_lastname', 'booking_state', 'booking_readinggroup', 'booking_country'))
->condition($or)
->condition('p.booking_event_id', $event->eid, '=')
->condition('p.booking_eventid', $event->eid, '=')
->orderBy('booking_country')
->orderBy('booking_state')
->orderBy('booking_lastname')
@@ -471,7 +471,7 @@ function booking_coming_page() {
$result = db_select('booking_person', 'p')
->fields('p', array('booking_firstname', 'booking_lastname', 'booking_state', 'booking_readinggroup', 'booking_country'))
->condition($or)
->condition('p.booking_event_id', $event->eid, '=')
->condition('p.booking_eventid', $event->eid, '=')
->orderBy('booking_country')
->orderBy('booking_state')
->orderBy('booking_lastname')
@@ -551,7 +551,7 @@ function booking_waitinglist_page() {
FROM (
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
WHERE booking_status = 2 and booking_event_id = :eid and p.nid = pay.booking_person_nid
WHERE booking_status = 2 and booking_eventid = :eid and p.nid = pay.booking_person_nid
) AS booking
ORDER BY booking_payment_date',
array(':eid' => $event->eid));
@@ -561,7 +561,7 @@ function booking_waitinglist_page() {
FROM (
SELECT p.nid, p.booking_firstname, p.booking_lastname, p.booking_state, p.booking_country, p.booking_readinggroup, pay.booking_payment_date, p.booking_status
FROM {booking_person} p, {booking_payment} pay
WHERE booking_event_id = :eid and p.nid = pay.booking_person_nid and ( booking_status = 2 or booking_status = 4)
WHERE booking_eventid = :eid and p.nid = pay.booking_person_nid and ( booking_status = 2 or booking_status = 4)
) AS booking
ORDER BY booking_status, booking_payment_date',
array(':eid' => $event->eid));
@@ -634,7 +634,7 @@ function booking_csv_report() {
//$readinggroup = "session" . variable_get('booking_readinggroup_id','7');
//calculate fields to ignore in the output csv file
$builtin_fields_to_skip = array('booking_event_id');
$builtin_fields_to_skip = array('booking_eventid');
$custom_fields_to_skip = explode(";", variable_get('booking_csv_exclude_fields', ''));
$fields_to_skip = array_merge($builtin_fields_to_skip, $custom_fields_to_skip);

6
booking.rooms.inc
View File

@@ -12,7 +12,7 @@ function _booking_rooms_name_autocomplete($string) {
$query = db_select('booking_person', 'p')
->fields('p', array('nid', 'booking_firstname', 'booking_lastname'));
$db_or = db_or()->condition('p.booking_lastname', '%' . db_like($string) . '%', 'LIKE')->condition('p.booking_firstname', '%' . db_like($string) . '%', 'LIKE');
$db_and = db_and()->condition($db_or)->condition('p.booking_event_id', $event->eid, '=');
$db_and = db_and()->condition($db_or)->condition('p.booking_eventid', $event->eid, '=');
$result = $query->condition($db_and)
->execute();
@@ -53,7 +53,7 @@ function booking_rooms_allocate_test_form($node, &$form_state, $location_id) {
//query for existing room allocations
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_room_mapping', 'm', 'm.booking_nodeid = p.nid');
$query->condition('p.booking_event_id', $event->eid, '=');
$query->condition('p.booking_eventid', $event->eid, '=');
$query->fields('p', array('booking_lastname', 'booking_firstname'))->fields('m');
$room_mapping = $query->execute()->fetchAllAssoc('booking_nodeid');
@@ -156,7 +156,7 @@ function booking_rooms_allocate_test_form_submit($form, &$form_state) {
//query for existing room allocations
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_room_mapping', 'm', 'm.booking_nodeid = p.nid');
$query->condition('p.booking_event_id', $event->eid, '=');
$query->condition('p.booking_eventid', $event->eid, '=');
$query->fields('p', array('booking_lastname', 'booking_firstname'))->fields('m');
$room_mapping = $query->execute()->fetchAllAssoc('booking_nodeid');

6
booking.rooms_old.inc
View File

@@ -68,7 +68,7 @@ function booking_roomallocations_view_summary() {
$query->leftJoin('booking_room_definition', 'r', 'r.rid = m.booking_roomid');
$query->leftJoin('booking_room_locations', 'l', 'l.lid = r.booking_room_location_id');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('p.booking_status', 1, '=');
$query->condition($db_and);
$query->fields('p')->fields('m')->fields('r')->fields('l');
@@ -468,7 +468,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
//query for attendees
$query = db_query("SELECT nid, booking_firstname, booking_lastname, booking_gender, booking_dob, booking_partner_id " .
" FROM {booking_person} " .
" WHERE booking_event_id = :eid and (booking_status=1 or booking_status=5) order by booking_lastname, booking_firstname",
" WHERE booking_eventid = :eid and (booking_status=1 or booking_status=5) order by booking_lastname, booking_firstname",
array(':eid' => $event->eid));
//make a list of all attendees that are booked in
@@ -844,7 +844,7 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
//status 1 is coming, status 5 is hosts
$attendees = db_query("SELECT nid, booking_firstname, booking_lastname, booking_gender, booking_dob, booking_partner_id " .
" FROM {booking_person} " .
" WHERE booking_event_id = :eid and (booking_status=1 or booking_status=5) order by booking_lastname, booking_firstname",
" WHERE booking_eventid = :eid and (booking_status=1 or booking_status=5) order by booking_lastname, booking_firstname",
array(':eid' => $event->eid))->fetchAllAssoc('nid');
//define the header

4
booking.studygroup_leaders.inc
View File

@@ -93,7 +93,7 @@ function _booking_studygroups_retrieve_eligible_people() {
//select males that are booked in
$query = db_select('booking_person', 'p');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('p.booking_gender', 'M', '=');
$db_and->condition('p.booking_status', 1, '=');
$query->condition($db_and);
@@ -116,7 +116,7 @@ function _booking_studygroups_retrieve_eligible_people() {
FROM (
SELECT p.nid, p.booking_firstname, p.booking_lastname, p.booking_state, p.booking_country, p.booking_readinggroup, pay.booking_payment_date, p.booking_status, p.booking_gender, p.booking_dob
FROM {booking_person} p, {booking_payment} pay
WHERE booking_event_id = :eid and p.nid = pay.booking_person_nid and ( booking_status = 2 or booking_status = 4)
WHERE booking_eventid = :eid and p.nid = pay.booking_person_nid and ( booking_status = 2 or booking_status = 4)
LIMIT 100
) AS booking
WHERE booking_gender = \'M\'

10
booking.studygroups.inc
View File

@@ -91,7 +91,7 @@ function booking_available_leadhelp_select_form($node, &$form_state, $group_id)
//also restrict to males from the current event
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('p.booking_gender', 'M', '=');
$db_and->condition($db_or);
@@ -653,7 +653,7 @@ function booking_studygroups_calculate() {
$max_people = (int) ($limit / $firstgroup->booking_num_group_sessions) + 2;
//select all the attendees booked in
$query = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$query = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$attendees = $query->fetchAllAssoc('nid');
@@ -1010,7 +1010,7 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
$max_people = (int) ($limit / $firstgroup->booking_num_group_sessions) + $fudge_factor;
//select all the attendees for this event
$query = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$query = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$attendees = $query->fetchAllAssoc('nid');
@@ -1513,7 +1513,7 @@ function booking_studygroups_printview_form($node, &$form_state, $group_id) {
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_studygroup_mapping', 'm', 'm.booking_node_id = p.nid');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('m.booking_studygroup_id', $group_id, '=');
$query->condition($db_and);
$query->fields('p')->fields('m');
@@ -1660,7 +1660,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$query->leftJoin('booking_studygroup_mapping', 'm', 'm.booking_node_id = p.nid');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('m.booking_studygroup_id', $group_id, '=');
$query->condition($db_and);

4
booking.tokens.inc
View File

@@ -671,7 +671,7 @@ function booking_define_tokens()
$booking_times = db_query("SELECT booking_event_start, booking_event_end FROM {booking_event} where eid = :eid",
array(':eid' => $event->eid))->fetchObject();
$regncount_query = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_event_id = :eventid and booking_status = 1",
$regncount_query = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_eventid = :eventid and booking_status = 1",
array(':eventid' => $event->eid))
->fetchObject();
@@ -694,7 +694,7 @@ function booking_define_personspecific_tokens($node)
//get a count of the total number of people booked in to this event
//but don't include people who haven't paid or have withdrawn their booking
$result = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_event_id = :eventid and (booking_status = 1 or booking_status = 2)",
$result = db_query("SELECT count(*) as num_ppl FROM {booking_person} where booking_eventid = :eventid and (booking_status = 1 or booking_status = 2)",
array(':eventid' => $event->eid))
->fetchObject();