diff options
Diffstat (limited to 'httemplate/browse')
| -rwxr-xr-x | httemplate/browse/agent.cgi | 82 | ||||
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 3 | ||||
| -rwxr-xr-x | httemplate/browse/part_svc.cgi | 70 | ||||
| -rw-r--r-- | httemplate/browse/payment_gateway.html | 70 |
4 files changed, 36 insertions, 189 deletions
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 05300d0bd..c5c992704 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -8,8 +8,6 @@ %search = ( 'disabled' => '' ); } - my $conf = new FS::Conf; - %> <%= header('Agent Listing', menubar( 'Main Menu' => $p, @@ -34,14 +32,9 @@ full offerings (via their type).<BR><BR> <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH> <TH>Type</TH> <TH>Customers</TH> - <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH> <TH>Reports</TH> <TH>Registration codes</TH> <TH>Prepaid cards</TH> - <% if ( $conf->config('ticket_system') ) { %> - <TH>Ticketing</TH> - <% } %> - <TH><FONT SIZE=-1>Payment Gateway Overrides</FONT></TH> <TH><FONT SIZE=-1>Freq.</FONT></TH> <TH><FONT SIZE=-1>Prog.</FONT></TH> </TR> @@ -57,8 +50,6 @@ foreach my $agent ( sort { my $cust_main_link = $p. 'search/cust_main.cgi?agentnum_on=1&'. 'agentnum='. $agent->agentnum; - my $cust_pkg_link = $p. 'search/cust_pkg.cgi?agentnum='. $agent->agentnum; - %> <TR> @@ -74,6 +65,7 @@ foreach my $agent ( sort { <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD> <TD> + <TABLE CELLSPACING=0 CELLPADDING=0> <TR> <TH ALIGN="right" WIDTH="40%"> @@ -121,44 +113,6 @@ foreach my $agent ( sort { </TD> <TD> - <TABLE CELLSPACING=0 CELLPADDING=0> - <TR> - <TH ALIGN="right" WIDTH="40%"> - <FONT COLOR="#00CC00"> - <%= my $num_active_pkg = $agent->num_active_cust_pkg %> - </FONT> - </TH> - <TD> - <% if ( $num_active_pkg ) { %> - <A HREF="<%= $cust_pkg_link %>&magic=active"><% } %>active<% if ( $num_active_pkg ) { %></A><% } %> - </TD> - </TR> - <TR> - <TH ALIGN="right" WIDTH="40%"> - <FONT COLOR="#FF9900"> - <%= my $num_susp_pkg = $agent->num_susp_cust_pkg %> - </FONT> - </TH> - <TD> - <% if ( $num_susp_pkg ) { %> - <A HREF="<%= $cust_pkg_link %>&magic=suspended"><% } %>suspended<% if ( $num_susp_pkg ) { %></A><% } %> - </TD> - </TR> - <TR> - <TH ALIGN="right" WIDTH="40%"> - <FONT COLOR="#FF0000"> - <%= my $num_cancel_pkg = $agent->num_cancel_cust_pkg %> - </FONT> - </TH> - <TD> - <% if ( $num_cancel_pkg ) { %> - <A HREF="<%= $cust_pkg_link %>&magic=cancelled"><% } %>cancelled<% if ( $num_cancel_pkg ) { %></A><% } %> - </TD> - </TR> - </TABLE> - </TD> - - <TD> <A HREF="<%= $p %>search/report_cust_pay.html?agentnum=<%= $agent->agentnum %>">Payments</A> <BR><A HREF="<%= $p %>search/report_cust_credit.html?agentnum=<%= $agent->agentnum %>">Credits</A> <BR><A HREF="<%= $p %>search/report_receivables.cgi?agentnum=<%= $agent->agentnum %>">A/R Aging</A> @@ -180,40 +134,6 @@ foreach my $agent ( sort { <BR><A HREF="<%=$p%>edit/prepay_credit.cgi?agentnum=<%= $agent->agentnum %>">Generate cards</A> </TD> - <% if ( $conf->config('ticket_system') ) { %> - - <TD> - <% if ( $agent->ticketing_queueid ) { %> - Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %><BR> - <% } %> - </TD> - - <% } %> - - <TD> - <TABLE CELLSPACING=0 CELLPADDING=0> - <% foreach my $override ( - # sort { } want taxclass-full stuff first? and default cards (empty cardtype) - qsearch('agent_payment_gateway', { 'agentnum' => $agent->agentnum } ) - ) { - %> - <TR> - <TD> - <%= $override->cardtype || 'Default' %> to <%= $override->payment_gateway->gateway_module %> (<%= $override->payment_gateway->gateway_username %>) - <%= $override->taxclass - ? ' for '. $override->taxclass. ' only' - : '' - %> - <FONT SIZE=-1><A HREF="<%=$p%>misc/delete-agent_payment_gateway.cgi?<%= 'XXXoverridenum' %>">(delete)</A></FONT> - </TD> - </TR> - <% } %> - <TR> - <TD><FONT SIZE=-1><A HREF="<%=$p%>edit/agent_payment_gateway.html?agentnum=<%= $agent->agentnum %>">(add override)</A></FONT></TD> - </TR> - </TABLE> - </TD> - <TD><%= $agent->freq %></TD> <TD><%= $agent->prog %></TD> diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 8d5b55451..ffa0d87c2 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -144,8 +144,9 @@ foreach my $part_pkg ( sort $sortby @part_pkg ) { <TD ROWSPAN=<%= $rowspan %>><%= $plandata %></TD> <% + my($pkg_svc); my($n)=""; - foreach my $pkg_svc ( @pkg_svc ) { + foreach $pkg_svc ( @pkg_svc ) { my($svcpart)=$pkg_svc->getfield('svcpart'); my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart }); print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!, diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index a725dc051..ef0de13cc 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -1,11 +1,6 @@ +<!-- mason kludge --> <% -my %flag = ( - 'D' => 'Default', - 'F' => 'Fixed', - '' => '', -); - my %search; if ( $cgi->param('showdisabled') ) { %search = (); @@ -18,13 +13,18 @@ my @part_svc = qsearch('part_svc', \%search ); my $total = scalar(@part_svc); -my %num_active_cust_svc = map { $_->svcpart => $_->num_cust_svc } @part_svc; - -if ( $cgi->param('orderby') eq 'active' ) { +my %num_active_cust_svc = (); +if ( $cgi->param('active') ) { + my $active_sth = dbh->prepare( + 'SELECT COUNT(*) FROM cust_svc WHERE svcpart = ?' + ) or die dbh->errstr; + foreach my $part_svc ( @part_svc ) { + $active_sth->execute($part_svc->svcpart) or die $active_sth->errstr; + $num_active_cust_svc{$part_svc->svcpart} = + $active_sth->fetchrow_arrayref->[0]; + } @part_svc = sort { $num_active_cust_svc{$b->svcpart} <=> $num_active_cust_svc{$a->svcpart} } @part_svc; -} elsif ( $cgi->param('orderby') eq 'svc' ) { - @part_svc = sort { lc($a->svc) cmp lc($b->svc) } @part_svc; } %> @@ -55,23 +55,21 @@ function part_export_areyousure(href) { : do { $cgi->param('showdisabled', 1); '( <a href="'. $cgi->self_url. '">show disabled services</a> )'; } %> -<% $cgi->param('showdisabled', ( 1 ^ $cgi->param('showdisabled') ) ); %> <%= table() %> <TR> - <TH><A HREF="<%= do { $cgi->param('orderby', 'svcpart'); $cgi->self_url } %>">#</A></TH> - <% if ( $cgi->param('showdisabled') ) { %> - <TH>Status</TH> - <% } %> - <TH><A HREF="<%= do { $cgi->param('orderby', 'svc'); $cgi->self_url; } %>">Service</A></TH> + <TH COLSPAN=<%= $cgi->param('showdisabled') ? 2 : 3 %>>Service</TH> <TH>Table</TH> - <TH><A HREF="<%= do { $cgi->param('orderby', 'active'); $cgi->self_url; } %>"><FONT SIZE=-1>Customer<BR>Services</FONT></A></TH> +<% if ( $cgi->param('active') ) { %> + <TH><FONT SIZE=-1>Customer<BR>Services</FONT></TH> +<% } %> <TH>Export</TH> <TH>Field</TH> <TH COLSPAN=2>Modifier</TH> </TR> <% foreach my $part_svc ( @part_svc ) { - my $svcdb = $part_svc->svcdb; + my $hashref = $part_svc->hashref; + my $svcdb = $hashref->{svcdb}; my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } ); my @dfields = $svc_x->fields; push @dfields, 'usergroup' if $svcdb eq 'svc_acct'; #kludge @@ -80,30 +78,25 @@ function part_export_areyousure(href) { or $_ ne 'svcnum' && $part_svc->part_svc_column($_)->columnflag } @dfields ; my $rowspan = scalar(@fields) || 1; - my $url = "${p}edit/part_svc.cgi?". $part_svc->svcpart; + my $url = "${p}edit/part_svc.cgi?$hashref->{svcpart}"; %> <TR> <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>"> - <%= $part_svc->svcpart %></A></TD> -<% if ( $cgi->param('showdisabled') ) { %> + <%= $hashref->{svcpart} %></A></TD> +<% unless ( $cgi->param('showdisabled') ) { %> <TD ROWSPAN=<%= $rowspan %>> - <%= $part_svc->disabled - ? '<FONT COLOR="#FF0000"><B>Disabled</B></FONT>' - : '<FONT COLOR="#00CC00"><B>Enabled</B></FONT>' - %> - </TD> + <%= $hashref->{disabled} ? 'DISABLED' : '' %></TD> <% } %> <TD ROWSPAN=<%= $rowspan %>><A HREF="<%= $url %>"> - <%= $part_svc->svc %></A></TD> + <%= $hashref->{svc} %></A></TD> <TD ROWSPAN=<%= $rowspan %>> - <%= $svcdb %></TD> + <%= $hashref->{svcdb} %></TD> +<% if ( $cgi->param('active') ) { %> <TD ROWSPAN=<%= $rowspan %>> - <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$part_svc->svcpart} %></B></FONT> <A HREF="<%=$p%>search/<%= $svcdb %>.cgi?svcpart=<%= $part_svc->svcpart %>">active</A> - <% if ( $num_active_cust_svc{$part_svc->svcpart} ) { %> - <BR><FONT SIZE="-1">[ <A HREF="<%=$p%>edit/bulk-cust_svc.html?svcpart=<%= $part_svc->svcpart %>">change</A> ]</FONT> - <% } %> + <FONT COLOR="#00CC00"><B><%= $num_active_cust_svc{$hashref->{svcpart}} %></B></FONT> <A HREF="<%=$p%>search/<%= $hashref->{svcdb} %>.cgi?svcpart=<%= $hashref->{svcpart} %>">active</A> </TD> +<% } %> <TD ROWSPAN=<%= $rowspan %>><%= itable() %> <% # my @part_export = @@ -122,11 +115,14 @@ map { qsearchs('part_export', { exportnum => $_->exportnum } ) } qsearch('export foreach my $field ( @fields ) { my $flag = $part_svc->part_svc_column($field)->columnflag; %> - <%= $n1 %> - <TD><%= $field %></TD> - <TD><%= $flag{$flag} %></TD> - <TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD> + <%= $n1 %><TD><%= $field %></TD><TD> +<% if ( $flag eq "D" ) { print "Default"; } + elsif ( $flag eq "F" ) { print "Fixed"; } + elsif ( not $flag ) { } + else { print "(Unknown!)"; } +%> + </TD><TD><%= $part_svc->part_svc_column($field)->columnvalue%></TD> <% $n1="</TR><TR>"; } %> diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html deleted file mode 100644 index bb7f31514..000000000 --- a/httemplate/browse/payment_gateway.html +++ /dev/null @@ -1,70 +0,0 @@ -<% - - my %search; - if ( $cgi->param('showdisabled') ) { - %search = (); - } else { - %search = ( 'disabled' => '' ); - } - -%> -<%= header('Payment gateways', menubar( - 'Main Menu' => $p, - 'Agents' => $p. 'browse/agent.cgi', -)) %> - -<A HREF="<%= $p %>edit/payment_gateway.html"><I>Add a new payment gateway</I></A><BR><BR> - -<%= $cgi->param('showdisabled') - ? do { $cgi->param('showdisabled', 0); - '( <a href="'. $cgi->self_url. '">hide disabled gateways</a> )'; } - : do { $cgi->param('showdisabled', 1); - '( <a href="'. $cgi->self_url. '">show disabled gateways</a> )'; } -%> - -<%= table() %> -<TR> - <TH COLSPAN=<%= $cgi->param('showdisabled') ? 1 : 2 %>>#</TH> - <TH>Gateway</TH> - <TH>Username</TH> - <TH>Password</TH> - <TH>Action</TH> - <TH>Options</TH> -</TR> - -<% foreach my $payment_gateway ( qsearch( 'payment_gateway', \%search ) ) { %> - - <TR> - <TD><%= $payment_gateway->gatewaynum %></TD> - <% if ( !$cgi->param('showdisabled') ) { %> - <TD><%= $payment_gateway->disabled ? 'DISABLED' : '' %></TD> - <% } %> - <TD><%= $payment_gateway->gateway_module %> - <%= !$payment_gateway->disabled - ? '<FONT SIZE="-1"> <A HREF="misc/disable-payment_gateway.cgi?'. $payment_gateway->gatewaynum.'">(disable)</A></FONT>' - : '' - %> - </TD> - <TD><%= $payment_gateway->gateway_username %></TD> - <TD> - </TD> - <TD><%= $payment_gateway->gateway_action %></TD> - <TD> - <TABLE CELLSPACING=0 CELLPADDING=0> - <% my %options = $payment_gateway->options; - foreach my $option ( keys %options ) { - %> - <TR> - <TH><%= $option %>:</TH> - <TD><%= $options{$option} %></TD> - </TR> - <% } %> - </TABLE> - </TD> - </TR> - -<% } %> - -</TABLE> -</BODY> -</HTML> - |