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

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);