self-service improvements, RT10883

5 files changed, 43 insertions, 9 deletions

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 5e5972e67..74f98841a 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -955,6 +955,7 @@ sub list_pkgs {
     'small_custview' =>
       small_custview( $cust_main, $conf->config('countrydefault') ),
     'wholesale_view' => 1,
+    'login_svcpart' => [ $conf->config('selfservice_server-login_svcpart') ],
     'date_format' => $conf->config('date_format') || '%m/%d/%Y',
       };
   }
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index eaf4164bf..a57bfb14a 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -85,9 +85,9 @@ Hello <%= $name %>!<BR><BR>
 <%=
   if ( @tickets ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
-            '<TR><TH BGCOLOR="#ff6666" COLSPAN=5>Open Tickets</TH></TR>'.
+            '<TR><TH BGCOLOR="#ff6666" COLSPAN=6>Open Tickets</TH></TR>'.
             '<TR><TH>#</TH><TH>Subject</TH><TH>Priority</TH><TH>Queue</TH>'.
-            '<TH>Status</TH></TR>';
+            '<TH>Status</TH><TH>Created</TH></TR>';
     my $col1 = "ffffff";
     my $col2 = "dddddd";
     my $col = $col1;
@@ -101,6 +101,7 @@ Hello <%= $name %>!<BR><BR>
         $td. ($ticket->{'content'} || $ticket->{'priority'}). "</TD>".
         $td. $ticket->{'queue'}. "</TD>".
         $td. $ticket->{'status'}. "</TD>".
+        $td. $ticket->{'created'}. "</TD>".
         '</TR>';
       $col = $col eq $col1 ? $col2 : $col1;
     }
diff --git a/fs_selfservice/FS-SelfService/cgi/provision.html b/fs_selfservice/FS-SelfService/cgi/provision.html
index 10d17f537..cd8028a0d 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision.html
@@ -4,6 +4,14 @@
     $provision_list = "provision_list";
     $provision_list = "ws_list" if $wholesale_view;
     ''; %>
+
+<SCRIPT>
+function areyousure(href, message) {
+    if (confirm(message) == true)
+        window.location.href = href;
+}
+</SCRIPT>
+
 <%= include('header', $heading1) %>
 
 <%= include($provision_list) %>
diff --git a/fs_selfservice/FS-SelfService/cgi/provision_list.html b/fs_selfservice/FS-SelfService/cgi/provision_list.html
index 818cd9f35..a1a519490 100644
--- a/fs_selfservice/FS-SelfService/cgi/provision_list.html
+++ b/fs_selfservice/FS-SelfService/cgi/provision_list.html
@@ -1,12 +1,5 @@
 <FONT SIZE=4>Setup services</FONT><BR><BR>
 
-<SCRIPT>
-function areyousure(href, message) {
-    if (confirm(message) == true)
-        window.location.href = href;
-}
-</SCRIPT>
-
 <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#ffffff">
 
 <%=
diff --git a/fs_selfservice/FS-SelfService/cgi/ws_list.html b/fs_selfservice/FS-SelfService/cgi/ws_list.html
index 7b62db452..93425e107 100644
--- a/fs_selfservice/FS-SelfService/cgi/ws_list.html
+++ b/fs_selfservice/FS-SelfService/cgi/ws_list.html
@@ -67,6 +67,37 @@ else {
        $OUT .= "</TD></TR>";
     }
     $OUT .= "</TABLE>";
+
+    if ( @login_svcpart ) {
+	$OUT .= "<BR><BR><BR><B>Self-service accounts</B><BR>";
+	foreach my $pkg ( @cust_pkg ) {
+	    @cust_svc = @{$pkg->{cust_svc}};
+	    @part_svc = @{$pkg->{part_svc}};
+
+	    foreach my $cust_svc ( @cust_svc ) {
+		$svcpart = $cust_svc->{'svcpart'};
+		next unless grep($_ eq $svcpart, @login_svcpart);
+		@label = @{$cust_svc->{'label'}};
+		$OUT .= $label[1] . " &nbsp; ";
+		unless ( $cust_svc->{'svcnum'} == $svcnum ) {
+		    $OUT .= qq!<A HREF="javascript:areyousure('${url}delete_svc;svcnum=$cust_svc->{svcnum}', 'This will permanently delete the $label[1] $label[0].  Are you sure?')">!.
+		  'Delete</A>';
+		}
+		$OUT .= "<BR>";
+	    }
+
+	    foreach my $part_svc ( @part_svc ) {
+		$svcpart = $part_svc->{'svcpart'};
+		next unless grep($_ eq $svcpart, @login_svcpart);
+		$link = "${url}provision_svc;pkgnum=$pkg->{'pkgnum'};".
+		    "svcpart=$part_svc->{'svcpart'}";
+		$OUT .= qq!<A HREF="$link">!. 'Setup '. $part_svc->{'svc'}. 
+		    '</A> ('. $part_svc->{'num_avail'}. ' available)' 
+		    if $part_svc->{'svcdb'} eq 'svc_acct';
+	    }
+
+	} # foreach cust_pkg
+    } # login_svcpart
 }
 
 %>