[freeside-commits] branch master updated. 33f34ee0cbcaa0ef2cce678f843dfc0a0b6d17bd

[Jonathan Prykop]

The branch, master has been updated
       via  33f34ee0cbcaa0ef2cce678f843dfc0a0b6d17bd (commit)
      from  d719b00e871830c3b8d48d4f713ae455b4c1b5b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33f34ee0cbcaa0ef2cce678f843dfc0a0b6d17bd
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Nov 9 23:36:07 2015 -0600

    RT#24739: Announcment page for customers logged into portal

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index f272cd4..6e76e1d 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -669,6 +669,11 @@ sub customer_info_short {
 
   }
 
+  # this is here because this routine is called by both fs_ and ng_ main pages, where it appears
+  # it is not customer-specific, though it is only shown to authenticated customers
+  # it is not currently agent-specific, though at some point it might be
+  $return{'announcement'} = join(' ',$conf->config('selfservice-announcement')) || '';
+
   return { 'error'          => '',
            'custnum'        => $custnum,
            %return,
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 990f2a3..ffe5302 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5679,6 +5679,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'selfservice-announcement',
+    'section'     => 'self-service',
+    'description' => 'HTML announcement to display to all authenticated users on account overview page',
+    'type'        => 'textarea',
+  },
+
+  {
     'key'         => 'logout-timeout',
     'section'     => 'UI',
     'description' => 'If set, automatically log users out of the backoffice after this many minutes.',
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index 309021a..524be1f 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -55,9 +55,10 @@ Hello <%= $name %>!<BR><BR>
   } else {
     $OUT .= '<P>You have no outstanding invoices.</P>';
   }
-
 %>
 
+<%= $announcement || '' %>
+
 <%=
   if ( @support_services ) {
     $OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
diff --git a/ng_selfservice/main.php b/ng_selfservice/main.php
index 792c961..6c12d52 100644
--- a/ng_selfservice/main.php
+++ b/ng_selfservice/main.php
@@ -17,13 +17,15 @@ extract($customer_info);
 
 ?>
 
-Hello <? echo htmlspecialchars($name); ?><BR><BR>
+<P>Hello <? echo htmlspecialchars($name); ?></P>
 
 <? if ( $signupdate_pretty ) { ?>
-  Thank you for being a customer since <? echo $signupdate_pretty; ?><BR><BR>
+  <P>Thank you for being a customer since <? echo $signupdate_pretty; ?></P>
 <? } ?>
 
-Your current balance is: <B>$<? echo $balance ?></B><BR><BR>
+<P>Your current balance is: <B>$<? echo $balance ?></B></P>
+
+<? echo $announcement ?>
 
 <!--
 your open invoices if you have any & payment link if you have one.  more insistant if you're late?

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI/MyAccount.pm                     |    5 +++++
 FS/FS/Conf.pm                                    |    7 +++++++
 fs_selfservice/FS-SelfService/cgi/myaccount.html |    3 ++-
 ng_selfservice/main.php                          |    8 +++++---
 4 files changed, 19 insertions(+), 4 deletions(-)