better support for batch-increment_expiration, RT#10453

3 files changed, 3 insertions, 32 deletions

diff --git a/FS/FS/pay_batch/chase_canada.pm b/FS/FS/pay_batch/chase_canada.pm
index 909e4ae..5d8437d 100644
--- a/FS/FS/pay_batch/chase_canada.pm
+++ b/FS/FS/pay_batch/chase_canada.pm
@@ -73,7 +73,7 @@ $name = 'csv-chase_canada-E-xactBatch';
       '00',
       $cust_pay_batch->payinfo,
       $cust_pay_batch->amount,
-      expdate($cust_pay_batch->exp),
+      $cust_pay_batch->expmmyy,
       '',
       ''
     );
@@ -86,19 +86,4 @@ sub sdate {
   sprintf('%02d/%02d/%02d', $date[5] % 100, $date[4] + 1, $date[3]);
 }
 
-sub expdate {
-  my $exp = shift;
-  $exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my ($mon, $y) = ($2, $1);
-  if($conf->exists('batch-increment_expiration')) {
-    my ($curmon, $curyear) = (localtime(time))[4,5];
-    $curmon++;
-    $curyear -=  100;
-    $y++ while $y < $curyear || ($y == $curyear && $mon < $curmon);
-  }
-  $mon = "0$mon" if $mon =~ /^\d$/;
-  $y = "0$y" if $y =~ /^\d$/;
-  return "$mon$y";
-}
-
 1;
diff --git a/FS/FS/pay_batch/paymentech.pm b/FS/FS/pay_batch/paymentech.pm
index a5b6f27..f22a80f 100644
--- a/FS/FS/pay_batch/paymentech.pm
+++ b/FS/FS/pay_batch/paymentech.pm
@@ -107,7 +107,7 @@ my %paytype = (
         terminalID   => $terminalID,
         ($_->payby eq 'CARD') ? (
           ccAccountNum => $_->payinfo,
-          ccExp        => time2str('%m%y', str2time($_->exp))
+          ccExp        => $_->expmmyy,
         ) : (
           ecpCheckRT      => ($_->payinfo =~ /@(\d+)/),
           ecpCheckDDA     => ($_->payinfo =~ /(\d+)@/),
diff --git a/FS/FS/pay_batch/td_canada_trust.pm b/FS/FS/pay_batch/td_canada_trust.pm
index 43b9237..e80441e 100644
--- a/FS/FS/pay_batch/td_canada_trust.pm
+++ b/FS/FS/pay_batch/td_canada_trust.pm
@@ -77,7 +77,7 @@ $name = 'csv-td_canada_trust-merchant_pc_batch';
       '',
       '', 
       $cust_pay_batch->payinfo,
-      expdate($cust_pay_batch->exp),
+      $cust_pay_batch->expmmyy,
       $cust_pay_batch->amount,
       $cust_pay_batch->paybatchnum
       );
@@ -85,20 +85,6 @@ $name = 'csv-td_canada_trust-merchant_pc_batch';
 # no footer
 );
 
-sub expdate {
-  my $exp = shift;
-  $exp =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-  my ($mon, $y) = ($2, $1);
-  if($conf->exists('batch-increment_expiration')) {
-    my ($curmon, $curyear) = (localtime(time))[4,5];
-    $curmon++;
-    $curyear -=  100;
-    $y++ while $y < $curyear || ($y == $curyear && $mon < $curmon);
-  }
-  $mon = "0$mon" if $mon =~ /^\d$/;
-  $y = "0$y" if $y =~ /^\d$/;
-  return "$mon$y";
-}
 
 1;