X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fagent.cgi;h=3fe68c15d582fd959f1ed49a4e0958f6d8916afc;hp=3319c77b37037a5d2582a32986874297fe5e5a16;hb=f822e27a1e00594332ffa487a1c284234c5580a6;hpb=b19bf30f0d745d20e5e4f0a8e47ce16a04b02dd9 diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 3319c77b3..3fe68c15d 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -20,13 +20,12 @@ full offerings (via their type).

% my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; -% - param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent Type Master Customer + Commissions Access Groups Invoice
Template Customers @@ -34,18 +33,21 @@ full offerings (via their type).

Reports Registration
codes Prepaid cards -% if ( $conf->config('ticket_system') ) { +% if ( $conf->config('ticket_system') ) { Ticketing % } +% if ( $conf->config('currencies') ) { + Currencies +% } + Payment Gateway Overrides Configuration Overrides -% + %# Agent # %# Agent -% %foreach my $agent ( sort { % #$a->getfield('agentnum') <=> $b->getfield('agentnum') % $a->getfield('agent') cmp $b->getfield('agent') @@ -61,42 +63,89 @@ full offerings (via their type).

% } else { % $bgcolor = $bgcolor1; % } -% -% - +% ## +% # agentnum +% ## <% $agent->agentnum %> -% if ( dbdef->table('agent')->column('disabled') -% && !$cgi->param('showdisabled') ) { - - <% $agent->disabled ? 'DISABLED' : '' %> +% ## +% # disabled +% ## +% if ( ! $cgi->param('showdisabled') ) { + + <% $agent->disabled ? 'DISABLED' + : 'Active' + %> % } +% ## +% # agent +% ## <% $agent->agent %> +% ## +% # type +% ## <% $agent->agent_type->atype %> +% ## +% # master customer +% ## % if ( $agent->agent_custnum ) { - <% include('/elements/small_custview.html', - $agent->agent_custnum, - scalar($conf->config('countrydefault')), - 1, #show balance - ) - %> + <& /elements/small_custview.html, + $agent->agent_custnum, + scalar($conf->config('countrydefault')), + 1, #show balance + $p.'view/cust_main.cgi', + &> % } +% ## +% # commissions +% ## + + + + + +% #surprising amount of false laziness w/ edit/process/agent.cgi +% my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); +% foreach my $pkg_class ( '', @pkg_class ) { +% my %agent_pkg_class = ( 'agentnum' => $agent->agentnum, +% 'classnum' => $pkg_class ? $pkg_class->classnum : '' +% ); +% my $agent_pkg_class = +% qsearchs( 'agent_pkg_class', \%agent_pkg_class ) +% || new FS::agent_pkg_class \%agent_pkg_class; +% my $param = 'classnum'. $agent_pkg_class{classnum}; + + + + + + +% } + +
<% $agent_pkg_class->commission_percent || 0 %>%<% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %> +
+ + + +% ## +% # access groups +% ## % foreach my $access_group ( % map $_->access_group, @@ -106,211 +155,127 @@ full offerings (via their type).

% } +% ## +% # invoice template +% ## <% $agent->invoice_template || '(Default)' %> +% ## +% # customers +% ## + - - - - - - - - - +% my $num = 0; +% unless ( $disable_counts ) { + +% } + - - - - - - - - - - - - - - - - +% }
- - <% my $num_prospect = $agent->num_prospect_cust_main %>  - - -% if ( $num_prospect ) { - - -% } -prospects -% if ($num_prospect ) { - -% } - - -
- - <% my $num_inactive = $agent->num_inactive_cust_main %>  - - -% if ( $num_inactive ) { +% my @cust_status = +% qw( prospect inactive ordered active suspended cancelled ); +% my %method = ( 'suspended' => 'susp', +% 'cancelled' => 'cancel' +% ); +% my %PL = ( 'prospect' => 'prospects', ); +% my %link = ( 'cancelled' => 'showcancelledcustomers=1&cancelled' ); +% my $statuscolor = FS::cust_main->statuscolors; +% +% foreach my $status ( @cust_status ) { +% my $meth = exists($method{$status}) ? $method{$status} : $status; +% $meth = 'num_'. $meth. '_cust_main'; +% my $link = exists($link{$status}) ? $link{$status} : $status; - +
+ + <% $num = $agent->$meth() %>  + + +% if ( $num || $disable_counts ) { +% + + "> % } -inactive -% if ( $num_inactive ) { +<% exists($PL{$status}) ? $PL{$status} : $status %> +% if ($num || $disable_counts ) { % } -
- - <% my $num_active = $agent->num_active_cust_main %>  - - -% if ( $num_active ) { - - -% } -active -% if ( $num_active ) { - -% } - -
- - <% my $num_susp = $agent->num_susp_cust_main %>  - - -% if ( $num_susp ) { - - -% } -suspended -% if ( $num_susp ) { - -% } - -
- - <% my $num_cancel = $agent->num_cancel_cust_main %>  - - -% if ( $num_cancel ) { - - -% } -cancelled -% if ( $num_cancel ) { - -% } - -
+% ## +% # customer packages +% ## + - - - - - - - - - - - +% #my @pkg_status = FS::cust_pkg->statuses; +% my @pkg_status = ( 'on hold', 'one-time charge', 'not yet billed', +% qw( active suspended cancelled ) ); +% my %method = ( 'one-time charge' => 'inactive', +% 'suspended' => 'susp', +% 'cancelled' => 'cancel', +% ); +% my $statuscolor = FS::cust_pkg->statuscolors; +% +% foreach my $status ( @pkg_status ) { +% my $magic = exists($method{$status}) ? $method{$status} : $status; +% $magic =~ s/ /_/g; +% my $meth = 'num_'. $magic. '_cust_pkg'; +% ( my $label = $status ) =~ s/ / /g; - - +% my $num = 0; +% unless ( $disable_counts ) { + +% } - - - - - - - +% }
- - <% my $num_inactive_pkg = $agent->num_inactive_cust_pkg %>  - - -% if ( $num_inactive_pkg ) { - - -% } -inactive -% if ( $num_inactive_pkg ) { - -% } - -
- - <% my $num_active_pkg = $agent->num_active_cust_pkg %>  - - -% if ( $num_active_pkg ) { - - -% } -active -% if ( $num_active_pkg ) { - -% } - -
- - <% my $num_susp_pkg = $agent->num_susp_cust_pkg %>  - +
+ + <% $num = $agent->$meth() %>  + + -% if ( $num_susp_pkg ) { +% if ( $num || $disable_counts ) { - + % } -suspended -% if ( $num_susp_pkg ) { +<% $label %> +% if ( $num || $disable_counts ) { % }
- - <% my $num_cancel_pkg = $agent->num_cancel_cust_pkg %>  - - -% if ( $num_cancel_pkg ) { - - -% } -cancelled -% if ( $num_cancel_pkg ) { - -% } -
+% ## +% # reports +% ## Package Churn
Payments
Credits
A/R Aging - +% ## +% # registration codes +% ## + <% my $num_reg_code = $agent->num_reg_code %> % if ( $num_reg_code ) { @@ -325,6 +290,10 @@ Unused
Generate codes +% ## +% # prepaid cards +% ## + <% my $num_prepay_credit = $agent->num_prepay_credit %> % if ( $num_prepay_credit ) { @@ -338,18 +307,32 @@ Unused
Generate cards -% if ( $conf->config('ticket_system') ) { - +% ## +% # ticketing +% ## +% if ( $conf->config('ticket_system') ) { -% if ( $agent->ticketing_queueid ) { - - Queue: <% $agent->ticketing_queueid %>: <% $agent->ticketing_queue %>
+% if ( $agent->ticketing_queueid ) { + Queue: <% $agent->ticketing_queueid %>: + <% $agent->ticketing_queue %> +
+% } + % } +% ## +% # currencies +% ## +% if ( $conf->config('currencies') ) { + + <% join('
', sort keys %{ $agent->agent_currency_hashref } ) %> % } +% ## +% # payment gateway overrides +% ## @@ -377,6 +360,10 @@ Unused
+% ## +% # configuration overrides +% ## + % foreach my $override ( @@ -426,5 +413,6 @@ if ( $cgi->param('showdisabled') } my $conf = new FS::Conf; +my $disable_counts = $conf->exists('agent-disable_counts');