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

Use booking_payment_complete flag in report

Browse Source
This commit is contained in:
Nathan Coad
2015-03-04 10:09:35 +11:00
parent aa53b81351
commit b7cb58dc41
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
booking.module
View File

@@ -851,7 +851,7 @@ function booking_generate_luckynumbers() {
return t("<h3>Generate Lucky Numbers</h3>"); return t("<h3>Generate Lucky Numbers</h3>");
} }
/*
function booking_form_user_profile_form_alter(&$form, &$form_state) { function booking_form_user_profile_form_alter(&$form, &$form_state) {
// Add your own function to the array of validation callbacks // Add your own function to the array of validation callbacks
$form['#validate'][] = 'booking_form_user_profile_form_validate'; $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'])) { //if (!empty($form_state['values']['pass'])) {
watchdog('booking', t('Password changed to "%pass"', array('%pass' => $form_state['values']['pass']))); watchdog('booking', t('Password changed to "%pass"', array('%pass' => $form_state['values']['pass'])));
//} //}
} }
*/

3
booking.reports.inc
View File

@@ -148,7 +148,8 @@ function booking_report_summary() {
$this_row[] = t('!email', array('!email' => $person->booking_email)); $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' => $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('!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('!reqd', array('!reqd' => $person->booking_refund_processed == 'Y' ? 'Yes' : 'No'));
$this_row[] = t('!payment', array('!payment' => $person->booking_refund_due)); $this_row[] = t('!payment', array('!payment' => $person->booking_refund_due));
$this_row[] = t($person->booking_welfare_required == 'Y' ? 'Yes' : 'No'); $this_row[] = t($person->booking_welfare_required == 'Y' ? 'Yes' : 'No');