fix payby2bop brokenness

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 62d67c1..1801b12 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -28,7 +28,7 @@ use FS::part_pkg;
 use FS::cust_bill_pay;
 use FS::cust_bill_pay_batch;
 use FS::part_bill_event;
-use FS::payby qw( payby2bop );
+use FS::payby;
 
 @ISA = qw( FS::cust_main_Mixin FS::Record );
 
@@ -1318,7 +1318,7 @@ sub batch_card {
   return '' unless $amount > 0;
   
   if ($options{'realtime'}) {
-    return $cust_main->realtime_bop ( $FS::payby::payby2bop->{$cust_main->payby}, $amount,
+    return $cust_main->realtime_bop ( $FS::payby::payby2bop{$cust_main->payby}, $amount,
       %options,
     );
   }

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 98b8301..8f7f1ae 100644 (file)
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -1,7 +1,7 @@
 package FS::payby;
 
 use strict;
-use vars qw(%hash @EXPORT_OK);
+use vars qw(%hash %payby2bop);
 use Tie::IxHash;
 
 
@@ -107,10 +107,10 @@ sub payby2longname {
   map { $_ => $hash{$_}->{longname} } $self->payby;
 }
 
-sub payby2bop {
-  { 'CARD' => 'CC'.
-    'CHEK' => 'ECHECK',};
-}
+%payby2bop = (
+  'CARD' => 'CC',
+  'CHEK' => 'ECHECK',
+);
 
 sub cust_payby {
   my $self = shift;

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index e1fade4..027cd50 100644 (file)
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -82,7 +82,7 @@
 %  die "unknown payby $payby";
 %}
 %
-%my $error = $cust_main->realtime_bop( $FS::payby::payby2bop->{$payby}, $amount,
+%my $error = $cust_main->realtime_bop( $FS::payby::payby2bop{$payby}, $amount,
 %  'quiet'    => 1,
 %  'payinfo'  => $payinfo,
 %  'paydate'  => "$year-$month-01",