diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/misc/process/payment.cgi | 37 | ||||
| -rwxr-xr-x | httemplate/search/cust_pay.cgi | 12 | ||||
| -rw-r--r-- | httemplate/view/cust_main/payment_history.html | 6 | ||||
| -rw-r--r-- | httemplate/view/cust_pay.html | 126 |
4 files changed, 161 insertions, 20 deletions
diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi index 6377b13e8..71a4891cf 100644 --- a/httemplate/misc/process/payment.cgi +++ b/httemplate/misc/process/payment.cgi @@ -1,11 +1,18 @@ -<% include( '/elements/header.html', ucfirst($type{$payby}). ' processing successful', - include('/elements/menubar.html'), +% if ( $cgi->param('batch') ) { - ) -%> -<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(3). "view/cust_main.cgi" ) %> + <% include( '/elements/header.html', ucfirst($type{$payby}). ' processing successful', + include('/elements/menubar.html'), -<% include('/elements/footer.html') %> + ) + %> + + <% include( '/elements/small_custview.html', $cust_main, '', '', popurl(3). "view/cust_main.cgi" ) %> + + <% include('/elements/footer.html') %> + +% } else { +<% $cgi->redirect(popurl(3). "view/cust_pay.html?paynum=$paynum" ) %> +% } <%init> #some false laziness w/MyAccount::process_payment @@ -99,6 +106,7 @@ if ( $payby eq 'CHEK' ) { } my $error = ''; +my $paynum = ''; if ( $cgi->param('batch') ) { $error = $cust_main->batch_card( @@ -110,18 +118,19 @@ if ( $cgi->param('batch') ) { map { $_ => $cgi->param($_) } @{$payby2fields{$payby}} ); - errotpage($error) if $error; + errorpage($error) if $error; } else { $error = $cust_main->realtime_bop( $FS::payby::payby2bop{$payby}, $amount, - 'quiet' => 1, - 'manual' => 1, - 'payinfo' => $payinfo, - 'paydate' => "$year-$month-01", - 'payname' => $payname, - 'payunique' => $payunique, - 'paycvv' => $paycvv, + 'quiet' => 1, + 'manual' => 1, + 'payinfo' => $payinfo, + 'paydate' => "$year-$month-01", + 'payname' => $payname, + 'payunique' => $payunique, + 'paycvv' => $paycvv, + 'paynum_ref' => \$paynum, map { $_ => $cgi->param($_) } @{$payby2fields{$payby}} ); errorpage($error) if $error; diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi index 0eefd2b50..2166eb16d 100755 --- a/httemplate/search/cust_pay.cgi +++ b/httemplate/search/cust_pay.cgi @@ -37,10 +37,10 @@ #'align' => 'lrrrll', 'align' => 'rrr'.FS::UI::Web::cust_aligns(), 'links' => [ - '', - '', - '', - ( map { $_ ne 'Cust. Status' ? $link : '' } + $link, + $link, + $link, + ( map { $_ ne 'Cust. Status' ? $cust_link : '' } FS::UI::Web::cust_header() ), ], @@ -226,7 +226,9 @@ if ( $cgi->param('magic') ) { } -my $link = sub { +my $link = [ "${p}view/cust_pay.html?paynum=", 'paynum' ]; + +my $cust_link = sub { my $cust_pay = shift; $cust_pay->cust_main_custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 099bc4f2b..5af34c09c 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -171,6 +171,10 @@ % } % } % +% my $view = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}view/cust_pay.html?link=popup;paynum=!. +% $cust_pay->paynum. +% qq!', 540, 336, 'view_cust_pay_popup' ), CAPTION, 'Payment Receipt', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">view receipt</A>)!; +% % my $refund = ''; % my $refund_days = $conf->config('card_refund-days') || 120; % if ( $cust_pay->closed !~ /^Y/i @@ -239,7 +243,7 @@ % push @history, { % 'date' => $cust_pay->_date, % 'desc' => $pre. "Payment$post$info$desc". -% "$apply$refund$void$delete$unapply", +% "$view$apply$refund$void$delete$unapply", % 'payment' => $cust_pay->paid, % 'target' => $target, % }; diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html new file mode 100644 index 000000000..2d1a22b07 --- /dev/null +++ b/httemplate/view/cust_pay.html @@ -0,0 +1,126 @@ +% if ( $link eq 'popup' ) { + + <% include('/elements/header-popup.html', "Payment Receipt" ) %> + + <CENTER><A HREF="javascript:self.parent.location = '<% $pr_link %>'">Print</A></CENTER><BR> + +% } elsif ( $link eq 'print' ) { + + <% include('/elements/header-popup.html', "Payment Receipt" ) %> + +% } else { + + <% include('/elements/header.html', "Payment Receipt", menubar( + "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum", + 'Print receipt' => $pr_link, + )) + %> + +% } + +% unless ($link eq 'popup' ) { + <% include('/elements/small_custview.html', + $custnum, + scalar($conf->config('countrydefault')), + 1, #no balance + ) + %> + <BR><BR> +% } + +<% ntable("#cccccc", 2) %> + +<TR> + <TD ALIGN="right">Payment#</TD> + <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->paynum %></B></TD> +</TR> + +<TR> + <TD ALIGN="right">Date</TD> + <TD BGCOLOR="#FFFFFF"><B><% time2str"%a %b %o, %Y %r", $cust_pay->_date %></B></TD> +</TR> + +<TR> + <TD ALIGN="right">Amount</TD> + <TD BGCOLOR="#FFFFFF"><B><% $money_char. $cust_pay->paid %></B></TD> +</TR> + +<TR> + <TD ALIGN="right">Payment method</TD> + <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->payby_name %> #<% $cust_pay->paymask %></B></TD> +</TR> + +% if ( $cust_pay->payby =~ /^(CARD|CHEK|LECB)$/ && $cust_pay->paybatch ) { + + <TR> + <TD ALIGN="right">Processor</TD> + <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->processor %></B></TD> + </TR> + + <TR> + <TD ALIGN="right">Authorization#</TD> + <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->authorization %></B></TD> + </TR> + +% if ( $cust_pay->order_number ) { + <TR> + <TD ALIGN="right">Order#</TD> + <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->order_number %></B></TD> + </TR> +% } + +% } + +</TABLE> + +% if ( $link eq 'print' ) { + + <SCRIPT TYPE="text/javascript"> + window.print(); + </SCRIPT> + +% } + +% if ( $link =~ /^(popup|print)$/ ) { + </BODY> + </HTML> +% } else { + <% include('/elements/footer.html') %> +% } + +<%init> + +my $curuser = $FS::CurrentUser::CurrentUser; + +die "access denied" + unless $curuser->access_right('View invoices') #remove this in 1.9 + || $curuser->access_right('View customer payments'); + +$cgi->param('paynum') =~ /^(\d+)$/ or die "no paynum"; +my $paynum = $1; + +my $link = ''; +if ( $cgi->param('link') =~ /^(\w+)$/ ) { + $link = $1; +} + +my $cust_pay = qsearchs({ + 'select' => 'cust_pay.*', + 'table' => 'cust_pay', + 'addl_from' => 'LEFT JOIN cust_main USING ( custnum )', + 'hashref' => { 'paynum' => $paynum }, + 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql, +}); +die "Payment #$paynum not found!" unless $cust_pay; + +my $pr_link = "${p}view/cust_pay.html?link=print;paynum=$paynum"; + +my $custnum = $cust_pay->custnum; + +my $conf = new FS::Conf; + +my $money_char = $conf->config('money_char') || '$'; + +tie my %payby, 'Tie::IxHash', FS::payby->payby2longname; + +</%init> |