[freeside-commits] freeside/fs_selfservice/fri/modules billing.module, 1.2, 1.3 dashboard.module, 1.2, 1.3 myaccount.module, 1.2, 1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules
In directory wavetail.420.am:/tmp/cvs-serv30012

Modified Files:
	billing.module dashboard.module myaccount.module 
Log Message:
pre-show checkpoint.  duct tape!

Index: myaccount.module
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules/myaccount.module,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- myaccount.module	17 Mar 2008 16:24:00 -0000	1.2
+++ myaccount.module	18 Mar 2008 06:43:50 -0000	1.3
@@ -85,7 +85,21 @@
     $ret .= '<BR>';
 
 
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=change_bill">Change billing address</A></B>';
+
+    $ret .= '&nbsp;&nbsp;|&nbsp;&nbsp;';
+
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=change_ship">Change service address</A></B>';
+
+    $ret .= '<BR><BR>';
 
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=change_pay">Change payment information</A></B><BR><BR>';
 
     return $ret;
   }

Index: dashboard.module
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules/dashboard.module,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dashboard.module	17 Mar 2008 16:24:00 -0000	1.2
+++ dashboard.module	18 Mar 2008 06:43:50 -0000	1.3
@@ -84,8 +84,11 @@
     
     if ( $fs_info['balance'] > 0 ) {
   
-      $ret .= '<B><A HREF="'. $_SESSION['ARI_ROOT'].
-              '?m=billing&f=make_payment">Make a payment</A></B><BR><BR>';
+      #$ret .= '<B><A HREF="'. $_SESSION['ARI_ROOT'].
+      #        '?m=billing&f=make_payment">Make a payment</A></B><BR><BR>';
+      $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+              $_SESSION['freeside_session_id'].
+              ';action=make_payment">Make a payment</A></B><BR><BR>';
 
     }
 
@@ -127,8 +130,8 @@
       $ret .= 'You have no outstanding invoices.<BR><BR>';
     }
 
-    $ret .= 'Received calls (10)<br><br>';
-    $ret .= 'Placed calls (10)';
+    #$ret .= 'Received calls (10)<br><br>';
+    #$ret .= 'Placed calls (10)';
 
 //    if ( @tickets ) {
 //      $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.

Index: billing.module
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules/billing.module,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- billing.module	17 Mar 2008 16:24:00 -0000	1.2
+++ billing.module	18 Mar 2008 06:43:50 -0000	1.3
@@ -71,6 +71,69 @@
 
 
     $freeside = new FreesideSelfService();
+
+   $fs_info = $freeside->customer_info( array(
+      'session_id' => $_SESSION['freeside_session_id'],
+    ) );
+    $error = $fs_info['error'];
+    if ( $error ) {
+      //$_SESSION['ari_error'] = _("Incorrect Username or Password");
+      $_SESSION['ari_error'] = $error; #// XXX report as ari_error???!
+    }
+
+    //$ret .= $fs_info['small_custview'];
+    //$ret .= '<BR>';
+
+    $ret .= 'Balance: <b>$'. $fs_info['balance']. '</b><BR><BR>';
+   
+    if ( $fs_info['balance'] > 0 ) {
+  
+      #$ret .= '<B><A HREF="'. $_SESSION['ARI_ROOT'].
+      #        '?m=billing&f=make_payment">Make a payment</A></B><BR><BR>';
+      $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+              $_SESSION['freeside_session_id'].
+              ';action=make_payment">Make a payment</A></B><BR><BR>';
+
+    }
+
+    // XXX count() ???
+    if ( count($fs_info['open_invoices']) ) {
+  
+      $ret .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
+              '<TR><TH BGCOLOR="#ff6666" COLSPAN=5>Open Invoices</TH></TR>';
+      $link = '<A HREF="'. $_SESSION['ARI_ROOT'].
+              '?m=billing&f=view_invoice&invnum=';
+      
+      $col1 = "eeeeee";
+      $col2 = "cccccc";
+      $col = $col1;
+  
+      while ( $i = each($fs_info['open_invoices']) ) {
+  
+        $invoice = $i[value];
+  
+        $td = '<TD BGCOLOR="#'. $col. '">';
+        $a  = $link. $invoice['invnum']. '">';
+        $ret .=
+          "<TR>$td$a". 'Invoice #'. $invoice['invnum']. "</A></TD>$td</TD>".
+          "$td$a". $invoice['date']. "</A></TD>$td</TD>".
+          '<TD BGCOLOR="#'. $col. '" ALIGN="right">'. $a. '$'. $invoice['owed'].
+            '</A></TD>'.
+          '</TR>';
+
+        if ( $col == $col1 ) {
+          $col = $col2;
+        } else {
+          $col = $col1;
+        }
+
+      }
+
+      $ret .= '</TABLE><BR>';
+    } else {
+      $ret .= 'You have no outstanding invoices.<BR><BR>';
+    }
+
     #$fs_info = $freeside->customer_info( array(
     #  'session_id' => $_SESSION['freeside_session_id'],
     #) );
@@ -80,10 +143,20 @@
     #  $_SESSION['ari_error'] = $error; #// XXX report as ari_error???!
     #}
 
-    $ret .= 'Billing goes here';
+    // $ret .= 'Billing goes here';
     // XXX navigate to make payment, view invoice,
     // & myaccount change payment info
 
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=make_payment">Make a credit card payment</A></B><BR><BR>';
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=make_payment">Make an electronic check payment</A></B><BR><BR>';
+    $ret .= '<B><A HREF="/selfservice/selfservice.cgi?session='.
+            $_SESSION['freeside_session_id'].
+            ';action=make_payment">Use a prepaid card</A></B><BR><BR>';
+
     return $ret;
 
   }