X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayby.pm;h=443a130ac8c320924dc6b587ad6a64366ddff7af;hb=230e099f92541bc3bc0e2a08e81932ee17909fa0;hp=c4aa1b1b2685f998d9afd055d117ea325c859139;hpb=8d953e7c2f94dc007d94da74650d27c5a74cc792;p=freeside.git

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index c4aa1b1b2..443a130ac 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -5,7 +5,6 @@ use vars qw(%hash %payby2bop);
 use Tie::IxHash;
 use Business::CreditCard;
 
-
 =head1 NAME
 
 FS::payby - Object methods for payment type records
@@ -39,9 +38,8 @@ Payment types.
 =cut
 
 # paybys can be any/all of:
-# - a customer payment type (cust_main.payby)
+# - a customer saved payment type (cust_payby.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',
   'CARD' => {
@@ -70,17 +68,12 @@ tie %hash, 'Tie::IxHash',
     cust_pay  => 'CHEK', #this is a customer type only, payments are CHEK...
     realtime  => 1,
   },
-  #'LECB' => {
-  #  tinyname  => 'phone bill',
-  #  shortname => 'Phone bill billing',
-  #  longname  => 'Phone bill billing',
-  #  realtime  => 1,
-  #},
   'BILL' => {
     tinyname  => 'billing',
     shortname => 'Billing',
     payname   => 'Check',
     longname  => 'Billing',
+    cust_main => '', #no longer a customer type
   },
   'PPAL' => {
     tinyname  => 'PayPal',
@@ -93,43 +86,43 @@ tie %hash, 'Tie::IxHash',
     tinyname  => 'prepaid card',
     shortname => 'Prepaid card',
     longname  => 'Prepaid card',
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'CASH' => {
     tinyname  => 'cash',
     shortname => 'Cash', # initial payment, then billing
     longname  => 'Cash',
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'WEST' => {
     tinyname  => 'western union',
     shortname => 'Western Union', # initial payment, then billing
     longname  => 'Western Union',
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'MCRD' => { #not the same as DCRD
     tinyname  => 'card',
     shortname => 'Manual credit card', # initial payment, then billing
     longname  => 'Manual credit card', 
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'MCHK' => { #not the same as DCHK
     tinyname  => 'card',
     shortname => 'Manual electronic check', # initial payment, then billing
     longname  => 'Manual electronic check', 
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'APPL' => {
     tinyname  => 'apple store',
     shortname => 'Apple Store',
     longname  => 'Apple Store',
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'ANRD' => {
     tinyname  => 'android market',
     shortname => 'Android Market',
     longname  => 'Android Market',
-    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+    cust_main => '', #this is a payment type only
   },
   'EDI' => {
     tinyname  => 'EDI',
@@ -143,12 +136,6 @@ tie %hash, 'Tie::IxHash',
     longname  => 'Wire transfer',
     cust_main => '', #not a customer type
   },
-  'COMP' => {
-    tinyname  => 'comp',
-    shortname => 'Complimentary',
-    longname  => 'Complimentary',
-    cust_pay  => '', # (free) is depricated as a payment type in cust_pay
-  },
   'CBAK' => {
     tinyname  => 'chargeback',
     shortname => 'Chargeback',
@@ -234,11 +221,49 @@ sub cust_payby {
   grep { ! exists $hash{$_}->{cust_main} } $self->payby;
 }
 
+sub cust_payby2shortname {
+  my $self = shift;
+  map { $_ => $hash{$_}->{shortname} } $self->cust_payby;
+}
+
 sub cust_payby2longname {
   my $self = shift;
   map { $_ => $hash{$_}->{longname} } $self->cust_payby;
 }
 
+=item payment_payby
+
+Returns all values of payby that can be used by payments.
+
+=cut
+
+sub payment_payby {
+  my $self = shift;
+  grep { ! exists $hash{$_}->{cust_pay} } $self->payby;
+}
+
+=item payment_payby2longname
+
+Returns hash, keys are L</payment_payby> types, values are payby longname.
+
+=cut
+
+sub payment_payby2longname {
+  my $self = shift;
+  map { $_ => $hash{$_}->{longname} } $self->payment_payby;
+}
+
+=item payment_payby2payname
+
+Returns hash, keys are L</payment_payby> types, values are payby payname.
+
+=cut
+
+sub payment_payby2payname {
+  my $self = shift;
+  map { $_ => $self->payname($_) } $self->payment_payby;
+}
+
 =back
 
 =head1 BUGS