From bdf2ea75770dd16c6c7cfa1b1a58b6fbc4c35b75 Mon Sep 17 00:00:00 2001 From: james Date: Sun, 11 Oct 2009 19:49:04 +0000 Subject: [PATCH] Donations tab for campaigns --- admin/fundraising_campaigns.php | 28 ++++++++++++++++++++++++---- admin/fundraising_common.inc.php | 6 ++++++ db/db.update.146.sql | 2 ++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/admin/fundraising_campaigns.php b/admin/fundraising_campaigns.php index 0faf7a78..4b6690f6 100644 --- a/admin/fundraising_campaigns.php +++ b/admin/fundraising_campaigns.php @@ -166,8 +166,7 @@ switch($_GET['action']){ if($r=mysql_fetch_object($q)) { - $goalq=mysql_query("SELECT * FROM fundraising_goals WHERE goal='{$r->fundraising_goal}' AND fiscalyear='{$config['FISCALYEAR']}'"); - $goalr=mysql_fetch_object($goalq); + $goalr=getGoal($r->fundraising_goal); $recq=mysql_query("SELECT SUM(value) AS received FROM fundraising_donations WHERE fundraising_campaigns_id='$r->id' AND fiscalyear='{$config['FISCALYEAR']}' AND status='received'"); echo mysql_error(); $recr=mysql_fetch_object($recq); @@ -202,9 +201,30 @@ switch($_GET['action']){ case "manage_tab_donations": $campaign_id=intval($_GET['id']); $q=mysql_query("SELECT * FROM fundraising_campaigns WHERE id='$campaign_id' AND fiscalyear='{$config['FISCALYEAR']}'"); + if($campaign=mysql_fetch_object($q)) { + echo ""; + echo ""; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "\n"; - if($r=mysql_fetch_object($q)) { - + $q=mysql_query("SELECT * FROM fundraising_donations WHERE fundraising_campaigns_id='$campaign_id' + AND status='received' ORDER BY datereceived DESC"); + while($r=mysql_fetch_object($q)) { + $goal=getGoal($r->fundraising_goal); + $q=mysql_query("SELECT * FROM sponsors WHERE id='{$r->sponsors_id}'"); + $sponsor=mysql_fetch_object($q); + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "\n"; + } + echo "
".i18n("Date")."".i18n("Donor/Sponsor")."".i18n("Purpose")."".i18n("Amount")."".i18n("Type of Support")."
".format_date($r->datereceived)."".$sponsor->organization."".$goal->name."".format_money($r->value)."".i18n($r->supporttype)."
\n"; } exit; break; diff --git a/admin/fundraising_common.inc.php b/admin/fundraising_common.inc.php index 7e286870..62b25095 100644 --- a/admin/fundraising_common.inc.php +++ b/admin/fundraising_common.inc.php @@ -2,4 +2,10 @@ $campaign_types=array("Mail","Email","Phone","Personal Visit","Event","Other"); $salutations=array("Mr.","Mrs.","Ms","Dr.","Professor"); +function getGoal($goal) { + global $config; + $q=mysql_query("SELECT * FROM fundraising_goals WHERE goal='$goal' AND fiscalyear='{$config['FISCALYEAR']}' LIMIT 1"); + return mysql_fetch_object($q); +} + ?> diff --git a/db/db.update.146.sql b/db/db.update.146.sql index efe199d6..75b9aa3a 100644 --- a/db/db.update.146.sql +++ b/db/db.update.146.sql @@ -55,3 +55,5 @@ UPDATE `reports_items` SET field = 'school_email' WHERE field = 'school_contacte UPDATE `reports` SET `desc` = 'List of all schools in the database. Name, address, principal and phone.' WHERE `reports`.`system_report_id` =35 ; +ALTER TABLE `fundraising_donations` ADD `supporttype` VARCHAR( 255 ) NOT NULL; +