X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_refund.cgi;h=009ce7321c5565eaa0b4b5d45f280e19c0f3e15e;hb=05f43c12f97943e77bfb0d3ad253ccf7a38c0c0f;hp=e1975ed70ce8188556619f915121a457ac728991;hpb=386c1c45a7cb9e8ad93862d9aa2d59cdb4ed0d3a;p=freeside.git
diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi
index e1975ed70..009ce7321 100755
--- a/httemplate/edit/cust_refund.cgi
+++ b/httemplate/edit/cust_refund.cgi
@@ -34,7 +34,7 @@
% }
Payment
- <% ntable("#cccccc", 2) %>
+
Amount | $<% $cust_pay->paid %> |
@@ -44,9 +44,14 @@
Date | <% time2str($date_format, $cust_pay->_date) %> |
+% if ( $cust_payby ) {
- Method | <% $payby %> # <% $paymask %> |
+ Method |
+ <% $payby %> # <% $paymask %>
+
+ |
+% }
% unless ( $paydate || $cust_pay->payby ne 'CARD' ) { # possibly other reasons: i.e. card has since expired
@@ -85,7 +90,8 @@
Refund
-<% ntable("#cccccc", 2) %>
+
+
% }
-% elsif ($payby eq 'CHEK') {
+% elsif ($payby eq 'CHEK' || $payby eq 'CARD') {
%
+
% my @cust_payby = ();
% if ( $payby eq 'CARD' ) {
% @cust_payby = $cust_main->cust_payby('CARD','DCRD');
@@ -117,16 +137,58 @@
% my $custpaybynum = length(scalar($cgi->param('custpaybynum')))
% ? scalar($cgi->param('custpaybynum'))
% : scalar(@cust_payby) && $cust_payby[0]->custpaybynum;
-<& /elements/tr-select-cust_payby.html,
+
+% if ( !$cust_payby ) {
+ <& /elements/tr-select-cust_payby.html,
'cust_payby' => \@cust_payby,
'curr_value' => $custpaybynum,
'onchange' => 'cust_payby_changed(this)',
-&>
-
+ &>
+% }
+
+% if ($payby eq "CARD" || $payby eq "DCRD") {
+
+% }
+% elsif ( $conf->exists("batch-enable")
+% || grep $payby eq $_, $conf->config('batch-enable_payby')
+% ) {
+% if ( grep $payby eq $_, $conf->config('realtime-disable_payby') ) {
+
+% } else {
+
+ > |
+ <% mt('Add to current batch') |h %> |
+
+% }
+% }
+
+
+
+
+% if ( !$cust_payby ) {
+
+>
+
+
+ <& /elements/cust_payby_new.html,
+ 'cust_payby' => \@cust_payby,
+ 'curr_value' => $custpaybynum,
+ &>
+
+
+
+% } # end if cust_payby
+
% } else {
+
% }
+
+
<& /elements/tr-select-reason.html,
'field' => 'reasonnum',
'reason_class' => 'F',
@@ -159,22 +221,30 @@ my $payby = $cgi->param('payby');
my $payinfo = $cgi->param('payinfo');
my $reason = $cgi->param('reason');
my $link = $cgi->param('popup') ? 'popup' : '';
+my $batch = $cgi->param('batch');
die "access denied"
unless $FS::CurrentUser::CurrentUser->refund_access_right($payby);
-my( $paynum, $cust_pay ) = ( '', '' );
+my( $paynum, $cust_pay, $batchnum, $cust_payby ) = ( '', '', '', '' );
if ( $cgi->param('paynum') =~ /^(\d+)$/ ) {
$paynum = $1;
$cust_pay = qsearchs('cust_pay', { paynum=>$paynum } )
or die "unknown payment # $paynum";
$refund ||= $cust_pay->unrefunded;
+ $batchnum = $cust_pay->batchnum;
if ( $custnum ) {
die "payment # $paynum is not for specified customer # $custnum"
unless $custnum == $cust_pay->custnum;
} else {
$custnum = $cust_pay->custnum;
+ $cgi->param(-name=>"custnum", -value=>$custnum) unless $cgi->param("custnum");
}
+ # get custpayby
+ $cust_payby = qsearchs(
+ 'cust_payby', { paymask => $cust_pay->paymask, custnum => $custnum }
+ );
+
}
die "no custnum or paynum specified!" unless $custnum;