self-service skinning improvements, RT#13199

[freeside.git] / fs_selfservice / FS-SelfService / cgi / myaccount.html

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index 0de7385..d27f688 100644 (file)
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -10,11 +10,23 @@ Hello <%= $name %>!<BR><BR>
     '';
 %>
 
+<%=
+  $OUT .= qq! <B><A HREF="${url}invoices">View All Invoices</A></B> &nbsp; &nbsp; !;
+%>
+
 <%= if ( $balance > 0 ) {
   if (scalar(grep $_, @hide_payment_fields)) {
     $OUT .= qq! <B><A HREF="${url}make_thirdparty_payment&payby_method=CC">Make a payment</A></B><BR><BR>!;
   } else {
-    $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR><BR>!;
+    $OUT .= qq! <B><A HREF="${url}make_payment">Make a payment</A></B><BR>!;
+    foreach my $term ( sort { $b <=> $a } keys %discount_terms_hash ) {
+      my $saved = $discount_terms_hash{$term}->[1];
+      my $amount = $discount_terms_hash{$term}->[2];
+      my $savings = ( $amount + $saved > 0 )
+                    ? sprintf('%d', $saved / ( $amount + $saved ) * 100 ) : '0';
+      $OUT .= qq! <B><A HREF="${url}make_term_payment;discount_term=$term;amount=$amount">Save $savings\% by paying for $term months: $amount</A></B><BR>!;
+    }
+    $OUT .= qq! <BR>!;
   }
 } %>
 <%=
@@ -47,7 +59,7 @@ Hello <%= $name %>!<BR><BR>
   if ( @support_services ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
             '<TR><TH BGCOLOR="#ff6666" COLSPAN="3">Support Time Remaining</TH>'.
-            '</TR><TR><TH ALIGN="left">#</TH><TH>Package</TH>'.
+            '</TR><TR><TH>Package</TH><TH></TH>'.
             '<TH>Time Remaining</TH></TR>';
     my $col1 = "ffffff";
     my $col2 = "dddddd";
@@ -58,9 +70,10 @@ Hello <%= $name %>!<BR><BR>
       my $a = qq!<A HREF="${url}view_support_details;svcnum=!.
               $support->{'svcnum'}. '">';
       $OUT .=
-        "<TR>$td$a". $support->{'pkgnum'}. "</A></TD>".
-        $td.$a. $support->{'pkg'}. "</A></TD>".
-        $td.$a. $support->{'time'}. "</A></TD>".
+        "<TR>".
+          $td.$a. $support->{'pkg'}. "</A></TD>".
+          $td.'&nbsp;</TD>'.
+          $td.$a. $support->{'time'}. "</A></TD>".
         '</TR>';
       $col = $col eq $col1 ? $col2 : $col1;
     }
@@ -70,31 +83,11 @@ 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>#</TH><TH>Subject</TH><TH>Priority</TH><TH>Queue</TH>'.
-            '<TH>Status</TH></TR>';
-    my $col1 = "ffffff";
-    my $col2 = "dddddd";
-    my $col = $col1;
-
-    foreach my $ticket ( @tickets ) {
-      my $td = qq!<TD BGCOLOR="#$col">!;
-      $OUT .=
-        "<TR>$td". $ticket->{'id'}. "</TD>".
-        $td. $ticket->{'subject'}. "</TD>".
-        $td. ($ticket->{'content'} || $ticket->{'priority'}). "</TD>".
-        $td. $ticket->{'queue'}. "</TD>".
-        $td. $ticket->{'status'}. "</TD>".
-        '</TR>';
-      $col = $col eq $col1 ? $col2 : $col1;
+<%= if (@tickets) {
+      $OUT .= include('ticket_summary');
+    } else {
+      $OUT .= '';
     }
-    $OUT .= '</TABLE>';
-  } else {
-    $OUT .= '';
-  }
 %>
 
 <%= include('footer') %>