From 8047e7d5f9b7f019847b5fc98b99e56a8de18b11 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Wed, 20 May 2009 14:28:06 +0000
Subject: [PATCH] Fixed usability issue in vat number manager.

---
 lib/WebGUI/Shop/TaxDriver/EU.pm         | 22 ++++++++++++++++++----
 lib/WebGUI/i18n/English/TaxDriver_EU.pm |  4 ++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/WebGUI/Shop/TaxDriver/EU.pm b/lib/WebGUI/Shop/TaxDriver/EU.pm
index ba8330595..a9e4f66ee 100644
--- a/lib/WebGUI/Shop/TaxDriver/EU.pm
+++ b/lib/WebGUI/Shop/TaxDriver/EU.pm
@@ -400,7 +400,7 @@ EOHTML
     my $defaultLabel    = $i18n->get('default group');
     my $makeDefaultLabel= $i18n->get('make default');
     my $deleteLabel     = $i18n->get('delete group');
-    my $userIdLabel     = $i18n->get('user id');
+    my $userLabel       = $i18n->get('user');
     my $vatNumberLabel  = $i18n->get('vat number');
     my $validatedLabel  = $i18n->get('vies validated');
     my $viesErrorLabel  = $i18n->get('vies error code');
@@ -488,7 +488,7 @@ EOHTML
             //===============================================================
 
             var vatColumDefs = [
-                { key: "userId",        label : '$userIdLabel',    sortable : true  },
+                { key: "username",      label : '$userLabel',      sortable : true, formatter : 'formatUsername' },
                 { key: "vatNumber",     label : '$vatNumberLabel', sortable : true  },
                 { key: "viesValidated", label : '$validatedLabel', sortable : true  },
                 { key: "viesErrorCode", label : '$viesErrorLabel', sortable : false },
@@ -506,7 +506,9 @@ EOHTML
                     { key : "viesValidated",    parser : "string" },
                     { key : "viesErrorCode" },
                     { key : "approveUrl" },
-                    { key : "denyUrl" }
+                    { key : "denyUrl" },
+                    { key : "username" },
+                    { key : "manageUserUrl" }
                 ]
             };
             
@@ -517,6 +519,14 @@ EOHTML
 
             var reloadVatDT = function () { reloadTable( vatDT ) };
 
+            YAHOO.widget.DataTable.Formatter.formatUsername = function (elCell, oRecord, oColumn, oData) {
+                elCell.innerHTML = 
+                    '<a href="' + oRecord.getData('manageUserUrl') + '" alt="User id ' + oRecord.getData('userId') + '">'
+                    + oRecord.getData('username')
+                    + '</a>';
+            }
+
+
             YAHOO.widget.DataTable.Formatter.formatApproveButton = function (elCell, oRecord, oColumn, oData) {
                 var datatable = this;
 
@@ -1021,10 +1031,14 @@ sub www_getVATNumbersAsJSON {
 
     return $self->session->privilege->insufficient unless $self->canManage;
 
-    my $sth = $db->read( 'select * from tax_eu_vatNumbers where approved <> 1 order by userId' );
+    my $sth = $db->read( 
+        'select username, t1.* from tax_eu_vatNumbers as t1, users as t2 where t1.userId=t2.userId and approved <> 1 order by userId' 
+    );
     
     my @numbers;
     while (my $number = $sth->hashRef ) {
+        $number->{ manageUserUrl } =
+            $url->page( 'op=editUser;uid=' . $number->{ userId } );
         $number->{ approveUrl } = 
             $url->page( 'shop=tax;method=do;do=approveVatNumber;number='.$number->{ vatNumber }.';userId='.$number->{ userId } );
         $number->{ denyUrl } = 
diff --git a/lib/WebGUI/i18n/English/TaxDriver_EU.pm b/lib/WebGUI/i18n/English/TaxDriver_EU.pm
index c7d8178ec..fb05bd549 100644
--- a/lib/WebGUI/i18n/English/TaxDriver_EU.pm
+++ b/lib/WebGUI/i18n/English/TaxDriver_EU.pm
@@ -122,8 +122,8 @@ our $I18N = {
         context => q|Button label in VAT group manager|,
     },
 
-    'user id' => {
-        message => q|User id|,
+    'user' => {
+        message => q|User|,
         lastUpdated => 0,
         context => q|Label in the VAT number manager|,
     },