arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Update 131 update to properly create the sponsorship logs and award donations for past years

Browse Source 
Update the search results to LEFT JOIN the user, instead of JOINING
Add some missing i18n's and fix some typos
This commit is contained in:
james 2009-10-22 16:46:32 +00:00
parent a7041ea154
commit c9db2c0f83
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/donors.php
View File

@ -729,7 +729,7 @@ function draw_activityinfo_form(){
<form id="activityinfo"> <form id="activityinfo">
<table class="tableview" style="width:99%"> <table class="tableview" style="width:99%">
<thead><tr> <thead><tr>
<th><?=i18n("Date")?>/></th> <th><?=i18n("Date")?></th>
<th><?=i18n("Committee Member")?></th> <th><?=i18n("Committee Member")?></th>
<th><?=i18n("Contact Type")?></th> <th><?=i18n("Contact Type")?></th>
<th><?=i18n("Appeal")?></th> <th><?=i18n("Appeal")?></th>
@ -769,7 +769,7 @@ function draw_activityinfo_form(){
$query = "SELECT CONCAT_WS('&nbsp;', users.firstname, users.lastname) AS name, fdl.dt, fdl.log, fdl.type, $query = "SELECT CONCAT_WS('&nbsp;', users.firstname, users.lastname) AS name, fdl.dt, fdl.log, fdl.type,
fundraising_campaigns.name AS campaignname fundraising_campaigns.name AS campaignname
FROM fundraising_donor_logs AS fdl FROM fundraising_donor_logs AS fdl
JOIN users ON fdl.users_id=users.id LEFT JOIN users ON fdl.users_id=users.id
LEFT JOIN fundraising_campaigns ON fdl.fundraising_campaigns_id=fundraising_campaigns.id LEFT JOIN fundraising_campaigns ON fdl.fundraising_campaigns_id=fundraising_campaigns.id
WHERE sponsors_id=" . $sponsorid. " ORDER BY dt DESC"; WHERE sponsors_id=" . $sponsorid. " ORDER BY dt DESC";
//echo "<tr><td colspan=\"3\">" . $query . "</td></tr>"; //echo "<tr><td colspan=\"3\">" . $query . "</td></tr>";

8
admin/donors_search.php
View File

@ -79,10 +79,10 @@
echo "<table class=\"tableview\">"; echo "<table class=\"tableview\">";
echo "<tr>"; echo "<tr>";
echo " <th>Donor/Sponsor</th>"; echo " <th>".i18n("Donor/Sponsor")."</th>";
echo " <th>Total $ this year</th>"; echo " <th>".i18n("Total $ this year")."</th>";
echo " <th>Total $ last year</th>"; echo " <th>".i18n("Total $ last year")."</th>";
echo " <th>% change</th>"; echo " <th>".i18n("% change")."</th>";
echo "</tr>\n"; echo "</tr>\n";

2
db/db.update.131.php
View File

@ -24,7 +24,7 @@ function db_update_131_pre()
echo "Creating sponsorship for ID: $r->id value: $total\n"; echo "Creating sponsorship for ID: $r->id value: $total\n";
mysql_query("INSERT INTO sponsorships (sponsors_id,fundraising_type,value,status,probability,year) VALUES ( mysql_query("INSERT INTO sponsorships (sponsors_id,fundraising_type,value,status,probability,year) VALUES (
'$r->id', '$r->id',
'awards', 'sfawards',
'$total', '$total',
'pending', 'pending',
'25', '25',