X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch%2Ftd_canada_trust.pm;h=e80441ef8ce44bacc0a17460138bf62bb9da0cc7;hb=5372897f367498972c96f5494e142e6e11b29eb8;hp=43b92371ec5963148ea468acc78437b9a1d17671;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git

diff --git a/FS/FS/pay_batch/td_canada_trust.pm b/FS/FS/pay_batch/td_canada_trust.pm
index 43b92371e..e80441ef8 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;