[freeside-commits] freeside/FS/FS/cust_main Billing_Realtime.pm, 1.25, 1.26

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/cust_main
In directory wavetail.420.am:/tmp/cvs-serv23100

Modified Files:
	Billing_Realtime.pm 
Log Message:
separate B:OP from B:OTPP

Index: Billing_Realtime.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing_Realtime.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -d -r1.25 -r1.26
--- Billing_Realtime.pm	15 Jul 2011 21:10:05 -0000	1.25
+++ Billing_Realtime.pm	2 Aug 2011 19:40:54 -0000	1.26
@@ -427,7 +427,10 @@
 
   my $paydate = '';
   my %content = ();
-  if ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'CC' ) {
+
+  if ( $namespace eq 'Business::OnlinePayment' ) {
+
+    if ( $options{method} eq 'CC' ) {
 
     $content{card_number} = $options{payinfo};
     $paydate = exists($options{'paydate'})
@@ -458,7 +461,8 @@
                            : $self->payissue;
     $content{issue_number} = $payissue if $payissue;
 
-    if ( $self->_bop_recurring_billing( 'payinfo'        => $options{'payinfo'},
+      if ( $self->_bop_recurring_billing(
+             'payinfo'        => $options{'payinfo'},
                                         'trans_is_recur' => $trans_is_recur,
                                       )
        )
@@ -468,14 +472,16 @@
         if $conf->exists('credit_card-recurring_billing_acct_code');
     }
 
-  } elsif ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'ECHECK' ){
+    } elsif ( $options{method} eq 'ECHECK' ){
+
     ( $content{account_number}, $content{routing_code} ) =
       split('@', $options{payinfo});
     $content{bank_name} = $options{payname};
     $content{bank_state} = exists($options{'paystate'})
                              ? $options{'paystate'}
                              : $self->getfield('paystate');
-    $content{account_type}= (exists($options{'paytype'}) && $options{'paytype'})
+      $content{account_type}=
+        (exists($options{'paytype'}) && $options{'paytype'})
                                ? uc($options{'paytype'})
                                : uc($self->getfield('paytype')) || 'PERSONAL CHECKING';
     $content{account_name} = $self->getfield('first'). ' '.
@@ -491,12 +497,17 @@
     $content{customer_ssn} = exists($options{'ss'})
                                ? $options{'ss'}
                                : $self->ss;
-  } elsif ( $namespace eq 'Business::OnlinePayment' && $options{method} eq 'LEC' ) {
+
+    } elsif ( $options{method} eq 'LEC' ) {
     $content{phone} = $options{payinfo};
+    } else {
+      die "unknown method ". $options{method};
+    }
+
   } elsif ( $namespace eq 'Business::OnlineThirdPartyPayment' ) {
     #move along
   } else {
-    #die an evil death
+    die "unknown namespace $namespace";
   }
 
   ###