From b7cb58dc41e2c4aecdeda389338c72a1a9cfcd29 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Wed, 4 Mar 2015 10:09:35 +1100
Subject: [PATCH] Use booking_payment_complete flag in report

---
 booking.module      | 5 +++--
 booking.reports.inc | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/booking.module b/booking.module
index ae03ea8..59d92ea 100644
--- a/booking.module
+++ b/booking.module
@@ -851,7 +851,7 @@ function booking_generate_luckynumbers() {
 	return t("<h3>Generate Lucky Numbers</h3>");	 
 		
 }
-
+/*
 function booking_form_user_profile_form_alter(&$form, &$form_state) {
     // Add your own function to the array of validation callbacks
     $form['#validate'][] = 'booking_form_user_profile_form_validate';	
@@ -861,4 +861,5 @@ function booking_form_user_profile_form_validate($form, &$form_state) {
 	//if (!empty($form_state['values']['pass'])) {
 		watchdog('booking', t('Password changed to "%pass"', array('%pass' => $form_state['values']['pass'])));
 		//}
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/booking.reports.inc b/booking.reports.inc
index b09afef..fa83937 100644
--- a/booking.reports.inc
+++ b/booking.reports.inc
@@ -148,7 +148,8 @@ function booking_report_summary() {
 		$this_row[] = t('!email', array('!email' => $person->booking_email));
 		$this_row[] = t('!payment', array('!payment' => $person->booking_amount_paid));
 		$this_row[] = t('!payment', array('!payment' => $amount_owing == 0 ? $person->booking_total_pay_reqd : _booking_total_due($person)));
-		$this_row[] = t('!fullypaid', array('!fullypaid' => $amount_owing == 0 ? 'Yes' : 'No'));
+		//$this_row[] = t('!fullypaid', array('!fullypaid' => $amount_owing == 0 ? 'Yes' : 'No'));
+		$this_row[] = t('!fullypaid', array('!fullypaid' => $person->booking_payment_complete == 'Y' ? 'Yes' : 'No'));
 		$this_row[] = t('!reqd', array('!reqd' => $person->booking_refund_processed == 'Y' ? 'Yes' : 'No'));
 		$this_row[] = t('!payment', array('!payment' => $person->booking_refund_due));
 		$this_row[] = t($person->booking_welfare_required == 'Y' ? 'Yes' : 'No');