From 44a036e095a5c986592e8decee7bb738520bf112 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 8 Jul 2008 20:24:19 +0000
Subject: [PATCH] fixed transactions lost during 7.5.11 upgrade

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e67c52b28..09abef4d1 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.5.16
  - Created a migration from 7.4.40 directly to 7.5.16.
+ - fixed: transactions lost during 7.5.11 upgrade
  - fixed: More permissive DSN checking to allow use of SQLite (thanks pathma)
  - fixed: Project manager modal dialog doesn't work in some instances.
  - fixed: Syndicated Content doesn't always decode text properly
diff --git a/docs/upgrades/upgrade_7.4.40-7.5.16.pl b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
index 1cb2e02d5..2aae7f874 100644
--- a/docs/upgrades/upgrade_7.4.40-7.5.16.pl
+++ b/docs/upgrades/upgrade_7.4.40-7.5.16.pl
@@ -942,6 +942,7 @@ sub convertTransactionLog {
                 $status = 'NotShipped' if $status eq 'NotSent';
                 $db->setRow("transactionItem","itemId",{
                     itemId                  => "new",
+                    assetId                 => $oldItem->{itemId},
                     transactionId           => $oldItem->{transactionId},
                     configuredTitle         => $oldItem->{itemName},
                     options                 => '{}',
@@ -951,7 +952,7 @@ sub convertTransactionLog {
                     quantity                => $oldItem->{quantity},
                     price                   => $oldItem->{amount},
                     vendorId                => "defaultvendor000000000",
-                    }, $oldItem->{itemId});
+                    });
             }
     }
     my $driverId = $db->quickScalar("select paymentGatewayId from paymentGateway where className='WebGUI::Shop::PayDriver::ITransact'");
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 2a6206938..e7894670e 100644
--- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl
+++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
@@ -829,6 +829,7 @@ sub convertTransactionLog {
                 $status = 'NotShipped' if $status eq 'NotSent';
                 $db->setRow("transactionItem","itemId",{
                     itemId                  => "new",
+                    assetId                 => $oldItem->{itemId},
                     transactionId           => $oldItem->{transactionId},
                     configuredTitle         => $oldItem->{itemName},
                     options                 => '{}',
@@ -838,7 +839,7 @@ sub convertTransactionLog {
                     quantity                => $oldItem->{quantity},
                     price                   => $oldItem->{amount},
                     vendorId                => "defaultvendor000000000",
-                    }, $oldItem->{itemId});
+                    });
             }
     }
     $db->write("drop table oldtransaction");