From 1bfcf2caf7274cf95ce3bf29f8a6dd3aa2cb1382 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Sat, 16 May 2015 09:50:26 +1000 Subject: [PATCH] change fully paid on manual email page --- booking.admin.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/booking.admin.inc b/booking.admin.inc index cc75d84..b09a901 100644 --- a/booking.admin.inc +++ b/booking.admin.inc @@ -444,7 +444,7 @@ function booking_manual_email() 'welfare_required' => t('Welfare Required?'), ); */ - + $header = array( 'booking_nid' => array('data' => t('Id'), 'field' => 'nid', 'sort' => 'asc'), 'booking_name' => array('data' => t('Name'), 'field' => 'booking_lastname'), @@ -454,7 +454,7 @@ function booking_manual_email() 'booking_status' => array('data' => t('Status'), 'field' => 'booking_status'), 'amount_paid' => array('data' => t('Payment To Date'), 'field' => 'booking_amount_paid'), 'amount_reqd' => array('data' => t('Total Payment Required'), 'field' => 'booking_total_pay_reqd'), - 'booking_fully_paid' => array('data' => t('Fully paid?')), + 'booking_fully_paid' => array('data' => t('Fully paid?'), 'field' => 'booking_payment_complete'), 'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'), 'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'), ); @@ -485,7 +485,7 @@ function booking_manual_email() foreach($result as $data) { $group_text = ""; - $paid = _booking_amount_owing($data); + //$paid = _booking_amount_owing($data); //$paid = _booking_amount_owing($data->nid); $options[$data->nid] = array ( 'booking_nid' => l(t('!id', array('!id' => $data->nid)), t('node/!id', array('!id' => $data->nid))), @@ -496,7 +496,7 @@ function booking_manual_email() 'booking_status' => _booking_status_generate($data->booking_status), 'amount_paid' => $data->booking_amount_paid, 'amount_reqd' => $data->booking_total_pay_reqd, - 'booking_fully_paid' => $paid == 0 ? 'Yes' : 'No', + 'booking_fully_paid' => $data->booking_payment_complete == 'Y' ? 'Yes' : 'No', 'welfare_required' => $data->booking_welfare_required == 'Y' ? 'Yes' : 'No', 'travel_form' => $data->tid > 0 ? 'Yes' : 'No', );