X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fprocess%2Fpayment.cgi;h=506e26684eae5e30b8752335cfb8f4538e80b127;hp=29157d8f0db8706a4839ea9a253dcf10e57e406a;hb=074464a707b2c8b83cc50cd0bb067660ef4d0f9f;hpb=fca1ac5d298b3896c1c42c4ffc7bdd3bab9b8516

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index 29157d8f0..506e26684 100644
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -1,13 +1,28 @@
-<% 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') %>
+
+% #2.5/2.7?# } elsif ( $curuser->access_right('View payments') ) {
+% } elsif ( $curuser->access_right(['View invoices', 'View payments']) ) {
+<% $cgi->redirect(popurl(3). "view/cust_pay.html?paynum=$paynum" ) %>
+% } else {
+<% $cgi->redirect(popurl(3). "view/cust_main.html?custnum=$custnum" ) %>
+% }
 <%init>
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+die "access denied" unless $curuser->access_right('Process payment');
+
+my $conf = new FS::Conf;
+
 #some false laziness w/MyAccount::process_payment
 
 $cgi->param('custnum') =~ /^(\d+)$/
@@ -18,23 +33,28 @@ my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
 die "unknown custnum $custnum" unless $cust_main;
 
 $cgi->param('amount') =~ /^\s*(\d*(\.\d\d)?)\s*$/
-  or eidiot "illegal amount ". $cgi->param('amount');
+  or errorpage("illegal amount ". $cgi->param('amount'));
 my $amount = $1;
-eidiot "amount <= 0" unless $amount > 0;
+errorpage("amount <= 0") unless $amount > 0;
+
+if ( $cgi->param('fee') =~ /^\s*(\d*(\.\d\d)?)\s*$/ ) {
+  my $fee = $1;
+  $amount = sprintf('%.2f', $amount + $fee);
+}
 
 $cgi->param('year') =~ /^(\d+)$/
-  or die "illegal year ". $cgi->param('year');
+  or errorpage("illegal year ". $cgi->param('year'));
 my $year = $1;
 
 $cgi->param('month') =~ /^(\d+)$/
-  or die "illegal month ". $cgi->param('month');
+  or errorpage("illegal month ". $cgi->param('month'));
 my $month = $1;
 
 $cgi->param('payby') =~ /^(CARD|CHEK)$/
-  or die "illegal payby ". $cgi->param('payby');
+  or errorpage("illegal payby ". $cgi->param('payby'));
 my $payby = $1;
 my %payby2fields = (
-  'CARD' => [ qw( address1 address2 city state zip ) ],
+  'CARD' => [ qw( address1 address2 city county state zip country ) ],
   'CHEK' => [ qw( ss paytype paystate stateid stateid_state ) ],
 );
 my %type = ( 'CARD' => 'credit card',
@@ -42,13 +62,17 @@ my %type = ( 'CARD' => 'credit card',
            );
 
 $cgi->param('payname') =~ /^([\w \,\.\-\']+)$/
-  or eidiot gettext('illegal_name'). " payname: ". $cgi->param('payname');
+  or errorpage(gettext('illegal_name'). " payname: ". $cgi->param('payname'));
 my $payname = $1;
 
 $cgi->param('payunique') =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-  or eidiot gettext('illegal_text'). " payunique: ". $cgi->param('payunique');
+  or errorpage(gettext('illegal_text'). " payunique: ". $cgi->param('payunique'));
 my $payunique = $1;
 
+$cgi->param('balance') =~ /^\s*(\-?\s*\d*(\.\d\d)?)\s*$/
+  or errorpage("illegal balance");
+my $balance = $1;
+
 my $payinfo;
 my $paycvv = '';
 if ( $payby eq 'CHEK' ) {
@@ -57,11 +81,16 @@ if ( $payby eq 'CHEK' ) {
     $payinfo = $cust_main->payinfo;
   } else {
     $cgi->param('payinfo1') =~ /^(\d+)$/
-      or eidiot "illegal account number ". $cgi->param('payinfo1');
+      or errorpage("Illegal account number ". $cgi->param('payinfo1'));
     my $payinfo1 = $1;
     $cgi->param('payinfo2') =~ /^(\d+)$/
-      or eidiot "illegal ABA/routing number ". $cgi->param('payinfo2');
+      or errorpage("Illegal ABA/routing number ". $cgi->param('payinfo2'));
     my $payinfo2 = $1;
+    if ( $conf->config('echeck-country') eq 'CA' ) {
+      $cgi->param('payinfo3') =~ /^(\d{5})$/
+        or errorpage("Illegal branch number ". $cgi->param('payinfo2'));
+      $payinfo2 = "$1.$payinfo2";
+    }
     $payinfo = $payinfo1. '@'. $payinfo2;
   }
 
@@ -72,23 +101,25 @@ if ( $payby eq 'CHEK' ) {
     $payinfo = $cust_main->payinfo;
   }
   $payinfo =~ s/\D//g;
-  $payinfo =~ /^(\d{13,16})$/
-    or eidiot gettext('invalid_card'); # . ": ". $self->payinfo;
+  $payinfo =~ /^(\d{13,16}|\d{8,9})$/
+    or errorpage(gettext('invalid_card')); # . ": ". $self->payinfo;
   $payinfo = $1;
   validate($payinfo)
-    or eidiot gettext('invalid_card'); # . ": ". $self->payinfo;
-  eidiot gettext('unknown_card_type')
-    if cardtype($payinfo) eq "Unknown";
+    or errorpage(gettext('invalid_card')); # . ": ". $self->payinfo;
+
+  errorpage(gettext('unknown_card_type'))
+    if $payinfo !~ /^99\d{14}$/ #token
+    && cardtype($payinfo) eq "Unknown";
 
   if ( defined $cust_main->dbdef_table->column('paycvv') ) {
     if ( length($cgi->param('paycvv') ) ) {
       if ( cardtype($payinfo) eq 'American Express card' ) {
         $cgi->param('paycvv') =~ /^(\d{4})$/
-          or eidiot "CVV2 (CID) for American Express cards is four digits.";
+          or errorpage("CVV2 (CID) for American Express cards is four digits.");
         $paycvv = $1;
       } else {
         $cgi->param('paycvv') =~ /^(\d{3})$/
-          or eidiot "CVV2 (CVC2/CID) is three digits.";
+          or errorpage("CVV2 (CVC2/CID) is three digits.");
         $paycvv = $1;
       }
     }
@@ -98,33 +129,60 @@ if ( $payby eq 'CHEK' ) {
   die "unknown payby $payby";
 }
 
+$cgi->param('discount_term') =~ /^(\d*)$/
+  or errorpage("illegal discount_term");
+my $discount_term = $1;
+
 my $error = '';
+my $paynum = '';
 if ( $cgi->param('batch') ) {
 
-  $error = $cust_main->batch_card(
-                                   'payby'    => $payby,
-                                   'amount'   => $amount,
-                                   'payinfo'  => $payinfo,
-                                   'paydate'  => "$year-$month-01",
-                                   'payname'  => $payname,
-                                   map { $_ => $cgi->param($_) } 
-                                     @{$payby2fields{$payby}}
-                                 );
-  eidiot($error) if $error;
+  $error = 'Prepayment discounts not supported with batched payments' 
+    if $discount_term;
+
+  $error ||= $cust_main->batch_card(
+                                     'payby'    => $payby,
+                                     'amount'   => $amount,
+                                     'payinfo'  => $payinfo,
+                                     'paydate'  => "$year-$month-01",
+                                     'payname'  => $payname,
+                                     map { $_ => $cgi->param($_) } 
+                                       @{$payby2fields{$payby}}
+                                   );
+  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,
+    'balance'    => $balance,
+    'payinfo'    => $payinfo,
+    'paydate'    => "$year-$month-01",
+    'payname'    => $payname,
+    'payunique'  => $payunique,
+    'paycvv'     => $paycvv,
+    'paynum_ref' => \$paynum,
+    'discount_term' => $discount_term,
     map { $_ => $cgi->param($_) } @{$payby2fields{$payby}}
   );
-  eidiot($error) if $error;
+  errorpage($error) if $error;
+
+  #no error, so order the fee package if applicable...
+  if ( $cgi->param('fee_pkgpart') =~ /^(\d+)$/ ) {
+
+    my $cust_pkg = new FS::cust_pkg { 'pkgpart' => $1 };
+
+    my $error = $cust_main->order_pkg( 'cust_pkg' => $cust_pkg );
+    errorpage("payment processed successfully, but error ordering fee: $error")
+      if $error;
+
+    #and generate an invoice for it now too
+    $error = $cust_main->bill( 'pkg_list' => [ $cust_pkg ] );
+    errorpage("payment processed and fee ordered sucessfully, but error billing fee: $error")
+      if $error;
+
+  }
 
   $cust_main->apply_payments;
 
@@ -139,13 +197,12 @@ if ( $cgi->param('save') ) {
   } else {
     die "unknown payby $payby";
   }
-  $new->set( 'payinfo' => $payinfo );
+  $new->set( 'payinfo' => $cust_main->card_token || $payinfo );
   $new->set( 'paydate' => "$year-$month-01" );
   $new->set( 'payname' => $payname );
 
   #false laziness w/FS:;cust_main::realtime_bop - check both to make sure
   # working correctly
-  my $conf = new FS::Conf;
   if ( $payby eq 'CARD' &&
        grep { $_ eq cardtype($payinfo) } $conf->config('cvv-save') ) {
     $new->set( 'paycvv' => $paycvv );
@@ -156,7 +213,7 @@ if ( $cgi->param('save') ) {
   $new->set( $_ => $cgi->param($_) ) foreach @{$payby2fields{$payby}};
 
   my $error = $new->replace($cust_main);
-  eidiot "payment processed successfully, but error saving info: $error"
+  errorpage("payment processed successfully, but error saving info: $error")
     if $error;
   $cust_main = $new;
 }