From 3b0d02fad2f33ede757b30d45494c2e338828032 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 30 Jul 2008 04:24:45 +0000
Subject: [PATCH] Fix the EMS upgrade script for 7.5.11 to only create badges
 for users who completed their transactions.

---
 docs/changelog/7.x.x.txt               |  1 +
 docs/upgrades/upgrade_7.5.10-7.5.11.pl | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7e1da7f81..badbf730d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,7 @@
  - Inbox and ?op=viewInbox can now handle millions of rows without taking 10 minutes to return
    some results
  - Exposed a form element for the GalleryAlbum Others Can Add property
+ - fixed: EMS 2.0 migration badges
 
 7.5.18
  - fixed: Collateral Image Manager broken in Firefox 3
diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
index 4bc1cd992..302b77cca 100644
--- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl
+++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
@@ -55,8 +55,8 @@ addShoppingHandler($session);
 addAddressBook($session);
 insertCommercePayDriverTable($session);
 addPaymentDrivers($session);
+upgradeEMS($session);  ##Need the transaction log for EMS upgrade.
 convertTransactionLog($session);
-upgradeEMS($session);
 migrateOldProduct($session);
 mergeProductsWithCommerce($session);
 deleteOldProductTemplates($session);
@@ -686,7 +686,14 @@ sub upgradeEMS {
             }
         }
     	print "\t\t\tMigrating old registrants for $emsId.\n" unless ($quiet);
-        my $registrantResults = $db->read("select * from EventManagementSystem_badges where assetId=?",[$emsId]);
+        my $registrantResults = $db->read(<<EOSQL,[$emsId]);
+select * from EventManagementSystem_badges as b
+    join EventManagementSystem_registrations as r on b.badgeId=r.badgeId
+    join EventManagementSystem_purchases     as p on p.purchaseId=r.purchaseId
+    join transaction                         as t on p.transactionId=t.transactionId
+    where b.assetId=? and t.status='Completed'
+EOSQL
+#"select * from EventManagementSystem_badges where assetId=?",[$emsId]);
         while (my $registrantData = $registrantResults->hashRef) {
             $db->setRow("EMSRegistrant","badgeId",{
                 badgeId             => "new",