diff --git a/admin/reports_fundraising.inc.php b/admin/reports_fundraising.inc.php index f19f50c..fe85d59 100644 --- a/admin/reports_fundraising.inc.php +++ b/admin/reports_fundraising.inc.php @@ -37,11 +37,20 @@ function report_fundraisings_languages(&$report, $field, $text) * just adds an 's' to find the fields and the functions. */ $report_fundraisings_fields = array( 'fundraising_campaigns_id' => array( + 'start_option_group' => 'Campaign ID', 'name' => 'Fundraising Campaign numerical ID', 'header' => 'ID', 'width' => 0.25, 'table' => "fundraising_campaigns.id"), - + + 'salutation' => array( + 'start_option_group' => 'Contact Information', + 'name' => 'Contact -- Salutation (Mr., Mrs., etc.)', + 'header' => 'Sal', + 'width' => 0.5, + 'table' => "users.salutation", + 'components' => array('users') ), + 'namefl' => array( 'name' => 'Contact -- Full Name (first last)', 'header' => 'Name', @@ -57,41 +66,6 @@ $report_fundraisings_fields = array( 'table' => 'users.email', 'components' => array('users') ), - 'address' => array( - 'name' => 'Contact Address -- Street', - 'header' => 'Address', - 'width' => 2.0, - 'table' => "CONCAT(users.address, ' ', users.address2)", - 'components' => array('users') ), - - 'city' => array( - 'name' => 'Contact Address -- City', - 'header' => 'City', - 'width' => 1.5, - 'table' => 'users.city', - 'components' => array('users') ), - - 'province' => array( - 'name' => 'Contact Address -- '.$config['provincestate'], - 'header' => $config['provincestate'], - 'width' => 0.75, - 'table' => 'users.province', - 'components' => array('users') ), - - 'postal' => array( - 'name' => 'Contact -- Address '.$config['postalzip'], - 'header' => $config['postalzip'], - 'width' => 0.75, - 'table' => 'users.postalcode' , - 'components' => array('users') ), - - 'city_prov' => array( - 'name' => 'Contact Address -- City, '.$config['provincestate'].' (for mailing)', - 'header' => 'City', - 'width' => 1.5, - 'table' => "CONCAT(users.city, ', ', users.province)", - 'components' => array('users') ), - 'phone_home' => array( 'name' => 'Contact -- Phone (Home)', 'header' => 'Phone(Home)', @@ -113,7 +87,44 @@ $report_fundraisings_fields = array( 'table' => 'users.organization', 'components' => array('users') ), + 'address' => array( + 'start_option_group' => 'Contact Address', + 'name' => 'Contact Address -- Street', + 'header' => 'Address', + 'width' => 2.0, + 'table' => "CONCAT(users.address, ' ', users.address2)", + 'components' => array('users') ), + + 'city' => array( + 'name' => 'Contact Address -- City', + 'header' => 'City', + 'width' => 1.5, + 'table' => 'users.city', + 'components' => array('users') ), + + 'province' => array( + 'name' => 'Contact Address -- '.$config['provincestate'], + 'header' => $config['provincestate'], + 'width' => 0.75, + 'table' => 'users.province', + 'components' => array('users') ), + + 'postal' => array( + 'name' => 'Contact Address -- '.$config['postalzip'], + 'header' => $config['postalzip'], + 'width' => 0.75, + 'table' => 'users.postalcode' , + 'components' => array('users') ), + + 'city_prov' => array( + 'name' => 'Contact Address -- City, '.$config['provincestate'].' (for mailing)', + 'header' => 'City', + 'width' => 1.5, + 'table' => "CONCAT(users.city, ', ', users.province)", + 'components' => array('users') ), + 'year' => array( + 'start_option_group' => 'Miscellaneous', 'name' => 'Contact -- Year', 'header' => 'Year', 'width' => 0.5,