X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayby.pm;h=6684c95f0e511a1ac09fb955a9f84f6a742f10f7;hb=8b33800764316232933f5996ac3fe9ea1793d944;hp=42328b4292033f7dcffbbd2b50cb8902cb1ba45a;hpb=22c70177969f30e2e419b32cb5d475c143f10b12;p=freeside.git

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 42328b429..6684c95f0 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',
@@ -74,6 +76,12 @@ tie %hash, 'Tie::IxHash',
     shortname => 'Billing',
     longname  => 'Billing',
   },
+  'PREP' => {
+    tinyname  => 'prepaid card',
+    shortname => 'Prepaid card',
+    longname  => 'Prepaid card',
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
   'CASH' => {
     tinyname  => 'cash',
     shortname => 'Cash', # initial payment, then billing
@@ -96,16 +104,13 @@ tie %hash, 'Tie::IxHash',
     tinyname  => 'comp',
     shortname => 'Complimentary',
     longname  => 'Complimentary',
+    cust_pay  => '', # (free) is depricated as a payment type in cust_pay
   },
-  'DCLN' => {  # This is only an event.
-    tinyname  => 'declined',
-    shortname => 'Batch declined payment',
-    longname  => 'Batch declined payment',
-
-    #its neither of these..
-    #cust_main => '',
-    cust_pay  => '',
-
+  'CBAK' => {
+    tinyname  => 'chargeback',
+    shortname => 'Chargeback',
+    longname  => 'Chargeback',
+    cust_main => '', # not a customer type
   },
 ;
 
@@ -113,6 +118,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 +170,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