[freeside-commits] freeside/fs_selfservice/fri/modules billing.module, NONE, 1.1 callmonitor.module, 1.1.1.1, 1.2 dashboard.module, NONE, 1.1 myaccount.module, NONE, 1.1 settings.module, 1.1.1.1, 1.2

Ivan,,, ivan at wavetail.420.am
Sun Mar 16 19:48:17 PDT 2008


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

Modified Files:
	callmonitor.module settings.module 
Added Files:
	billing.module dashboard.module myaccount.module 
Log Message:
first bits of working FRI!  woop!

Index: callmonitor.module
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules/callmonitor.module,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- callmonitor.module	16 Mar 2008 19:58:22 -0000	1.1.1.1
+++ callmonitor.module	17 Mar 2008 02:48:15 -0000	1.2
@@ -33,7 +33,7 @@
    */
   function navMenu($args) {
 
-    $ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=Callmonitor&f=display'>" . _("Call Monitor") . "</a></small></small></p><br>";
+    $ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=Callmonitor&f=display'>" . _("Call History") . "</a></small></small></p><br>";
 
     return $ret;
   }
@@ -253,9 +253,9 @@
 
     // header
     if ($_SESSION['ari_user']['admin_callmonitor']) {
-      $header_text = _("Call Monitor");
+      $header_text = _("Call History");
     } else {
-      $header_text = sprintf(_("Call Monitor for %s (%s)"),$displayname,$extension);
+      $header_text = sprintf(_("Call History for %s (%s)"),$displayname,$extension);
     }
     $ret .= $display->displayHeaderText($header_text);
     $ret .= $display->displaySearchBlock('left',$m,$q,$url_opts,true);

--- NEW FILE: myaccount.module ---
<?php

/**
 * @file
 * Functions for the interface to the help page
 */

/**
  * Class for help
  */
class myaccount {

  /*
   * rank (for prioritizing modules)
   */
  function rank() {

    $rank = 9;
    return $rank;
  }

  /*
   * init
   */
  function init() {
  }

  /*
   * Adds menu item to nav menu
   *
   * @param $args
   *   Common arguments
   */
  function navMenu($args) {

    $ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=myaccount&f=display'>" . _("My Account") . "</a></small></small></p><br>";

    return $ret;
  }

  /*
   * Displays stats page
   *
   * @param $args
   *   Common arguments
   */
  function display($args) {

    global $ARI_HELP_FEATURE_CODES;

    $display = new Display();

    // args
    $m = getArgument($args,'m');
    $q = getArgument($args,'q');

    $displayname = $_SESSION['ari_user']['displayname'];
    $extension = $_SESSION['ari_user']['extension'];

    // build page content
    $ret .= checkErrorMessage();

	$header_text = _("My Account");
	if (!$_SESSION['ari_user']['admin_help']) {
		$header_text .= sprintf(_(" for %s (%s)"), $displayname, $extension);
	}

    // build page content
    $ret .= checkErrorMessage();

    $ret .= $display->displayHeaderText($header_text);
    $ret .= $display->displayLine();

    $ret .= 'My Account goes here';

    return $ret;
  }

}

?>

Index: settings.module
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/fri/modules/settings.module,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- settings.module	16 Mar 2008 19:58:23 -0000	1.1.1.1
+++ settings.module	17 Mar 2008 02:48:15 -0000	1.2
@@ -53,7 +53,7 @@
 	
 	// and we are not logged in as admin
 	if ($exten!=$ARI_ADMIN_USERNAME) {
-		$ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=Settings&f=display'>" . _("Settings") . "</a></small></small></p><br>";
+		$ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=Settings&f=display'>" . _("Phone Settings") . "</a></small></small></p><br>";
 	}
 
     return $ret;
@@ -589,7 +589,7 @@
 	// build page content
 	$ret .= checkErrorMessage();
 	
-	$headerText = sprintf(_("Settings for %s (%s)"),$displayname,$exten);
+	$headerText = sprintf(_("Phone Settings for %s (%s)"),$displayname,$exten);
 	
 	$ret .= $display->displayHeaderText($headerText);
 	$ret .= $display->displayLine();

--- NEW FILE: dashboard.module ---
<?php

/**
 * @file
 * Functions for the interface to the help page
 */

/**
  * Class for help
  */
class dashboard {

  /*
   * rank (for prioritizing modules)
   */
  function rank() {

    $rank = -4;
    return $rank;
  }

  /*
   * init
   */
  function init() {
  }

  /*
   * Adds menu item to nav menu
   *
   * @param $args
   *   Common arguments
   */
  function navMenu($args) {

    $ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=dashboard&f=display'>" . _("Dashboard") . "</a></small></small></p><br>";

    return $ret;
  }

  /*
   * Displays stats page
   *
   * @param $args
   *   Common arguments
   */
  function display($args) {

    global $ARI_HELP_FEATURE_CODES;

    $display = new Display();

    // args
    $m = getArgument($args,'m');
    $q = getArgument($args,'q');

    $displayname = $_SESSION['ari_user']['displayname'];
    $extension = $_SESSION['ari_user']['extension'];

    // build page content
    $ret .= checkErrorMessage();

	$header_text = _("Dashboard");
	if (!$_SESSION['ari_user']['admin_help']) {
		$header_text .= sprintf(_(" for %s (%s)"), $displayname, $extension);
	}

    // build page content
    $ret .= checkErrorMessage();

    $ret .= $display->displayHeaderText($header_text);
    $ret .= $display->displayLine();

    $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>';
    
    if ( $fs_info['balance'] > 0 ) {
  
      // XXX correct URL
      $ret .= '<B><A HREF="'. $url.
              '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="'. $url. 'myaccount'; // #XXX url
      $col1 = "eeeeee";
      $col2 = "cccccc";
      $col = $col1;
  
      while ( $i = each($fs_info['open_invoices']) ) {
  
        $invoice = $i[value];
  
        $td = '<TD BGCOLOR="#'. $col. '">';
        $a  = '<A HREF="'. $url. 'view_invoice;invnum='.
              $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>';
    }

    $ret .= 'Received calls (10)<br><br>';
    $ret .= 'Placed calls (10)';

//    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->{'name'}. "</TD>".
//          $td. $ticket->{'status'}. "</TD>".
//          '</TR>';
//        $col = $col eq $col1 ? $col2 : $col1;
//      }
//      $OUT .= '</TABLE>';
//    } else {
//      $OUT .= '';
//    }

    return $ret;
  }

}

?>

--- NEW FILE: billing.module ---
<?php

/**
 * @file
 * Functions for the interface to the help page
 */

/**
  * Class for help
  */
class billing {

  /*
   * rank (for prioritizing modules)
   */
  function rank() {

    $rank = -2;
    return $rank;
  }

  /*
   * init
   */
  function init() {
  }

  /*
   * Adds menu item to nav menu
   *
   * @param $args
   *   Common arguments
   */
  function navMenu($args) {

    $ret .= "<p><small><small><a href='" . $_SESSION['ARI_ROOT'] . "?m=billing&f=display'>" . _("Billing") . "</a></small></small></p><br>";

    return $ret;
  }

  /*
   * Displays stats page
   *
   * @param $args
   *   Common arguments
   */
  function display($args) {

    global $ARI_HELP_FEATURE_CODES;

    $display = new Display();

    // args
    $m = getArgument($args,'m');
    $q = getArgument($args,'q');

    $displayname = $_SESSION['ari_user']['displayname'];
    $extension = $_SESSION['ari_user']['extension'];

    // build page content
    $ret .= checkErrorMessage();

	$header_text = _("Billing");
	if (!$_SESSION['ari_user']['admin_help']) {
		$header_text .= sprintf(_(" for %s (%s)"), $displayname, $extension);
	}

    // build page content
    $ret .= checkErrorMessage();

    $ret .= $display->displayHeaderText($header_text);
    $ret .= $display->displayLine();

    $ret .= 'Billing goes here';

    return $ret;
  }

}

?>



More information about the freeside-commits mailing list