X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2Fpaymentech.pm;h=bb2c2588dbe8948a9f44122c57fe1f19379443dd;hb=d476d0554f9a995a983edb014a0d7fe350e8c6ab;hp=91abbf273ffb0e26a68763b41adb49cbc0358ac9;hpb=1c9056a27c303170060004c1be93787c6a32dcb6;p=freeside.git

diff --git a/FS/FS/pay_batch/paymentech.pm b/FS/FS/pay_batch/paymentech.pm
index 91abbf273..bb2c2588d 100644
--- a/FS/FS/pay_batch/paymentech.pm
+++ b/FS/FS/pay_batch/paymentech.pm
@@ -8,7 +8,7 @@ use Date::Format 'time2str';
 use Date::Parse 'str2time';
 use Tie::IxHash;
 use FS::Conf;
-use FS::Misc 'bytes_substr';
+use Unicode::Truncate 'truncate_egc';
 
 my $conf;
 my ($bin, $merchantID, $terminalID, $username, $password, $with_recurringInd);
@@ -128,15 +128,17 @@ my %paymentech_countries = map { $_ => 1 } qw( US CA GB UK );
         ) : (
           ecpCheckRT      => ($_->payinfo =~ /@(\d+)/),
           ecpCheckDDA     => ($_->payinfo =~ /(\d+)@/),
-          ecpBankAcctType => $paytype{lc($_->cust_main->paytype)},
+          ecpBankAcctType => $paytype{lc($_->paytype)},
           ecpDelvMethod   => 'A',
         ),
-        avsZip          => bytes_substr($_->zip,      0, 10),
-        avsAddress1     => bytes_substr($_->address1, 0, 30),
-        avsAddress2     => bytes_substr($_->address2, 0, 30),
-        avsCity         => bytes_substr($_->city,     0, 20),
-        avsState        => bytes_substr($_->state,    0, 2),
-        avsName         => bytes_substr($_->first. ' '. $_->last, 0, 30),
+                           # truncate_egc will die() on empty string
+        avsZip      => $_->zip      ? truncate_egc($_->zip,      10) : undef,
+        avsAddress1 => $_->address1 ? truncate_egc($_->address1, 30) : undef,
+        avsAddress2 => $_->address2 ? truncate_egc($_->address2, 30) : undef,
+        avsCity     => $_->city     ? truncate_egc($_->city,     20) : undef,
+        avsState    => $_->state    ? truncate_egc($_->state,     2) : undef,
+        avsName     => ($_->first || $_->last)
+                       ? truncate_egc($_->first. ' '. $_->last, 30) : undef,
         ( $paymentech_countries{ $_->country }
           ? ( avsCountryCode  => $_->country )
           : ()
@@ -175,7 +177,14 @@ sub _upgrade_gateway {
   my $conf = FS::Conf->new;
   my @batchconfig = $conf->config('batchconfig-paymentech');
   my %options;
-  @options{ qw(bin terminalID merchantID login password ) } = @batchconfig;
+  @options{ qw(
+    bin
+    terminalID
+    merchantID
+    login
+    password
+    with_recurringInd
+  ) } = @batchconfig;
   $options{'industryType'} = 'EC';
   ( 'Paymentech', %options );
 }