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

Bugfixes relating to early bird rate closing

Browse Source
This commit is contained in:
Nathan Coad
2014-03-01 00:37:39 +11:00
parent 8fb838d9eb
commit 97dc20354a
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
booking.reports.inc
View File

@@ -92,6 +92,9 @@ function booking_report_summary() {
$result = $table_sort->execute();
foreach ($result as $person) {
$amount_owing = _booking_amount_owing($person->nid);
$rows[] = array(
l(t('!id', array('!id' => $person->nid)), t('node/!id', array('!id' => $person->nid))),
//l(t('!id', array('!id' => $person->nid)), t('node/!id/edit', array('!id' => $person->nid))),
@@ -100,8 +103,8 @@ function booking_report_summary() {
),
t('!email', array('!email' => $person->booking_email)),
t('!payment', array('!payment' => $person->booking_amount_paid)),
t('!payment', array('!payment' => $person->booking_total_pay_reqd)),
_booking_amount_paid($person->nid, $person) >= $person->booking_total_pay_reqd ? 'Yes' : 'No',
t('!payment', array('!payment' => $person->booking_total_pay_reqd)),
t('!fullypaid', array('!fullypaid' => $amount_owing == 0 ? 'Yes' : 'No')),
t($person->booking_welfare_required == 'Y' ? 'Yes' : 'No'),
);
$total_paid += $person->booking_amount_paid;
@@ -120,18 +123,10 @@ function booking_report_summary() {
if ($person->booking_welfare_required == 'Y')
$welfare_count++;
//fully paid?
if ($person->booking_amount_paid >= $person->booking_total_pay_reqd || $person->booking_total_pay_reqd == "0.00")
{
//watchdog('booking', "Fully paid person, ID !id (!first !last)", array('!id' => $person->nid,'!first' => ucwords($person->booking_firstname), '!last' => ucwords($person->booking_lastname)));
//fully paid?
if ($amount_owing == 0)
$fullypaid_count++;
}
elseif ($person->booking_partner_id > 0 && _booking_amount_owing($person->nid) == 0)
{
//watchdog('booking', "Fully paid married person, ID !id (!first !last)", array('!id' => $person->nid,'!first' => ucwords($person->booking_firstname), '!last' => ucwords($person->booking_lastname)));
$fullypaid_count++;
}
//general stats
$dob_total += $person->booking_dob;
$person_count++;