projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d719b00
)
RT#24739: Announcment page for customers logged into portal
author
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 10 Nov 2015 05:36:07 +0000
(23:36 -0600)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 10 Nov 2015 05:36:07 +0000
(23:36 -0600)
FS/FS/ClientAPI/MyAccount.pm
patch
|
blob
|
history
FS/FS/Conf.pm
patch
|
blob
|
history
fs_selfservice/FS-SelfService/cgi/myaccount.html
patch
|
blob
|
history
ng_selfservice/main.php
patch
|
blob
|
history
diff --git
a/FS/FS/ClientAPI/MyAccount.pm
b/FS/FS/ClientAPI/MyAccount.pm
index
f272cd4
..
6e76e1d
100644
(file)
--- 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,
return { 'error' => '',
'custnum' => $custnum,
%return,
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
990f2a3
..
ffe5302
100644
(file)
--- 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.',
'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
(file)
--- 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>';
}
} else {
$OUT .= '<P>You have no outstanding invoices.</P>';
}
-
%>
%>
+<%= $announcement || '' %>
+
<%=
if ( @support_services ) {
$OUT .= '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">'.
<%=
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
(file)
--- 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 ) { ?>
<? 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?
<!--
your open invoices if you have any & payment link if you have one. more insistant if you're late?