From c9db2c0f838e82e548b48ac452e6207b0963940a Mon Sep 17 00:00:00 2001 From: james Date: Thu, 22 Oct 2009 16:46:32 +0000 Subject: [PATCH] Update 131 update to properly create the sponsorship logs and award donations for past years Update the search results to LEFT JOIN the user, instead of JOINING Add some missing i18n's and fix some typos --- admin/donors.php | 4 ++-- admin/donors_search.php | 8 ++++---- db/db.update.131.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/donors.php b/admin/donors.php index 1b775af..4bd4444 100644 --- a/admin/donors.php +++ b/admin/donors.php @@ -729,7 +729,7 @@ function draw_activityinfo_form(){
- + @@ -769,7 +769,7 @@ function draw_activityinfo_form(){ $query = "SELECT CONCAT_WS(' ', users.firstname, users.lastname) AS name, fdl.dt, fdl.log, fdl.type, fundraising_campaigns.name AS campaignname 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 WHERE sponsors_id=" . $sponsorid. " ORDER BY dt DESC"; //echo ""; diff --git a/admin/donors_search.php b/admin/donors_search.php index 0cb04bc..9d15bd8 100644 --- a/admin/donors_search.php +++ b/admin/donors_search.php @@ -79,10 +79,10 @@ echo "
/>
" . $query . "
"; echo ""; - echo " "; - echo " "; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; + echo " "; echo "\n"; diff --git a/db/db.update.131.php b/db/db.update.131.php index 197e966..fbb266e 100644 --- a/db/db.update.131.php +++ b/db/db.update.131.php @@ -24,7 +24,7 @@ function db_update_131_pre() echo "Creating sponsorship for ID: $r->id value: $total\n"; mysql_query("INSERT INTO sponsorships (sponsors_id,fundraising_type,value,status,probability,year) VALUES ( '$r->id', - 'awards', + 'sfawards', '$total', 'pending', '25',
Donor/SponsorTotal $ this yearTotal $ last year% change".i18n("Donor/Sponsor")."".i18n("Total $ this year")."".i18n("Total $ last year")."".i18n("% change")."