From 9ed8adbf1ab5aba8181903e9c262f2b69dba6cbc Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 27 Oct 2007 04:46:05 +0000 Subject: [PATCH] simple payment receipts in web interface, sorry arnie, RT#2738 --- FS/FS/cust_main.pm | 12 ++- FS/FS/cust_pay.pm | 69 ++++++++++++++ httemplate/misc/process/payment.cgi | 37 +++++--- httemplate/search/cust_pay.cgi | 12 ++- httemplate/view/cust_main/payment_history.html | 6 +- httemplate/view/cust_pay.html | 126 +++++++++++++++++++++++++ 6 files changed, 240 insertions(+), 22 deletions(-) create mode 100644 httemplate/view/cust_pay.html diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index f043e477a..467ddfe0c 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -2859,7 +2859,7 @@ L for supported gateways. Available methods are: I, I and I -Available options are: I, I, I +Available options are: I, I, I, I The additional options I, I, I, I, I, I, I and I are also available. Any of these options, @@ -2874,6 +2874,9 @@ call the B method. I can be set true to surpress email decline notices. +I can be set to a scalar reference. It will be filled in with the +resulting paynum, if any. + (moved from cust_bill) (probably should get realtime_{card,ach,lec} here too) =cut @@ -3237,6 +3240,11 @@ sub realtime_bop { return $e; } } + + if ( $options{'paynum_ref'} ) { + ${ $options{'paynum_ref'} } = $cust_pay->paynum; + } + return ''; #no error } else { @@ -3317,7 +3325,7 @@ sub default_payment_gateway { #load up config my $bop_config = 'business-onlinepayment'; $bop_config .= '-ach' - if $method eq 'ECHECK' && $conf->exists($bop_config. '-ach'); + if $method =~ /^(ECHECK|CHEK)$/ && $conf->exists($bop_config. '-ach'); my ( $processor, $login, $password, $action, @bop_options ) = $conf->config($bop_config); $action ||= 'normal authorization'; diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm index 5d31d2cde..78c09a3d0 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -7,6 +7,7 @@ use Business::CreditCard; use Text::Template; use FS::Misc qw(send_email); use FS::Record qw( dbh qsearch qsearchs ); +use FS::payby; use FS::cust_main_Mixin; use FS::payinfo_Mixin; use FS::cust_bill; @@ -548,6 +549,74 @@ sub cust_main { qsearchs( 'cust_main', { 'custnum' => $self->custnum } ); } +=item payby_name + +Returns a name for the payby field. + +=cut + +sub payby_name { + my $self = shift; + FS::payby->shortname( $self->payby ); +} + +=item gatewaynum + +Returns a gatewaynum for the processing gateway. + +=item processor + +Returns a name for the processing gateway. + +=item authorization + +Returns a name for the processing gateway. + +=item order_number + +Returns a name for the processing gateway. + +=cut + +sub gatewaynum { shift->_parse_paybatch->{'gatewaynum'}; } +sub processor { shift->_parse_paybatch->{'processor'}; } +sub authorization { shift->_parse_paybatch->{'authorization'}; } +sub order_number { shift->_parse_paybatch->{'order_number'}; } + +#sucks that this stuff is in paybatch like this in the first place, +#but at least other code can start to use new field names +#(code nicked from FS::cust_main::realtime_refund_bop) +sub _parse_paybatch { + my $self = shift; + + $self->paybatch =~ /^((\d+)\-)?(\w+):\s*([\w\-\/ ]*)(:([\w\-]+))?$/ + or return {}; + #"Can't parse paybatch for paynum $options{'paynum'}: ". + # $cust_pay->paybatch; + + my( $gatewaynum, $processor, $auth, $order_number ) = ( $2, $3, $4, $6 ); + + if ( $gatewaynum ) { #gateway for the payment to be refunded + + my $payment_gateway = + qsearchs('payment_gateway', { 'gatewaynum' => $gatewaynum } ); + + die "payment gateway $gatewaynum not found" #? + unless $payment_gateway; + + $processor = $payment_gateway->gateway_module; + + } + + { + 'gatewaynum' => $gatewaynum, + 'processor' => $processor, + 'authorization' => $auth, + 'order_number' => $order_number, + }; + +} + =back =head1 CLASS METHODS 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! (view receipt)!; +% % 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" ) %> + +
Print

+ +% } 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 + ) + %> +

+% } + +<% ntable("#cccccc", 2) %> + + + Payment# + <% $cust_pay->paynum %> + + + + Date + <% time2str"%a %b %o, %Y %r", $cust_pay->_date %> + + + + Amount + <% $money_char. $cust_pay->paid %> + + + + Payment method + <% $cust_pay->payby_name %> #<% $cust_pay->paymask %> + + +% if ( $cust_pay->payby =~ /^(CARD|CHEK|LECB)$/ && $cust_pay->paybatch ) { + + + Processor + <% $cust_pay->processor %> + + + + Authorization# + <% $cust_pay->authorization %> + + +% if ( $cust_pay->order_number ) { + + Order# + <% $cust_pay->order_number %> + +% } + +% } + + + +% if ( $link eq 'print' ) { + + + +% } + +% if ( $link =~ /^(popup|print)$/ ) { + + +% } 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; + + -- 2.11.0