- lots of RT integration, integrated RT upgraded to 3.2.2
- one-time referral credits
- invoices now use history records (don't lose details)
-- option to credit for remaining service upon cancel (peter bowen)
+- option to credit for remaining service upon package cancel/change
+ (peter bowen)
- one-time registration codes
- "selfservice_server-session_module" config value can be set to
"Cache::FileCache" on FreeBSD or elsewhere IPC::ShareLite has trouble.
+- package changes don't re-charge setup fee
+- per-agent payment and credit reports
notyet (1.5.8?):
- account merging UI in exports (for example, to consolidate passwd files from
}
}
-=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, AS
+=item qsearch TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
Searches the database for all records matching (at least) the key/value pairs
in HASHREF. Returns all the records found as `FS::TABLE' objects if that
=cut
sub qsearch {
- my($stable, $record, $select, $extra_sql, $cache, $as ) = @_;
+ my($stable, $record, $select, $extra_sql, $cache, $addl_from ) = @_;
#$stable =~ /^([\w\_]+)$/ or die "Illegal table: $table";
#for jsearch
$stable =~ /^([\w\s\(\)\.\,\=]+)$/ or die "Illegal table: $stable";
}
my $statement = "SELECT $select FROM $stable";
- $statement .= " AS $as" if $as;
+ $statement .= " $addl_from" if $addl_from;
if ( @real_fields or @virtual_fields ) {
$statement .= ' WHERE '. join(' AND ',
( map {
);
}
-=item qsearchs TABLE, HASHREF
+=item qsearchs TABLE, HASHREF, SELECT, EXTRA_SQL, CACHE_OBJ, ADDL_FROM
Same as qsearch, except that if more than one record matches, it B<carp>s but
returns the first. If this happens, you either made a logic error in asking
'',
- 'maintable',
+ 'AS maintable',
);
}
<TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
<TH>Type</TH>
<TH>Customers</TH>
+ <TH>Reports</TH>
<TH>Registration Codes</TH>
<TH><FONT SIZE=-1>Freq.</FONT></TH>
<TH><FONT SIZE=-1>Prog.</FONT></TH>
<TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
<%= $agent->agent %></A></TD>
<TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
+
<TD>
<B>
<% if ( $num_cancel ) { %>
<A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
</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>
+
+ </TD>
+
<TD>
<%= my $num_reg_code = $agent->num_reg_code %>
<% if ( $num_reg_code ) { %>
<A HREF="<%=$p%>search/reg_code.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_reg_code ) { %></A><% } %>
<BR><A HREF="<%=$p%>edit/reg_code.cgi?agentnum=<%= $agent->agentnum %>">Generate codes</A>
</TD>
+
<TD><%= $agent->freq %></TD>
<TD><%= $agent->prog %></TD>
+
</TR>
<% } %>
<%
+ my $title = 'Credit Search Results';
#my( $count_query, $sql_query );
my @search = ();
push @search, "otaker = '$1'";
}
+ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+ my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+ die "unknown agentnum $1" unless $agent;
+ $title = $agent->agent. " $title";
+ }
+
#false laziness with cust_pkg.cgi and cust_pay.cgi
if ( $cgi->param('beginning')
&& $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
? 'WHERE '. join(' AND ', @search)
: '';
- my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
+ my $count_query = 'SELECT COUNT(*), SUM(amount) '.
+ 'FROM cust_credit JOIN cust_main USING ( custnum ) '.
+ $where;
+
my $sql_query = {
'table' => 'cust_credit',
'hashref' => {},
'extra_sql' => $where,
+ 'addl_from' => 'JOIN cust_main USING ( custnum )',
};
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
%>
<%= include( 'elements/search.html',
- 'title' => 'Credit Search Results',
+ 'title' => $title,
'name' => 'credits',
'query' => $sql_query,
'count_query' => $count_query,
sub { sprintf('$%.2f', shift->amount ) },
sub { time2str('%b %d %Y', shift->_date ) },
'custnum',
- sub { my $cust_main = shift->cust_main;
- $cust_main->get('last'). ', '. $cust_main->first;
- },
- sub { my $cust_main = shift->cust_main;
- $cust_main->company;
- },
+ sub { $_[0]->get('last'). ', '. $_[0]->first; },
+ 'company',
'otaker',
'reason',
],
<%
+ my $title = 'Payment Search Results';
my( $count_query, $sql_query );
if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
- my %search;
- my @search;
+ my %search = ();
+ my @search = ();
+
+ if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+ my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+ die "unknown agentnum $1" unless $agent;
+ $title = $agent->agent. " $title";
+ }
if ( $cgi->param('payby') ) {
$cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
}
my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
- $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+ $count_query = "SELECT COUNT(*), SUM(paid) ".
+ "FROM cust_pay JOIN cust_main USING ( custnum )".
( $hsearch ? " WHERE $hsearch " : '' ).
$search;
+ warn join('-', keys %search);
$sql_query = {
'table' => 'cust_pay',
'hashref' => \%search,
'extra_sql' => "$search ORDER BY _date",
+ 'addl_from' => 'JOIN cust_main USING ( custnum )',
};
} else {
%>
<%= include( 'elements/search.html',
- 'title' => 'Payment Search Results',
+ 'title' => $title,
'name' => 'payments',
'query' => $sql_query,
'count_query' => $count_query,
sub { sprintf('$%.2f', shift->paid ) },
sub { time2str('%b %d %Y', shift->_date ) },
'custnum',
- sub { my $cust_main = shift->cust_main;
- $cust_main->get('last'). ', '. $cust_main->first;
- },
- sub { my $cust_main = shift->cust_main;
- $cust_main->company;
- },
+ sub { $_[0]->get('last'). ', '. $_[0]->first; },
+ 'company',
],
'align' => 'lrrrll',
'links' => [
$opt{align} = [ map $align{$_}, split(//, $opt{align}) ],
unless !$opt{align} || ref($opt{align});
- if ( ref($opt{'query'}) ) {
-
- }
+ #if ( ref($opt{'query'}) ) {
+ #
+ #}
unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
( $opt{'count_query'} = $opt{'query'} ) =~
$opt{'query'}->{'hashref'} || {},
$opt{'query'}->{'select'},
$opt{'query'}->{'extra_sql'}. " $limit",
+ '',
+ (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
) ];
} else {
my $sth = dbh->prepare("$opt{'query'} $limit")
</TD>
</TR>
<TR>
+ <TD ALIGN="right">for agent: </TD>
+ <TD><SELECT NAME="agentnum">
+ <OPTION VALUE="">all</OPTION>
+ <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
+ <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
+ <% } %>
+ </SELECT>
+ </TD>
+ </TR>
+ <TR>
<TD ALIGN="right">From: </TD>
<TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
<SCRIPT TYPE="text/javascript">
</TD>
</TR>
<TR>
+ <TD ALIGN="right">for agent: </TD>
+ <TD><SELECT NAME="agentnum">
+ <OPTION VALUE="">all</OPTION>
+ <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
+ <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
+ <% } %>
+ </SELECT>
+ </TD>
+ </TR>
+ <TR>
<TD ALIGN="right">From: </TD>
<TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
<SCRIPT TYPE="text/javascript">