projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r8593,
[freeside.git]
/
httemplate
/
view
/
cust_main
/
packages.html
diff --git
a/httemplate/view/cust_main/packages.html
b/httemplate/view/cust_main/packages.html
index
53ed6bf
..
bd056a3
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-1,5
+1,3
@@
-<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A><BR>
-
% my $s = 0;
% if ( $curuser->access_right('Order customer package') ) {
<% $s++ ? ' | ' : '' %>
% my $s = 0;
% if ( $curuser->access_right('Order customer package') ) {
<% $s++ ? ' | ' : '' %>
@@
-11,6
+9,7
@@
'cust_main' => $cust_main,
'closetext' => 'Close',
'width' => 763,
'cust_main' => $cust_main,
'closetext' => 'Close',
'width' => 763,
+ 'height' => 350,
)
%>
% }
)
%>
% }
@@
-27,8
+26,12
@@
<A HREF="<% $p %>edit/cust_pkg.cgi?<% $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
% }
<A HREF="<% $p %>edit/cust_pkg.cgi?<% $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
% }
-
<BR><BR>
<BR><BR>
+
+<TABLE>
+ <TR>
+ <TD ALIGN="left">
+
% if ( @$packages ) {
Current packages
% if ( @$packages ) {
Current packages
@@
-40,15
+43,14
@@
Current packages
% )
% )
% {
% )
% )
% {
+% my $prev = $cgi->param('showcancelledpackages');
% $cgi->param('showcancelledpackages', 1);
% $cgi->param('showcancelledpackages', 1);
-%
-
( <a href="<% $cgi->self_url %>">show
( <a href="<% $cgi->self_url %>">show
+% $cgi->param('showcancelledpackages', $prev);
% } else {
% $cgi->param('showcancelledpackages', 0);
% } else {
% $cgi->param('showcancelledpackages', 0);
-%
-
( <a href="<% $cgi->self_url %>">hide
( <a href="<% $cgi->self_url %>">hide
+% $cgi->param('showcancelledpackages', 1);
% }
cancelled packages</a> )
% }
cancelled packages</a> )
@@
-60,6
+62,18
@@
Current packages
% $cgi->param('showoldpackages', 0);
( <a href="<% $cgi->self_url %>">hide old packages</a> )
% }
% $cgi->param('showoldpackages', 0);
( <a href="<% $cgi->self_url %>">hide old packages</a> )
% }
+
+ </TD>
+ <TD ALIGN="right">
+ <A HREF="<%$p%>search/report_cust_pkg.html?custnum=<% $cust_main->custnum %>">Package reports</A><BR>
+ Service reports:
+ <A HREF="<%$p%>search/report_svc_acct.html?custnum=<% $cust_main->custnum %>">accounts</A>
+ </TD>
+ </TR>
+
+ <TR>
+ <TD COLSPAN=2>
+
% if ( @$packages ) {
<% include('/elements/table-grid.html') %>
% if ( @$packages ) {
<% include('/elements/table-grid.html') %>
@@
-76,7
+90,7
@@
Current packages
<TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
</TR>
<TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
</TR>
-% $FS::cust_pkg::DEBUG = 2;
+%
#
$FS::cust_pkg::DEBUG = 2;
% foreach my $cust_pkg (@$packages) {
%
% if ( $bgcolor eq $bgcolor1 ) {
% foreach my $cust_pkg (@$packages) {
%
% if ( $bgcolor eq $bgcolor1 ) {
@@
-111,6
+125,10
@@
Current packages
<BR>
% }
<BR>
% }
+ </TD>
+ </TR>
+</TABLE>
+
% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
<SCRIPT>
// IE-specific hack. other browsers listen to #fragments
% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
<SCRIPT>
// IE-specific hack. other browsers listen to #fragments
@@
-140,6
+158,9
@@
my %conf_opt = (
#for status.html
'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
#for status.html
'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
+ #for status.html pkg-balances
+ 'pkg-balances' => $conf->exists('pkg-balances'),
+ 'money_char' => ( $conf->config('money_char') || '$' ),
#for location.html
'countrydefault' => $countrydefault,
#for location.html
'countrydefault' => $countrydefault,
@@
-148,6
+169,7
@@
my %conf_opt = (
#for services.html
'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'),
'legacy_link' => $conf->exists('legacy_link'),
#for services.html
'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'),
'legacy_link' => $conf->exists('legacy_link'),
+ 'svc_broadband-manage_link' => $conf->config('svc_broadband-manage_link'),
);
#subroutines
);
#subroutines
@@
-177,13
+199,12
@@
sub get_packages {
join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
join(', ', map "part_pkg.$_", fields('part_pkg') );
join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
join(', ', map "part_pkg.$_", fields('part_pkg') );
- my $num_
cust_svc =
-
'( SELECT COUNT(*) FROM cust_svc WHERE cust_pkg.pkgnum = cust_svc.pkgnum )
';
+ my $num_
svcs = '( SELECT COUNT(*) FROM cust_svc '.
+
' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs
';
my @packages = $cust_main->$method( {
my @packages = $cust_main->$method( {
- 'select' => " $cust_pkg_fields, $part_pkg_fields, ".
- " $num_cust_svc AS num_cust_svc ",
- 'addl_from' => ' LEFT JOIN part_pkg USING ( pkgpart ) ',
+ 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
+ 'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )',
} );
my $num_old_packages = scalar(@packages);
} );
my $num_old_packages = scalar(@packages);
@@
-192,7
+213,6
@@
sub get_packages {
my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
grep { /^part_pkg_/ } keys %hash;
$cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
grep { /^part_pkg_/ } keys %hash;
$cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
- $cust_pkg->{'_num_cust_svc'} = $cust_pkg->get('num_cust_svc');
}
unless ( $cgi->param('showoldpackages') ) {
}
unless ( $cgi->param('showoldpackages') ) {
@@
-205,7
+225,9
@@
sub get_packages {
);
@packages =
);
@packages =
- grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then }
+ grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then
+ or $_->num_svcs #don't hide packages w/services
+ }
@packages;
}
@packages;
}