'Exp',
'Amount',
'Status',
+ '', # delete link
'', # error_message
],
'fields' => [ 'paybatchnum',
sprintf('%.02f', $_[0]->amount)
},
'status',
+ $sub_unbatch,
'error_message',
],
- 'align' => 'rrrlllcrll',
+ 'align' => 'rrrlllcrlll',
'links' => [ '',
["${p}view/cust_bill.cgi?", 'invnum'],
(["${p}view/cust_main.cgi?", 'custnum']) x 2,
}
if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) {
- push @search, "custnum = $1";
+ push @search, "cust_pay_batch.custnum = $1";
}
if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) {
}
if ( not $cgi->param('dcln') ) {
- push @search, "cpb.status IS DISTINCT FROM 'Approved'";
+ push @search, "cust_pay_batch.status IS DISTINCT FROM 'Approved'";
}
my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
my $search = ' WHERE ' . join(' AND ', @search);
-$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
+$count_query = 'SELECT COUNT(*) FROM cust_pay_batch ' .
'LEFT JOIN cust_main USING ( custnum ) ' .
'LEFT JOIN pay_batch USING ( batchnum )' .
$search;
'hashref' => {},
'addl_from' => 'LEFT JOIN pay_batch USING ( batchnum ) '.
'LEFT JOIN cust_main USING ( custnum ) '.
-
'LEFT JOIN cust_pay USING ( batchnum, custnum ) ',
'extra_sql' => $search,
'order_by' => "ORDER BY $orderby",
);
};
+my $sub_unbatch = '';
+if ( ($pay_batch && ($pay_batch->status eq 'O'))
+ && ( $curuser->access_right('Process batches')
+ || $curuser->access_right('Process global batches') )
+) {
+ $sub_unbatch = sub {
+ my $self = shift;
+ return '' if $self->status; # sanity check, shouldn't happen
+ my $batchnum = $self->batchnum;
+ my $paybatchnum = $self->paybatchnum;
+ my $out = <<EOF;
+<FORM name="delete_cust_pay_batch_$paybatchnum">
+<INPUT TYPE="hidden" name="paybatchnum" value="$paybatchnum">
+</FORM>
+EOF
+ $out .= include('/elements/progress-init.html',
+ "delete_cust_pay_batch_$paybatchnum",
+ [ 'paybatchnum' ],
+ $p.'misc/process/delete-cust_pay_batch.cgi',
+ $p.'search/cust_pay_batch.cgi?' . $cgi->query_string,
+ "paybatchnum$paybatchnum",
+ );
+ my $onclick = 'if ( confirm(\'';
+ $onclick .= emt('Are you sure you want to delete batch payment ') . $self->paybatchnum;
+ $onclick .= emt(' from payment batch ') . $self->batchnum;
+ $onclick .= '\') ) { paybatchnum' . $paybatchnum . 'process() }';
+ return $out . '<A HREF="javascript:void(0)" ONCLICK="' . $onclick . '">delete</A>';
+ };
+}
+
my $html_init = '';
if ( $pay_batch ) {
$html_init = include('elements/cust_pay_batch_top.html',