diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/index.html | 1 | ||||
| -rw-r--r-- | httemplate/misc/email_invoice_events.cgi | 6 | ||||
| -rw-r--r-- | httemplate/misc/email_invoices.cgi | 2 | ||||
| -rw-r--r-- | httemplate/misc/fax_invoice_events.cgi | 6 | ||||
| -rw-r--r-- | httemplate/misc/fax_invoices.cgi | 2 | ||||
| -rw-r--r-- | httemplate/misc/print_invoice_events.cgi | 6 | ||||
| -rw-r--r-- | httemplate/misc/print_invoices.cgi | 2 | ||||
| -rwxr-xr-x | httemplate/search/cust_bill.html | 152 | ||||
| -rw-r--r-- | httemplate/search/cust_bill_event.cgi | 2 | ||||
| -rw-r--r-- | httemplate/search/report_cust_bill.html | 60 |
10 files changed, 204 insertions, 35 deletions
diff --git a/httemplate/index.html b/httemplate/index.html index d70c32a44..167cd6f7b 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -136,6 +136,7 @@ <LI>120 day open invoices (<A HREF="search/cust_bill.html?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.html?OPEN120_custnum">by customer number</A>) <LI>all invoices (<A HREF="search/cust_bill.html?invnum">by invoice number</A>) (<A HREF="search/cust_bill.html?date">by date</A>) (<A HREF="search/cust_bill.html?custnum">by customer number</A>) </UL> + <A HREF="search/report_cust_bill.html">Advanced invoice reports</A><BR><BR> Invoice event reports <UL> <LI><a href="search/cust_bill_event.html">All invoice events for a date range</a> diff --git a/httemplate/misc/email_invoice_events.cgi b/httemplate/misc/email_invoice_events.cgi new file mode 100644 index 000000000..12d58d608 --- /dev/null +++ b/httemplate/misc/email_invoice_events.cgi @@ -0,0 +1,6 @@ +<% + +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail'; +$server->process; + +%> diff --git a/httemplate/misc/email_invoices.cgi b/httemplate/misc/email_invoices.cgi index 12d58d608..0a3978395 100644 --- a/httemplate/misc/email_invoices.cgi +++ b/httemplate/misc/email_invoices.cgi @@ -1,6 +1,6 @@ <% -my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reemail'; +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reemail'; $server->process; %> diff --git a/httemplate/misc/fax_invoice_events.cgi b/httemplate/misc/fax_invoice_events.cgi new file mode 100644 index 000000000..a8ded0550 --- /dev/null +++ b/httemplate/misc/fax_invoice_events.cgi @@ -0,0 +1,6 @@ +<% + +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax'; +$server->process; + +%> diff --git a/httemplate/misc/fax_invoices.cgi b/httemplate/misc/fax_invoices.cgi index a8ded0550..f16ba8b5e 100644 --- a/httemplate/misc/fax_invoices.cgi +++ b/httemplate/misc/fax_invoices.cgi @@ -1,6 +1,6 @@ <% -my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_refax'; +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_refax'; $server->process; %> diff --git a/httemplate/misc/print_invoice_events.cgi b/httemplate/misc/print_invoice_events.cgi new file mode 100644 index 000000000..c6a7885a4 --- /dev/null +++ b/httemplate/misc/print_invoice_events.cgi @@ -0,0 +1,6 @@ +<% + +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint'; +$server->process; + +%> diff --git a/httemplate/misc/print_invoices.cgi b/httemplate/misc/print_invoices.cgi index c6a7885a4..d7b271c37 100644 --- a/httemplate/misc/print_invoices.cgi +++ b/httemplate/misc/print_invoices.cgi @@ -1,6 +1,6 @@ <% -my $server = new FS::UI::Web::JSRPC 'FS::cust_bill_event::process_reprint'; +my $server = new FS::UI::Web::JSRPC 'FS::cust_bill::process_reprint'; $server->process; %> diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html index c41befa41..33967e935 100755 --- a/httemplate/search/cust_bill.html +++ b/httemplate/search/cust_bill.html @@ -1,52 +1,105 @@ <% my( $count_query, $sql_query ); - if ( $cgi->param('begin') || $cgi->param('end') || $cgi->keywords ) { - - my $owed = - "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay - WHERE cust_bill_pay.invnum = cust_bill.invnum ) - - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill - WHERE cust_credit_bill.invnum = cust_bill.invnum )"; + my( $count_addl ) = ( '' ); + my( $distinct ) = ( '' ); + my($begin, $end) = ( '', '' ); + my($agentnum) = ( '' ); + my($open, $days) = ( '', '' ); + if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) { + $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2"; + $sql_query = { + 'table' => 'cust_bill', + 'hashref' => { 'invnum' => $2 }, + #'select' => '*', + }; + } else { + #if ( $cgi->param('begin') || $cgi->param('end') + # || $cgi->param('beginning') || $cgi->param('ending') + # || $cgi->keywords + # ) + #{ my @where; my $orderby = 'ORDER BY cust_bill._date'; + if ( $cgi->param('beginning') + && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) { + $begin = str2time($1); + push @where, "cust_bill._date >= $begin"; + } + if ( $cgi->param('ending') + && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) { + $end = str2time($1) + 86399; + push @where, "cust_bill._date < $end"; + } + if ( $cgi->param('begin') =~ /^(\d+)$/ ) { - push @where, "cust_bill._date >= $1", + $begin = $1; + push @where, "cust_bill._date >= $begin"; } if ( $cgi->param('end') =~ /^(\d+)$/ ) { - push @where, "cust_bill._date < $1", + $end = $1; + push @where, "cust_bill._date < $end"; + } + + if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { + $agentnum = $1; + push @where, "cust_main.agentnum = $agentnum"; + } + + my $owed = + "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay + WHERE cust_bill_pay.invnum = cust_bill.invnum ) + - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill + WHERE cust_credit_bill.invnum = cust_bill.invnum )"; + + if ( $cgi->param('open') ) { + push @where, "0 != $owed"; + $open = 1; } my($query) = $cgi->keywords; if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) { - my($open, $days, $field) = ($1, $2, $3); + ($open, $days, my $field) = ($1, $2, $3); $field = "_date" if $field eq 'date'; $orderby = "ORDER BY cust_bill.$field"; push @where, "0 != $owed" if $open; push @where, "cust_bill._date < ". (time-86400*$days) if $days; } - + my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : ''; + + my $addl_from = 'left join cust_main using ( custnum )'; + + if ( $cgi->param('newest_percust') ) { + $distinct = 'DISTINCT ON ( cust_bill.custnum )'; + $orderby = 'ORDER BY cust_bill.custnum ASC, cust_bill._date DESC'; + #$count_query = "SELECT 'N/A', 'N/A', 'N/A'"; #XXXXXXX fix + $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'"; + } - $count_query = "SELECT COUNT(*), sum(charged), sum($owed) - FROM cust_bill $extra_sql"; + unless ( $count_query ) { + $count_query = "SELECT COUNT(*), sum(charged), sum($owed)"; + $count_addl = [ '$%.2f total invoiced', + '$%.2f total outstanding balance', + ]; + } + $count_query .= " FROM cust_bill $addl_from $extra_sql"; $sql_query = { 'table' => 'cust_bill', + 'addl_from' => $addl_from, 'hashref' => {}, - 'select' => "cust_bill.*, $owed as owed", + 'select' => "$distinct ". join(', ', + 'cust_bill.*', + #( map "cust_main.$_", qw(custnum last first company) ), + 'cust_main.custnum as cust_main_custnum', + ( map "cust_main.$_", qw(last first company) ), + "$owed as owed", + ), 'extra_sql' => "$extra_sql $orderby" }; - } else { - $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/; - $count_query = "SELECT COUNT(*) FROM cust_bill WHERE invnum = $2"; - $sql_query = { - 'table' => 'cust_bill', - 'hashref' => { 'invnum' => $2 }, - #'select' => '*', - }; } my $link = [ "${p}view/cust_bill.cgi?", 'invnum', ]; @@ -61,14 +114,44 @@ my $conf = new FS::Conf; my $money_char = $conf->config('money_char') || '$'; + my $html_init = join("\n", map { + ( my $action = $_ ) =~ s/_$//; + include('/elements/progress-init.html', + $_.'form', + [ 'begin', 'end', 'agentnum', 'open', 'days' ], + "../misc/${_}invoices.cgi", + { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but... + $_, #key + ), + qq!<FORM NAME="${_}form">!, + qq!<INPUT TYPE="hidden" NAME="begin" VALUE="$begin">!, + qq!<INPUT TYPE="hidden" NAME="end" VALUE="$end">!, + qq!<INPUT TYPE="hidden" NAME="agentnum" VALUE="$agentnum">!, + qq!<INPUT TYPE="hidden" NAME="open" VALUE="$open">!, + qq!<INPUT TYPE="hidden" NAME="days" VALUE="$days">!, + qq!</FORM>! + } qw( print_ email_ fax_ ) ); + + my $menubar = [ + 'Main menu' => $p, + 'Print these invoices' => + "javascript:print_process()", + 'Email these invoices' => + "javascript:email_process()", + ]; + + push @$menubar, 'Fax these invoices' => + "javascript:fax_process()" + if $conf->exists('hylafax'); + %><%= include( 'elements/search.html', 'title' => 'Invoice Search Results', + 'html_init' => $html_init, + 'menubar' => $menubar, 'name' => 'invoices', 'query' => $sql_query, 'count_query' => $count_query, - 'count_addl' => [ '$%.2f total invoiced', - '$%.2f total outstanding balance', - ], + 'count_addl' => $count_addl, 'redirect' => $link, 'header' => [ 'Invoice #', qw(Balance Amount Date), 'Contact name', @@ -79,12 +162,19 @@ sub { sprintf($money_char.'%.2f', shift->charged ) }, sub { time2str('%b %d %Y', shift->_date ) }, sub { my $cust_bill = shift; - my $cust_main = $cust_bill->cust_main; - $cust_main - ? $cust_main->get('last'). ', '. $cust_main->first - : "WARNING: can't find cust_main.custnum ". - $cust_bill->custnum. ' (cust_bill.invnum '. - $cust_bill->invnum. ')'; + # my $cust_main = $cust_bill->cust_main; + # $cust_main + # ? $cust_main->get('last'). ', '. $cust_main->first + # : "WARNING: can't find cust_main.custnum ". + # $cust_bill->custnum. ' (cust_bill.invnum '. + # $cust_bill->invnum. ')'; + if ( $cust_bill->cust_main_custnum ) { + FS::cust_main::name($cust_bill); + } else { + "WARNING: can't find cust_main.custnum ". + $cust_bill->custnum. ' (cust_bill.invnum '. + $cust_bill->invnum. ')'; + } }, sub { my $cust_main = shift->cust_main; $cust_main ? $cust_main->company : ''; diff --git a/httemplate/search/cust_bill_event.cgi b/httemplate/search/cust_bill_event.cgi index 253aa78ad..f34bb68f4 100644 --- a/httemplate/search/cust_bill_event.cgi +++ b/httemplate/search/cust_bill_event.cgi @@ -47,7 +47,7 @@ my $html_init = join("\n", map { include('/elements/progress-init.html', $_.'form', [ 'action', 'beginning', 'ending', 'failed' ], - "../misc/${_}invoices.cgi", + "../misc/${_}invoice_events.cgi", { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but... $_, #key ), diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html new file mode 100644 index 000000000..0f6e6814e --- /dev/null +++ b/httemplate/search/report_cust_bill.html @@ -0,0 +1,60 @@ + <HEAD> + <TITLE>Invoice report criteria</TITLE> + <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2"> + <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT> + <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT> + <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT> + </HEAD> + <BODY BGCOLOR="#e8e8e8"> + <H1>Invoice report criteria</H1> + <FORM ACTION="cust_bill.html" METHOD="GET"> + <INPUT TYPE="hidden" NAME="magic" VALUE="_date"> + <TABLE> + <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"> + Calendar.setup({ + inputField: "beginning_text", + ifFormat: "%m/%d/%Y", + button: "beginning_button", + align: "BR" + }); +</SCRIPT> + </TR> + <TR> + <TD ALIGN="right">To: </TD> + <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD> +<SCRIPT TYPE="text/javascript"> + Calendar.setup({ + inputField: "ending_text", + ifFormat: "%m/%d/%Y", + button: "ending_button", + align: "BR" + }); +</SCRIPT> + </TR> + <TR> + <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD> + <TD>Show only open invoices</TD> + </TR> + <TR> + <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD> + <TD>Show only the single most recent invoice per-customer</TD> + </TR> + </TABLE> + <BR><INPUT TYPE="submit" VALUE="Get Report"> + </FORM> + </BODY> +</HTML> + |