diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index ce6caeccb..f44592f36 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,7 @@ Kamerbeek / Oqapi) - fixed: WSClient now correctly handles SOAP::Som returns of simple arrays of scalars and a exception producing if test turned into an eval. - fixed: Gallery now gives an error message when a Zip archive is being naughty + - fixed: Upgrade 7.5.10-7.5.11 upgrades transaction payment gateway info. 7.5.19 - fixed: paginator doesn't show correct number of page links with a limit applied 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 302b77cca..d792fd5f7 100644 --- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl +++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl @@ -74,6 +74,7 @@ addDBLinkAccessToSQLMacro($session); addAssetManager( $session ); removeSqlForm($session); migratePaymentPlugins( $session ); +updateTransactionPaymentGateway( $session ); removeRecurringPaymentActivity( $session ); addLoginMessage( $session ); addNewApprovalActivities( $session ); @@ -806,7 +807,7 @@ sub convertTransactionLog { $db->setRow("transaction","transactionId",{ transactionId => "new", isSuccessful => (($oldTranny->{status} eq "Completed") ? 1 : 0), - transactionCode => $oldTranny->{XID}, + transactionCode => $oldTranny->{gatewayId}, statusCode => $oldTranny->{authcode}, statusMessage => $oldTranny->{message}, userId => $oldTranny->{userId}, @@ -825,6 +826,8 @@ sub convertTransactionLog { paymentState => $u->profileField('homeState'), paymentCode => $u->profileField('homeZip'), paymentCountry => $u->profileField('homeCountry'), + paymentDriverId => $oldTranny->{gateway}, + paymentDriverLabel => $oldTranny->{gateway}, paymentAddressName => $u->profileField('firstName').' '.$u->profileField('lastName'), paymentPhoneNumber => $u->profileField('homePhone'), dateOfPurchase => $date->toDatabase, @@ -1796,6 +1799,14 @@ sub migratePaymentPlugins { print "Done\n" unless $quiet; } +#---------------------------------------------------------------------------- +sub updateTransactionPaymentGateway { + my $session = shift; + print "\tUpdating the transaction paymentGatewayId's to the new and migrated payment gateways..." unless $quiet; + $session->db->write("update transaction t set t.paymentDriverId = (select p.paymentGatewayId from paymentGateway p where p.label = t.paymentDriverLabel)"); + print "Done.\n" unless $quiet; +} + #---------------------------------------------------------------------------- sub removeRecurringPaymentActivity { my $session = shift; diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index 2a22b6a98..93ce38042 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -658,7 +658,7 @@ sub view { } $self->_createRSSURLs(\%var); - $var{item_loop} = $item_loop; + $var{item_loop} = $item_loop; if ($rssObject) { $self->_constructRSS($rssObject,\%var);