diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2015-11-09 23:36:07 -0600 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-11-09 23:48:22 -0600 |
commit | f4123bf14ef927f1184d247edccbf50f1e9691d4 (patch) | |
tree | 65c13b52bf2eae99db4b464498b3f06ca445c422 | |
parent | 4e091a88af83ba9293a1747aaf754439dcc4cd39 (diff) |
RT#24739: Announcment page for customers logged into portal
-rw-r--r-- | FS/FS/ClientAPI/MyAccount.pm | 5 | ||||
-rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
-rw-r--r-- | fs_selfservice/FS-SelfService/cgi/myaccount.html | 3 | ||||
-rw-r--r-- | ng_selfservice/main.php | 8 |
4 files changed, 19 insertions, 4 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index 64a443fe0..10b26529f 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -634,6 +634,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 e55cd6f0d..fad786ca3 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -5900,6 +5900,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 309021a87..524be1f6a 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 792c961af..6c12d5260 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? |