projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
512dd31
)
RT#73993 - updated selfservice and ngselfservice to allow for the control of changes...
author
Christopher Burger
<burgerc@freeside.biz>
Mon, 1 May 2017 19:09:18 +0000
(15:09 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Mon, 1 May 2017 19:09:18 +0000
(15:09 -0400)
FS/FS/ClientAPI/MasonComponent.pm
patch
|
blob
|
history
FS/FS/Conf.pm
patch
|
blob
|
history
ng_selfservice/elements/error.php
patch
|
blob
|
history
ng_selfservice/elements/menu.php
patch
|
blob
|
history
ng_selfservice/services.php
patch
|
blob
|
history
diff --git
a/FS/FS/ClientAPI/MasonComponent.pm
b/FS/FS/ClientAPI/MasonComponent.pm
index
3a4bfe1
..
d09d6da
100644
(file)
--- a/
FS/FS/ClientAPI/MasonComponent.pm
+++ b/
FS/FS/ClientAPI/MasonComponent.pm
@@
-145,7
+145,7
@@
sub mason_comp {
return { 'error' => 'Illegal component' };
}
return { 'error' => 'Illegal component' };
}
- my @args = $packet->{'args'} ?
@{ $packet->{'args'}
} : ();
+ my @args = $packet->{'args'} ?
$packet->{'args'
} : ();
if ( $session_comps{$comp} ) {
if ( $session_comps{$comp} ) {
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
714190a
..
a53fedb
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-4821,6
+4821,7
@@
and customer address. Include units.',
'Change billing address',
'Change service address',
'Change payment information',
'Change billing address',
'Change service address',
'Change payment information',
+ 'Change packages',
'Change password(s)',
'Logout',
],
'Change password(s)',
'Logout',
],
diff --git
a/ng_selfservice/elements/error.php
b/ng_selfservice/elements/error.php
index
2cff74f
..
ee60c6e
100644
(file)
--- a/
ng_selfservice/elements/error.php
+++ b/
ng_selfservice/elements/error.php
@@
-1,2
+1,3
@@
-<FONT SIZE="+1" COLOR="#ff0000"><? echo htmlspecialchars($error); ?><? if ($error) { echo '<BR><BR>'; } ?></FONT>
-
+<? if (isset($error)) { ?>
+ <FONT SIZE="+1" COLOR="#ff0000"><? echo htmlspecialchars($error); echo '<BR><BR>'; ?></FONT>
+<? } ?>
diff --git
a/ng_selfservice/elements/menu.php
b/ng_selfservice/elements/menu.php
index
cb9d617
..
b68c8c1
100644
(file)
--- a/
ng_selfservice/elements/menu.php
+++ b/
ng_selfservice/elements/menu.php
@@
-32,15
+32,15
@@
extract($skin_info);
foreach ($menu_array AS $menu_item) {
if ( preg_match('/^\s*$/', $menu_item) ) {
foreach ($menu_array AS $menu_item) {
if ( preg_match('/^\s*$/', $menu_item) ) {
- print_menu($submenu, $current_menu);
+ print_menu($submenu, $current_menu
, $menu_disable
);
$submenu = array();
} else {
$submenu[] = $menu_item;
}
}
$submenu = array();
} else {
$submenu[] = $menu_item;
}
}
- print_menu($submenu, $current_menu);
+ print_menu($submenu, $current_menu
, $menu_disable
);
- function print_menu($submenu_array, $current_menu) {
+ function print_menu($submenu_array, $current_menu
, $menu_disable
) {
if ( count($submenu_array) == 0 ) { return; }
$links = array();
if ( count($submenu_array) == 0 ) { return; }
$links = array();
@@
-71,8
+71,10
@@
extract($skin_info);
echo '<ul>';
foreach ($links AS $link) {
$label = array_shift($labels);
echo '<ul>';
foreach ($links AS $link) {
$label = array_shift($labels);
- print_link($link, $label, $current_menu, array($link) );
- echo '</a></li>';
+ if ( in_array($label, $menu_disable) == 0) {
+ print_link($link, $label, $current_menu, array($link) );
+ echo '</a></li>';
+ }
}
echo '</ul>';
}
}
echo '</ul>';
}
diff --git
a/ng_selfservice/services.php
b/ng_selfservice/services.php
index
ce47e9e
..
25fbdde
100644
(file)
--- a/
ng_selfservice/services.php
+++ b/
ng_selfservice/services.php
@@
-17,6
+17,7
@@
extract($list_pkgs);
?>
<TABLE BORDER=0 CELLSPACING=2 CELLPADDING=1>
<TR>
?>
<TABLE BORDER=0 CELLSPACING=2 CELLPADDING=1>
<TR>
+ <TH ALIGN="LEFT"> </TH>
<TH ALIGN="LEFT">Product</TH>
<TH ALIGN="LEFT">Status</TH>
<TH ALIGN="LEFT" COLSPAN=2>Service(s)</TH>
<TH ALIGN="LEFT">Product</TH>
<TH ALIGN="LEFT">Status</TH>
<TH ALIGN="LEFT" COLSPAN=2>Service(s)</TH>
@@
-29,11
+30,17
@@
extract($list_pkgs);
$rowspan = count($pkg['cust_svc']);
if ( $rowspan == 0 ) { $rowspan = 1; }
$td = '<TD ALIGN="LEFT" VALIGN="top" ROWSPAN="'. $rowspan. '">';
$rowspan = count($pkg['cust_svc']);
if ( $rowspan == 0 ) { $rowspan = 1; }
$td = '<TD ALIGN="LEFT" VALIGN="top" ROWSPAN="'. $rowspan. '">';
+
+ $change_link = '';
+ if ( in_array("Change packages", $menu_disable) == 0) {
+ $change_link = '<a href="packages_change.php?pkgnum=' . $pkg['pkgnum'] . '&pkg=' . $pkg['pkg_label'] . '">[change]</a>';
+ }
?>
<TR>
<TD COLSPAN=4 STYLE="border-top:1px solid #999999"></TD>
</TR>
<TR>
?>
<TR>
<TD COLSPAN=4 STYLE="border-top:1px solid #999999"></TD>
</TR>
<TR>
+ <? echo $td ?><? echo $change_link ?> </TD>
<? echo $td ?><? echo $pkg['pkg_label']; ?></TD>
<? echo $td ?>
<FONT COLOR="#<? echo $pkg['statuscolor'] ?>"><B>
<? echo $td ?><? echo $pkg['pkg_label']; ?></TD>
<? echo $td ?>
<FONT COLOR="#<? echo $pkg['statuscolor'] ?>"><B>