X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fmyaccount.html;h=a6352e07a3e83af18cc12972577b91f9750e886e;hb=63973c641c4be00765fa27e55c57cc5b9aa4da19;hp=b1598838703dbce2f9b3dbe97513bbdc4f0d79cc;hpb=ae613d832c5f9fa00f476aa4d5c79450ba6cd159;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index b15988387..a6352e07a 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -2,20 +2,17 @@
 <%= include('header', 'My Account') %>
 
 Hello <%= $name %>!<BR><BR>
-<%= $small_custview %>
+
+<%= include('small_custview') %>
+
 <BR>
-<%= if ( $access_pkgnum ) {
-      $OUT .= qq!Balance: <B>\$$balance</B><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)) {
+  if (scalar(grep $_, @hide_payment_fields)) { # this sucks
     $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>!;
@@ -34,17 +31,17 @@ Hello <%= $name %>!<BR><BR>
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
             '<TR><TH BGCOLOR="#ff6666" COLSPAN=5>Open Invoices</TH></TR>';
     my $link = qq!<A HREF="<%= $url %>myaccount!;
-    my $col1 = "ffffff";
-    my $col2 = "dddddd";
+    my $col1 = $stripe1_bgcolor || '#ffffff';
+    my $col2 = $stripe2_bgcolor || '#dddddd';
     my $col = $col1;
 
     foreach my $invoice ( @open_invoices ) {
-      my $td = qq!<TD BGCOLOR="#$col">!;
+      my $td = qq!<TD BGCOLOR="$col">!;
       my $a=qq!<A HREF="${url}view_invoice;invnum=!. $invoice->{'invnum'}. '">';
       $OUT .=
         "<TR>$td${a}Invoice #". $invoice->{'invnum'}. "</A></TD>$td</TD>".
         "$td$a". $invoice->{'date'}. "</A></TD>$td</TD>".
-        qq!<TD BGCOLOR="#$col" ALIGN="right">$a\$!. $invoice->{'owed'}.
+        qq!<TD BGCOLOR="$col" ALIGN="right">$a\$!. $invoice->{'owed'}.
           '</A></TD>'.
         '</TR>';
       $col = $col eq $col1 ? $col2 : $col1;
@@ -59,20 +56,21 @@ 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";
+    my $col1 = $stripe1_bgcolor || '#ffffff';
+    my $col2 = $stripe2_bgcolor || '#dddddd';
     my $col = $col1;
 
     foreach my $support ( @support_services ) {
-      my $td = qq!<TD BGCOLOR="#$col">!;
+      my $td = qq!<TD BGCOLOR="$col">!;
       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;
     }
@@ -82,6 +80,11 @@ Hello <%= $name %>!<BR><BR>
   }
 %>
 
-<%= include('ticket_summary') if @tickets %> 
+<%= if (@tickets) {
+      $OUT .= include('ticket_summary');
+    } else {
+      $OUT .= '';
+    }
+%>
 
 <%= include('footer') %>