freeside/httemplate/search cust_credit.html,NONE,1.1 report_cust_credit.html,1.1,1.2 cust_bill.html,1.3,1.4 cust_pay.cgi,1.10,1.11
ivan
ivan at pouncequick.420.am
Fri Apr 23 05:19:44 PDT 2004
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory pouncequick:/tmp/cvs-serv28951/httemplate/search
Modified Files:
report_cust_credit.html cust_bill.html cust_pay.cgi
Added Files:
cust_credit.html
Log Message:
credit report, add some links to sales/credits/receipts summary, move payment search to template
Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cust_bill.html 23 Apr 2004 02:32:37 -0000 1.3
+++ cust_bill.html 23 Apr 2004 12:19:40 -0000 1.4
@@ -1,22 +1,30 @@
<%
my( $count_query, $sql_query );
- if ( $cgi->keywords ) {
- my($query) = $cgi->keywords;
+ 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 @where;
- my $orderby = '';
+ my $orderby = 'ORDER BY cust_bill._date';
+
+ if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
+ push @where, "cust_bill._date >= $1",
+ }
+ if ( $cgi->param('end') =~ /^(\d+)$/ ) {
+ push @where, "cust_bill._date < $1",
+ }
+
+ my($query) = $cgi->keywords;
if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
my($open, $days, $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;
- } else {
- die "unknown query string $query";
}
my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
@@ -50,12 +58,13 @@
'name' => 'invoices',
'query' => $sql_query,
'count_query' => $count_query,
- 'count_addl' => [ '$%.2f total amount',
+ 'count_addl' => [ '$%.2f total invoiced',
'$%.2f total outstanding balance',
],
'redirect' => $link,
'header' =>
- [ '', qw(Balance Amount Date ), 'Contact name', 'Company' ],
+ [ 'Invoice #', qw(Balance Amount Date), 'Contact name',
+ 'Company' ],
'fields' => [
'invnum',
sub { sprintf('$%.2f', shift->get('owed') ) },
Index: cust_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay.cgi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cust_pay.cgi 21 Jan 2004 00:04:07 -0000 1.10
+++ cust_pay.cgi 23 Apr 2004 12:19:40 -0000 1.11
@@ -1,185 +1,133 @@
<%
+ my( $count_query, $sql_query );
+ if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
+
+ my %search;
+ my @search;
+
+ if ( $cgi->param('payby') ) {
+ $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
+ or die "illegal payby ". $cgi->param('payby');
+ $search{'payby'} = $1;
+ if ( $3 ) {
+ if ( $3 eq 'VisaMC' ) {
+ #avoid posix regexes for portability
+ push @search, " ( substring(payinfo from 1 for 1) = '4' ".
+ " OR substring(payinfo from 1 for 2) = '51' ".
+ " OR substring(payinfo from 1 for 2) = '52' ".
+ " OR substring(payinfo from 1 for 2) = '53' ".
+ " OR substring(payinfo from 1 for 2) = '54' ".
+ " OR substring(payinfo from 1 for 2) = '54' ".
+ " OR substring(payinfo from 1 for 2) = '55' ".
+ " ) ";
+ } elsif ( $3 eq 'Amex' ) {
+ push @search, " ( substring(payinfo from 1 for 2 ) = '34' ".
+ " OR substring(payinfo from 1 for 2 ) = '37' ".
+ " ) ";
+ } elsif ( $3 eq 'Discover' ) {
+ push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+ } else {
+ die "unknown card type $3";
+ }
+ }
+ }
+
+ #false laziness with cust_pkg.cgi
+ if ( $cgi->param('beginning')
+ && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+ my $beginning = str2time($1);
+ push @search, "_date >= $beginning ";
+ }
+ if ( $cgi->param('ending')
+ && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+ my $ending = str2time($1) + 86399;
+ push @search, " _date <= $ending ";
+ }
+ if ( $cgi->param('begin')
+ && $cgi->param('begin') =~ /^(\d+)$/ ) {
+ push @search, "_date >= $1 ";
+ }
+ if ( $cgi->param('end')
+ && $cgi->param('end') =~ /^(\d+)$/ ) {
+ push @search, " _date < $1 ";
+ }
+
+ my $search;
+ if ( @search ) {
+ $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
+ join(' AND ', @search);
+ }
-my $sortby;
-my @cust_pay;
-if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
-
- my %search;
- my @search;
-
- if ( $cgi->param('payby') ) {
- $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
- or die "illegal payby ". $cgi->param('payby');
- $search{'payby'} = $1;
- if ( $3 ) {
- if ( $3 eq 'VisaMC' ) {
- #avoid posix regexes for portability
- push @search, " ( substring(payinfo from 1 for 1) = '4' ".
- " OR substring(payinfo from 1 for 2) = '51' ".
- " OR substring(payinfo from 1 for 2) = '52' ".
- " OR substring(payinfo from 1 for 2) = '53' ".
- " OR substring(payinfo from 1 for 2) = '54' ".
- " OR substring(payinfo from 1 for 2) = '54' ".
- " OR substring(payinfo from 1 for 2) = '55' ".
- " ) ";
- } elsif ( $3 eq 'Amex' ) {
- push @search, " ( substring(payinfo from 1 for 2 ) = '34' ".
- " OR substring(payinfo from 1 for 2 ) = '37' ".
- " ) ";
- } elsif ( $3 eq 'Discover' ) {
- push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
- } else {
- die "unknown card type $3";
- }
- }
- }
-
- #false laziness with cust_pkg.cgi
- if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $beginning = str2time($1);
- push @search, "_date >= $beginning ";
- }
- if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $ending = str2time($1) + 86399;
- push @search, " _date <= $ending ";
- }
- my $search;
- if ( @search ) {
- $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
- join(' AND ', @search);
- }
-
- @cust_pay = qsearch('cust_pay', \%search, '', $search );
-
- $sortby = \*date_sort;
-
-} else {
-
- $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
- my $payinfo = $1;
-
- $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
- my $payby = $1;
-
- @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
- 'payby' => $payby } );
- $sortby = \*date_sort;
+ my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
+ $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+ ( $hsearch ? " WHERE $hsearch " : '' ).
+ $search;
+
+ $sql_query = {
+ 'table' => 'cust_pay',
+ 'hashref' => \%search,
+ 'extra_sql' => "$search ORDER BY _date",
+ };
+
+ } else {
+
+ $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
+ my $payinfo = $1;
+
+ $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
+ my $payby = $1;
+
+ $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+ "WHERE payinfo = '$payinfo' AND payby = '$payby'";
+
+ $sql_query = {
+ 'table' => 'cust_pay',
+ 'hashref' => { 'payinfo' => $payinfo,
+ 'payby' => $payby },
+ 'extra_sql' => "ORDER BY _date",
+ };
+
+ }
-}
+ my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
-if (0) {
-#if ( scalar(@cust_pay) == 1 ) {
-# my $invnum = $cust_bill[0]->invnum;
-# print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum"); #redirect
-} elsif ( scalar(@cust_pay) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
- idiot("Payment not found.");
- #exit;
-} else {
- my $total = scalar(@cust_pay);
- my $s = $total > 1 ? 's' : '';
%>
-<!-- mason kludge -->
-<%
- print header("Payment Search Results", menubar(
- 'Main Menu', popurl(2)
- )), "$total matching payment$s found<BR>", &table(), <<END;
- <TR>
- <TH></TH>
- <TH>Amount</TH>
- <TH>Date</TH>
- <TH>Contact name</TH>
- <TH>Company</TH>
- </TR>
-END
-
- my(%saw, $cust_pay);
- my $tot_amount = 0;
- foreach my $cust_pay (
- sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
- ) {
- my($paynum, $custnum, $payby, $payinfo, $amount, $date ) = (
- $cust_pay->paynum,
- $cust_pay->custnum,
- $cust_pay->payby,
- $cust_pay->payinfo,
- sprintf("%.2f", $cust_pay->paid),
- $cust_pay->_date,
- );
- $tot_amount += $amount;
- my $pdate = time2str("%b %d %Y", $date);
-
- my $rowspan = 1;
-
- my $view = popurl(2). "view/cust_main.cgi?". $custnum.
- "#". $payby. $payinfo;
-
- my $payment_info;
- if ( $payby eq 'CARD' ) {
- $payment_info = 'Card #'. 'x'x(length($payinfo)-4).
- substr($payinfo,(length($payinfo)-4));
- } elsif ( $payby eq 'CHEK' ) {
- $payment_info = "E-check acct#$payinfo";
- } elsif ( $payby eq 'BILL' ) {
- $payment_info = "Check #$payinfo";
- } else {
- $payment_info = "$payby $payinfo";
- }
-
- print <<END;
- <TR>
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payment_info</FONT></A></TD>
- <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
- my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
- if ( $cust_main ) {
- #my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
- my ( $name, $company ) = (
- $cust_main->last. ', '. $cust_main->first,
- $cust_main->company,
- );
- print <<END;
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$name</FONT></A></TD>
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
-END
- } else {
- print <<END
- <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_pay.paynum $paynum)</TD>
-END
- }
-
- print "</TR>";
- }
-
- $tot_amount = sprintf("%.2f", $tot_amount);
- print '</TABLE><BR>'. table(). <<END;
- <TR>
- <TH>Total Amount</TH>
- <TD ALIGN="right">\$$tot_amount</TD>
- </TR>
- </TABLE>
- </BODY>
-</HTML>
-END
-
-}
-
-#
-
-#sub invnum_sort {
-# $a->invnum <=> $b->invnum;
-#}
-#
-#sub custnum_sort {
-# $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-#}
-
-sub date_sort {
- $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
+<%= include( 'elements/search.html',
+ 'title' => 'Payment Search Results',
+ 'name' => 'payments',
+ 'query' => $sql_query,
+ 'count_query' => $count_query,
+ 'count_addl' => [ '$%.2f total paid', ],
+ 'header' =>
+ [ qw(Payment Amount Date), 'Contact name', 'Company', ],
+ 'fields' => [
+ sub {
+ my $cust_pay = shift;
+ if ( $cust_pay->payby eq 'CARD' ) {
+ 'Card #'. $cust_pay->payinfo_masked;
+ } elsif ( $cust_pay->payby eq 'CHEK' ) {
+ 'E-check acct#'. $cust_pay->payinfo;
+ } elsif ( $cust_pay->payby eq 'BILL' ) {
+ 'Check #'. $cust_pay->payinfo;
+ } else {
+ $cust_pay->payby. ' '. $cust_pay->payinfo;
+ }
+ },
+ sub { sprintf('$%.2f', shift->paid ) },
+ sub { time2str('%b %d %Y', shift->_date ) },
+ sub { my $cust_main = shift->cust_main;
+ $cust_main->get('last'). ', '. $cust_main->first;
+ },
+ sub { my $cust_main = shift->cust_main;
+ $cust_main->company;
+ },
+ ],
+ 'links' => [
+ '',
+ '',
+ '',
+ $link,
+ $link,
+ ],
+ )
%>
Index: report_cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_credit.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report_cust_credit.html 22 Apr 2004 07:07:30 -0000 1.1
+++ report_cust_credit.html 23 Apr 2004 12:19:40 -0000 1.2
@@ -1,26 +1,29 @@
<HTML>
<HEAD>
- <TITLE>Payment report criteria</TITLE>
+ <TITLE>Credit 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>Payment report criteria</H1>
- <FORM ACTION="cust_pay.cgi" METHOD="post">
+ <H1>Credit report criteria</H1>
+ <FORM ACTION="cust_credit.html" METHOD="post">
<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
<TABLE>
<TR>
- <TD ALIGN="right">Payments of type: </TD>
- <TD><SELECT NAME="payby">
+ <TD ALIGN="right">Credits by employee: </TD>
+<%
+ my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_credit")
+ or die dbh->errstr;
+ $sth->execute or die $sth->errstr;
+ my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
+%>
+ <TD><SELECT NAME="otaker">
<OPTION VALUE="">all</OPTION>
- <OPTION VALUE="CARD">credit card (all)</OPTION>
- <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
- <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
- <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
- <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
- <OPTION VALUE="BILL">check / cash</OPTION>
+ <% foreach my $otaker ( @otakers ) { %>
+ <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
+ <% } %>
</SELECT>
</TD>
</TR>
--- NEW FILE: cust_credit.html ---
<%
#my( $count_query, $sql_query );
my @search = ();
if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
push @search, "otaker = '$1'";
}
#false laziness with cust_pkg.cgi and cust_pay.cgi
if ( $cgi->param('beginning')
&& $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
my $beginning = str2time($1);
push @search, "_date >= $beginning ";
}
if ( $cgi->param('ending')
&& $cgi->param('ending') =~ /^([ 0-9\-\/]{1,10})$/ ) {
my $ending = str2time($1) + 86399;
push @search, " _date <= $ending ";
}
if ( $cgi->param('begin')
&& $cgi->param('begin') =~ /^(\d+)$/ ) {
push @search, "_date >= $1 ";
}
if ( $cgi->param('end')
&& $cgi->param('end') =~ /^(\d+)$/ ) {
push @search, " _date < $1 ";
}
my $where = scalar(@search)
? 'WHERE '. join(' AND ', @search)
: '';
my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
my $sql_query = {
'table' => 'cust_credit',
'hashref' => {},
'extra_sql' => $where,
};
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
%>
<%= include( 'elements/search.html',
'title' => 'Credit Search Results',
'name' => 'credits',
'query' => $sql_query,
'count_query' => $count_query,
'count_addl' => [ '$%.2f total credited', ],
#'redirect' => $link,
'header' =>
[ qw(Amount Date), 'Contact name', qw(Company By Reason) ],
'fields' => [
#'crednum',
sub { sprintf('$%.2f', shift->amount ) },
sub { time2str('%b %d %Y', shift->_date ) },
sub { my $cust_main = shift->cust_main;
$cust_main->get('last'). ', '. $cust_main->first;
},
sub { my $cust_main = shift->cust_main;
$cust_main->company;
},
'otaker',
'reason',
],
'links' => [
'',
'',
$clink,
$clink,
'',
'',
],
)
%>
More information about the freeside-commits
mailing list