per address block ip auto assignment and auto router selection

[freeside.git] / FS / FS / payby.pm

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 28afd03..b54e5d9 100644 (file)
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -74,6 +74,7 @@ tie %hash, 'Tie::IxHash',
   'BILL' => {
     tinyname  => 'billing',
     shortname => 'Billing',
+    payname   => 'Check',
     longname  => 'Billing',
   },
   'PREP' => {
@@ -112,16 +113,6 @@ tie %hash, 'Tie::IxHash',
     longname  => 'Chargeback',
     cust_main => '', # not a customer type
   },
-  'DCLN' => {  # This is only an event.
-    tinyname  => 'declined',
-    shortname => 'Batch declined payment',
-    longname  => 'Batch declined payment',
-
-    #its neither of these..
-    cust_main => '',
-    cust_pay  => '',
-
-  },
 ;
 
 sub payby {
@@ -134,7 +125,7 @@ sub can_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';
+  $table = 'cust_pay' if $table =~ /^cust_(pay_pending|pay_batch|pay_void|refund)$/;
   return 0 if exists( $hash{$payby}->{$table} );
 
   return 1;
@@ -150,6 +141,14 @@ sub shortname {
   $hash{$payby}->{shortname};
 }
 
+sub payname {
+  my( $self, $payby ) = @_;
+  #$hash{$payby}->{payname} || $hash{$payby}->{shortname};
+  exists($hash{$payby}->{payname})
+    ? $hash{$payby}->{payname}
+    : $hash{$payby}->{shortname};
+}
+
 sub longname {
   my( $self, $payby ) = @_;
   $hash{$payby}->{longname};