manual echeck payment type, RT#26995

diff --git a/FS/FS/cust_main/Billing_ThirdParty.pm b/FS/FS/cust_main/Billing_ThirdParty.pm
index faced8f..a1d19fb 100644 (file)
--- a/FS/FS/cust_main/Billing_ThirdParty.pm
+++ b/FS/FS/cust_main/Billing_ThirdParty.pm
@@ -36,7 +36,11 @@ to that URL.
 =cut
 
 my @methods = qw(PAYPAL CC);
 =cut
 
 my @methods = qw(PAYPAL CC);

-my %method2payby = ( 'PAYPAL' => 'PPAL', 'CC' => 'MCRD' );
+my %method2payby = ( 'PAYPAL' => 'PPAL',
+                     'CC'     => 'MCRD', #?  but doesn't MCRD mean _offline_
+                                         #card, not third-party card?  but no
+                                         #one is doing non-paypal right now
+                   );

 
 sub create_payment {
   my $self = shift;
 
 sub create_payment {
   my $self = shift;

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index 42bf64a..ad3d80a 100644 (file)
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -353,7 +353,7 @@ sub check {
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expiration date required"
       # shouldn't payinfo_check do this?
   if ( $self->paydate eq '' || $self->paydate eq '-' ) {
     return "Expiration date required"
       # shouldn't payinfo_check do this?

-      unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD|PPAL)$/;
+      unless $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD|MCHK|PPAL)$/;

     $self->paydate('');
   } else {
     my( $m, $y );
     $self->paydate('');
   } else {
     my( $m, $y );