diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 421ef7a78..9a8745453 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -86,6 +86,7 @@
- The Table of Contents view was removed from the Help system. The only view
is now the Help Index.
- Allow editing previous revisions of assets in the current version tag
+ - Add user to transactions list and pending transactions.
7.3.21
- fix: Self-deactivation doesn't show login screen after success
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 45003153a..06e515ec8 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -864,12 +864,16 @@ sub www_listPendingTransactions {
$output = $p->getBarTraditional($session->form->process("pn"));
$output .= '
';
- $output .= '| '.$i18n->get('transactionId').' | '.$i18n->get('gateway').' | '.
+ $output .= '
|---|
| '.$i18n->get('transactionId').' | ' . $i18n->get('username') . ' | '.$i18n->get('gateway').' | '.
''.$i18n->get('gatewayId').' | '.$i18n->get('init date').' |
';
foreach (@{$transactions}) {
$properties = $_->get;
$output .= '';
$output .= '| '.$properties->{transactionId}.' | ';
+
+ my $userId = $properties->{userId};
+ my $username = WebGUI::User->new($session, $userId)->username;
+ $output .= '' . $username . ' | ';
$output .= ''.$properties->{gatewayId}.' | ';
$output .= ''.$properties->{gateway}.' | ';
$output .= ''.$session->datetime->epochToHuman($properties->{initDate}).' | ';
@@ -960,6 +964,7 @@ sub www_listTransactions {
$output .= '';
$output .= ' | '.
+ ''. $i18n->get('username'). ' | '.
''. $i18n->get('init date'). ' | '.
''. $i18n->get('completion date'). ' | '.
''. $i18n->get('amount'). ' | '.
@@ -969,6 +974,9 @@ sub www_listTransactions {
foreach $transaction (@transactions) {
$output .= '
|---|
';
$output .= '| '.$session->icon->delete('op=deleteTransaction;tid='.$transaction->get('transactionId')).' | ';
+ my $userId = $transaction->get('userId');
+ my $username = WebGUI::User->new($session, $userId)->username;
+ $output .= '' . $username . ' | ';
$output .= ''.$session->datetime->epochToHuman($transaction->get('initDate')).' | ';
$output .= ''.$session->datetime->epochToHuman($transaction->get('completionDate')).' | ';
$output .= ''.sprintf('%.2f',$transaction->get('amount')).' | ';
@@ -981,7 +989,7 @@ sub www_listTransactions {
foreach (@items) {
$output .= '
';
$output .= ' | ';
- $output .= ''.
+ $output .= ' | '.
$session->icon->delete('op=deleteTransactionItem;tid='.$transaction->get('transactionId').';iid='.$_->{itemId}.';itype='.$_->{itemType}).
$_->{itemName}.' | ';
$output .= ''.$_->{quantity}.' | ';
diff --git a/lib/WebGUI/i18n/English/Commerce.pm b/lib/WebGUI/i18n/English/Commerce.pm
index b46e1ef0b..9ac7af424 100755
--- a/lib/WebGUI/i18n/English/Commerce.pm
+++ b/lib/WebGUI/i18n/English/Commerce.pm
@@ -152,6 +152,10 @@ our $I18N = {
context => q|The menu title for 'Show pending transactions' in the AdminConsole side menu.|
},
+ 'username' => {
+ message => q|User|,
+ lastUpdated => 0,
+ },
'transactionId' => {
message => q|TransactionId|,
@@ -159,8 +163,6 @@ our $I18N = {
context => q|TransactionId, just leave it as it is.|
},
-
-
'gatewayId' => {
message => q|Gateway ID|,
lastUpdated => 0,
diff --git a/lib/WebGUI/i18n/English/TransactionLog.pm b/lib/WebGUI/i18n/English/TransactionLog.pm
index b9fb75b9f..446f3d8c3 100644
--- a/lib/WebGUI/i18n/English/TransactionLog.pm
+++ b/lib/WebGUI/i18n/English/TransactionLog.pm
@@ -83,6 +83,10 @@ our $I18N = {
lastUpdated => 1149222142,
},
+ 'username' => {
+ message => q|User|,
+ lastUpdated => 1185302874,
+ },
'itemLoop' => {
message => q|This loop contains all items the transaction consists of. These variables are available:|,
lastUpdated => 1149222142,