-<% include( 'elements/search.html',
+<& elements/search.html,
'title' => 'Payment Batches',
'name_singular' => 'batch',
'query' => { 'table' => 'pay_batch',
'hashref' => $hashref,
- 'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => 'ORDER BY batchnum DESC',
},
'count_query' => "$count_query $extra_sql",
+ 'agent_virt' => 1,
+ 'agent_null_right' => 'Process batches', #'Process global batches',
+ 'agent_pos' => 1,
'header' => [ 'Batch',
'Type',
'First Download',
'Last Upload',
- 'Item Count',
- 'Amount',
+ { label => 'Requested', colspan => 2 },
+ '',
+ { label => 'Paid', colspan => 2 },
+ '',
'Status',
],
- 'align' => 'rcllrrc',
+ 'header2' => [ '',
+ '',
+ '',
+ '',
+ '',
+ 'Items',
+ 'Amount',
+ 'Items',
+ 'Amount',
+ '',
+ ],
+ 'align' => 'rcllrrrrc',
'fields' => [ 'batchnum',
- sub {
- FS::payby->shortname(shift->payby);
- },
+ sub {
+ my $self = shift;
+ my $type = $self->type eq 'CREDIT' ? 'CREDIT' : '';
+ $type ." " . FS::payby->shortname($self->payby);
+ },
sub {
my $self = shift;
my $_date = $self->download;
if ( $_date ) {
time2str("%a %b %e %T %Y", $_date);
- } elsif ( $self->status eq 'O' ) {
- 'Download batch';
+ } elsif ( $self->status eq 'O' && $self->type eq 'CREDIT') {
+ 'Download credit batch';
+ } elsif ( $self->status eq 'O' && $self->type eq 'DEBIT') {
+ 'Download batch';
} else {
'';
}
}
},
sub {
- my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+ my $c = FS::cust_pay_batch->count('batchnum = '.$_[0]->batchnum);
+ $c || ''
+ },
+ sub {
+ my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
my $sth = dbh->prepare($st)
or die dbh->errstr. "doing $st";
$sth->execute
- or die "Error executing \"$st\": ". $sth->errstr;
- $sth->fetchrow_arrayref->[0];
- },
- sub {
- my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+ or die "Error executing \"$st\": ". $sth->errstr;
+ my $total = $sth->fetchrow_arrayref->[0];
+ $total ? $money_char.sprintf('%.2f',$total) : '';
+ },
+ sub {
+ my $c = FS::cust_pay->count('batchnum = '.$_[0]->batchnum);
+ $c || '';
+ },
+ sub {
+ my $st = "SELECT SUM(paid) from cust_pay WHERE batchnum=" . shift->batchnum;
my $sth = dbh->prepare($st)
- or die dbh->errstr. "doing $st";
+ or die dbh->errstr. "doing $st";
$sth->execute
- or die "Error executing \"$st\": ". $sth->errstr;
- $sth->fetchrow_arrayref->[0];
- },
+ or die "Error executing \"$st\": ". $sth->errstr;
+ my $total = $sth->fetchrow_arrayref->[0];
+ $total ? $money_char.sprintf('%.2f',$total) : '';
+ },
sub {
$statusmap{shift->status};
},
],
'links' => [
- $link,
+ '',
'',
- sub { shift->status eq 'O' ? $link : '' },
- sub { shift->status eq 'I' ? $link : '' },
+ sub { shift->status eq 'O' ? $cpb_link : '' },
+ sub { shift->status eq 'I' ? $cpb_link : '' },
+ $cpb_link,
+ $cpb_link,
+ $pay_link,
+ $pay_link,
],
'size' => [
'',
sub { shift->status eq 'O' ? "b" : '' },
sub { shift->status eq 'I' ? "b" : '' },
],
- )
-
-%>
+ 'html_init' => $html_init,
+ 'html_foot' => include('.upload_incoming'),
+&>
+<%def .upload_incoming>
+% if ( FS::payment_gateway->count("gateway_namespace = 'Business::BatchPayment' AND disabled IS NULL") > 0 ) {
+<& /elements/form-file_upload.html,
+ name => 'FileUpload',
+ action => $p.'misc/upload-batch.cgi',
+ num_files => 1,
+ fields => [ 'gatewaynum' ],
+ message => 'Incoming batch uploaded.',
+&>
+<BR>
+<BR>
+Upload incoming batch from gateway
+<& /elements/select-table.html,
+ table => 'payment_gateway',
+ field => 'gatewaynum',
+ name_col => 'label',
+ value_col => 'gatewaynum',
+ order_by => 'ORDER BY gatewaynum',
+ empty_label => ' ',
+ hashref =>
+ { 'gateway_namespace' => 'Business::BatchPayment',
+ 'disabled' => '' },
+&>
+<BR>
+<& '/elements/file-upload.html',
+ field => 'file',
+ label => 'Filename',
+ no_table => 1,
+&>
+<INPUT TYPE="submit" VALUE="Upload">
+</FORM>
+% }
+</%def>
<%init>
die "access denied"
my($begin, $end) = ( '', '' );
my @where;
-if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $begin = str2time($1);
- push @where, "download >= $begin";
-}
-if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $end = str2time($1) + 86399;
- push @where, "download < $end";
-}
+
+my($beginning,$ending) = FS::UI::Web::parse_beginning_ending($cgi);
+push @where, "( (download >= $beginning AND download <= $ending) ".
+ ' OR download IS NULL )';
my @status;
if ( $cgi->param('open') ) {
my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : '';
-my $link = [ "${p}search/cust_pay_batch.cgi?dcln=1;batchnum=", 'batchnum' ];
+my $cpb_link = [ "${p}search/cust_pay_batch.cgi?dcln=1;batchnum=", 'batchnum' ];
+my $pay_link = [ "${p}search/cust_pay.html?magic=batchnum;batchnum=", 'batchnum' ];
+
+my $resolved = $cgi->param('resolved') || 0;
+$cgi->param('resolved' => !$resolved);
+my $html_init = '<A HREF="' . $cgi->self_url . '"><I>'.
+ ($resolved ? 'Hide' : 'Show') . ' resolved batches</I></A><BR>';
+
+my $money_char = FS::Conf->new->config('money_char') || '$';
</%init>
projects / freeside.git / blobdiff