X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayby.pm;h=e44ac6a6d3b7bfdfde9e3b111c506804066f1973;hb=a0ddcb6b2ac38076c48e8f0b69e0758d5283303a;hp=42328b4292033f7dcffbbd2b50cb8902cb1ba45a;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 42328b429..e44ac6a6d 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -18,6 +18,8 @@ FS::payby - Object methods for payment type records
 
   my @payby = FS::payby->payby;
 
+  my $bool = FS::payby->can_payby('cust_main', 'CARD');
+
   tie my %payby, 'Tie::IxHash', FS::payby->payby2longname
 
   my @cust_payby = FS::payby->cust_payby;
@@ -38,7 +40,7 @@ Payment types.
 
 # paybys can be any/all of:
 # - a customer payment type (cust_main.payby)
-# - a payment or refund type (cust_pay.payby)
+# - a payment or refund type (cust_pay.payby, cust_pay_batch.payby, cust_refund.payby)
 # - an event type (part_bill_event.payby)
 
 tie %hash, 'Tie::IxHash',
@@ -96,6 +98,13 @@ tie %hash, 'Tie::IxHash',
     tinyname  => 'comp',
     shortname => 'Complimentary',
     longname  => 'Complimentary',
+    cust_pay  => '', # (free) is depricated as a payment type in cust_pay
+  },
+  'CBAK' => {
+    tinyname  => 'chargeback',
+    shortname => 'Chargeback',
+    longname  => 'Chargeback',
+    cust_main => '', # not a customer type
   },
   'DCLN' => {  # This is only an event.
     tinyname  => 'declined',
@@ -103,7 +112,7 @@ tie %hash, 'Tie::IxHash',
     longname  => 'Batch declined payment',
 
     #its neither of these..
-    #cust_main => '',
+    cust_main => '',
     cust_pay  => '',
 
   },
@@ -113,6 +122,18 @@ sub payby {
   keys %hash;
 }
 
+sub can_payby {
+  my( $self, $table, $payby ) = @_;
+
+  #return "Illegal payby" unless $hash{$payby};
+  return 0 unless $hash{$payby};
+
+  $table = 'cust_pay' if $table eq 'cust_pay_batch' || $table eq 'cust_refund';
+  return 0 if exists( $hash{$payby}->{$table} );
+
+  return 1;
+}
+
 sub payby2longname {
   my $self = shift;
   map { $_ => $hash{$_}->{longname} } $self->payby;
@@ -153,28 +174,6 @@ sub cust_payby2longname {
   map { $_ => $hash{$_}->{longname} } $self->cust_payby;
 }
 
-sub payinfo_check{
-  my($payby, $payinforef) = @_;
-
-  if ($payby eq 'CARD') {
-    $$payinforef =~ s/\D//g;
-    if ($$payinforef){
-      $$payinforef =~ /^(\d{13,16})$/
-        or return "Illegal (mistyped?) credit card number (payinfo)";
-      $$payinforef = $1;
-      validate($$payinforef) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($$payinforef) eq "Unknown";
-    } else {
-      $$payinforef="N/A";
-    }
-  } else {
-    $$payinforef =~ /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-    or return "Illegal text (payinfo)";
-    $$payinforef = $1;
-  }
-  '';
-}
-
 =back
 
 =head1 BUGS