X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Fcust_refund.cgi;h=bea3786f76cf9f427cd423bf88c5587fdf02a112;hb=833839f66761df30a0b0b965ed4314cce32f8f3d;hp=94c0993d77be108c47dbe13d4df3f4fb3abe4387;hpb=46a7257273fdae101658c8a1ee74f654ca0876b5;p=freeside.git diff --git a/httemplate/edit/cust_refund.cgi b/httemplate/edit/cust_refund.cgi index 94c0993d7..bea3786f7 100755 --- a/httemplate/edit/cust_refund.cgi +++ b/httemplate/edit/cust_refund.cgi @@ -10,7 +10,7 @@ <% small_custview($custnum, $conf->config('countrydefault')) %> % } -
+ @@ -33,7 +33,7 @@ % $paydate = '' unless ($paydate =~ /^\d{2,4}-\d{1,2}-01$'/); % } -
Payment +
Payment <% ntable("#cccccc", 2) %> @@ -41,14 +41,14 @@ - Date<% time2str("%D",$cust_pay->_date) %> + Date<% time2str($date_format, $cust_pay->_date) %> Method<% $payby %> # <% $paymask %> -% unless ( $paydate ) { # possibly other reasons: i.e. card has since expired +% unless ( $paydate || $cust_pay->payby ne 'CARD' ) { # possibly other reasons: i.e. card has since expired Expiration <% include( '/elements/select-month_year.html', @@ -59,65 +59,88 @@ % } - -% -% #false laziness w/FS/FS/cust_main::realtime_refund_bop -% if ( $cust_pay->paybatch =~ /^(\w+):(\w+)(:(\w+))?$/ ) { -% my ( $processor, $auth, $order_number ) = ( $1, $2, $4 ); -% - - +% if ( $cust_pay->processor ) { - Processor<% $processor %> + Processor + <% $cust_pay->processor %> -% if ( length($auth) ) { +% if ( length($cust_pay->auth) ) { - Authorization<% $auth %> + Authorization + <% $cust_pay->auth %> % } -% if ( length($order_number) ) { +% if ( length($cust_pay->order_number) ) { - Order number<% $order_number %> + Order number + <% $cust_pay->order_number %> % } -% } +% } # if ($cust_pay->processor) -% } +% } #if $cust_pay -
Refund +
Refund <% ntable("#cccccc", 2) %> Date - <% time2str("%D",$_date) %> + <% time2str($date_format, $_date) %> Amount - $ by <% FS::payby->payname($payby) %> + $ % if ( $payby eq 'BILL' ) { - Check # - + Check + -% } else { - % } +% elsif ($payby eq 'CHEK' || $payby eq 'CARD') { - Reason - + Method + <% FS::payby->payname($real_payby) %> # <% $real_paymask %> + +% 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 %> + +% } +% } + +% } else { + +% } + +<& /elements/tr-select-reason.html, + 'field' => 'reasonnum', + 'reason_class' => 'F', + 'control_button' => "confirm_refund_button", + 'cgi' => $cgi, +&> +
- +
@@ -130,23 +153,27 @@ <%init> -die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Refund payment'); - my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + my $custnum = $cgi->param('custnum'); my $refund = $cgi->param('refund'); 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 ) = ( '', '', '' ); 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; @@ -156,6 +183,12 @@ if ( $cgi->param('paynum') =~ /^(\d+)$/ ) { } die "no custnum or paynum specified!" unless $custnum; +my $cust_main = qsearchs( 'cust_main', { 'custnum'=>$custnum } ); +die "unknown custnum $custnum" unless $cust_main; + +my $real_payby = $cust_main->payby; +my $real_paymask = $cust_main->paymask; + my $_date = time; my $p1 = popurl(1);