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

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 30a03ddfe..c4aa1b1b2 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',
@@ -106,6 +113,36 @@ tie %hash, 'Tie::IxHash',
     longname  => 'Manual credit card', 
     cust_main => 'BILL', #this is a payment type only, customers go to BILL...
   },
+  '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...
+  },
+  'APPL' => {
+    tinyname  => 'apple store',
+    shortname => 'Apple Store',
+    longname  => 'Apple Store',
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
+  'ANRD' => {
+    tinyname  => 'android market',
+    shortname => 'Android Market',
+    longname  => 'Android Market',
+    cust_main => 'BILL', #this is a payment type only, customers go to BILL...
+  },
+  'EDI' => {
+    tinyname  => 'EDI',
+    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' => {
     tinyname  => 'comp',
     shortname => 'Complimentary',
@@ -145,6 +182,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;
@@ -171,7 +213,10 @@ sub longname {
 %payby2bop = (
   'CARD' => 'CC',
   'CHEK' => 'ECHECK',
-  'MCRD' => 'CC',
+  'MCRD' => 'CC', #?  but doesn't MCRD mean _offline_ card?  i think it got
+                  # overloaded for third-party card payments -- but no one is
+                  # doing those other than paypal now
+  'PPAL' => 'PAYPAL',
 );
 
 sub payby2bop {