X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayby.pm;h=197d4995baff7c72955867cd598200e00896b32c;hb=5f8111de04a4a914c72a1642722476db4728339c;hp=bee787c655e477905f950fbd8748350a31903d54;hpb=7c39be80f09665a808dd523e63f11b41b6e2024f;p=freeside.git

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index bee787c65..197d4995b 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -70,18 +70,25 @@ 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,
-  },
+  #'LECB' => {
+  #  tinyname  => 'phone bill',
+  #  shortname => 'Phone bill billing',
+  #  longname  => 'Phone bill billing',
+  #  realtime  => 1,
+  #},
   'BILL' => {
     tinyname  => 'billing',
     shortname => 'Billing',
     payname   => 'Check',
     longname  => 'Billing',
   },
+  'PPAL' => {
+    tinyname  => 'PayPal',
+    shortname => 'PayPal',
+    longname  => 'PayPal',
+    cust_main => '', #not yet a customer type, but could be once we can do
+                     # invoice presentment via paypal
+  },
   'PREP' => {
     tinyname  => 'prepaid card',
     shortname => 'Prepaid card',
@@ -120,8 +127,14 @@ tie %hash, 'Tie::IxHash',
   },
   'EDI' => {
     tinyname  => 'EDI',
-    shortname => 'Electronic Debit',
-    longname  => 'Electronic Debit',
+    shortname => 'Electronic Debit (EDI)',
+    longname  => 'Electronic Debit (EDI)',
+    cust_main => '', #not a customer type
+  },
+  'WIRE' => {
+    tinyname  => 'Wire',
+    shortname => 'Wire transfer',
+    longname  => 'Wire transfer',
     cust_main => '', #not a customer type
   },
   'COMP' => {
@@ -163,6 +176,11 @@ sub realtime {  # can use realtime payment facilities
   return $hash{$payby}->{realtime};
 }
 
+sub payby2shortname {
+  my $self = shift;
+  map { $_ => $hash{$_}->{shortname} } $self->payby;
+}
+
 sub payby2longname {
   my $self = shift;
   map { $_ => $hash{$_}->{longname} } $self->payby;
@@ -190,6 +208,7 @@ sub longname {
   'CARD' => 'CC',
   'CHEK' => 'ECHECK',
   'MCRD' => 'CC',
+  'PPAL' => 'PAYPAL',
 );
 
 sub payby2bop {