use FS::Record 'qsearch';
use FS::Conf;
use FS::cust_pay_batch;
-use Date::Format 'time2str';
-use Time::Local 'timelocal';
+use DateTime;
my $conf;
my $origid;
%import_info = ( filetype => 'NONE' ); # see FS/bin/freeside-eftca-download
-my ($trans_code, $process_date);
+my ($business_trans_code, $personal_trans_code, $trans_code);
+my $req_date; # requested process date, in %D format
+# use Date::Holidays::CA for this?
#ref http://gocanada.about.com/od/canadatravelplanner/a/canada_holidays.htm
my %holiday_yearly = (
1 => { map {$_=>1} 1 }, #new year's
12 => { map {$_=>1} 26 }, #boxing day
);
my %holiday = (
- 2013 => { 2 => { map {$_=>1} 18 }, #family day
- 3 => { map {$_=>1} 29 }, #good friday
- 4 => { map {$_=>1} 1 }, #easter monday
- 5 => { map {$_=>1} 20 }, #victoria day
+ 2016 => { 2 => { map {$_=>1} 15 }, #family day
+ 3 => { map {$_=>1} 25 }, #good friday
+ 3 => { map {$_=>1} 28 }, #easter monday
+ 5 => { map {$_=>1} 23 }, #victoria day
7 => { map {$_=>1} 1 }, #canada day
- 8 => { map {$_=>1} 5 }, #First Monday of August Civic Holiday
- 9 => { map {$_=>1} 2 }, #labour day
- 10 => { map {$_=>1} 14 }, #thanksgiving
+ 8 => { map {$_=>1} 1 }, #First Monday of August Civic Holiday
+ 9 => { map {$_=>1} 5 }, #labour day
+ 10 => { map {$_=>1} 10 }, #thanksgiving
},
- 2014 => { 2 => { map {$_=>1} 17 }, #family day
- 4 => { map {$_=>1} 18 }, #good friday
- 4 => { map {$_=>1} 21 }, #easter monday
- 5 => { map {$_=>1} 19 }, #victoria day
+ 2017 => { 2 => { map {$_=>1} 20 }, #family day
+ 4 => { map {$_=>1} 14 }, #good friday
+ 4 => { map {$_=>1} 17 }, #easter monday
+ 5 => { map {$_=>1} 22 }, #victoria day
7 => { map {$_=>1} 1 }, #canada day
- 8 => { map {$_=>1} 4 }, #First Monday of August Civic Holiday
- 9 => { map {$_=>1} 1 }, #labour day
- 10 => { map {$_=>1} 13 }, #thanksgiving
- },
- 2015 => { 2 => { map {$_=>1} 16 }, #family day
- 4 => { map {$_=>1} 3 }, #good friday
- 4 => { map {$_=>1} 6 }, #easter monday
- 5 => { map {$_=>1} 18 }, #victoria day
- 7 => { map {$_=>1} 1 }, #canada day
- 8 => { map {$_=>1} 3 }, #First Monday of August Civic Holiday
- 9 => { map {$_=>1} 7 }, #labour day
- 10 => { map {$_=>1} 12 }, #thanksgiving
+ 8 => { map {$_=>1} 7 }, #First Monday of August Civic Holiday
+ 9 => { map {$_=>1} 4 }, #labour day
+ 10 => { map {$_=>1} 9 }, #thanksgiving
},
);
+sub is_holiday {
+ my $dt = shift;
+ return 1 if exists( $holiday_yearly{$dt->month} )
+ and exists( $holiday_yearly{$dt->month}{$dt->day} );
+ return 1 if exists( $holiday{$dt->year} )
+ and exists( $holiday{$dt->year}{$dt->month} )
+ and exists( $holiday{$dt->year}{$dt->month}{$dt->day} );
+ return 0;
+}
+
%export_info = (
init => sub {
} else {
@config = $conf->config('batchconfig-eft_canada');
}
- # SFTP login, password, trans code, delay time
- ($trans_code) = $config[2];
+ # SFTP login, password, business and personal trans codes, delay time
+ ($business_trans_code) = $config[2];
+ ($personal_trans_code) = $config[3];
- $process_date = time2str('%D', process_date($conf, $agentnum));
+ my ($process_date) = process_dates($conf, $agentnum);
+ $req_date = $process_date->strftime('%D');
},
delimiter => '', # avoid blank lines for header/footer
# company + empty or first + last
my $company = sprintf('%.64s', $cust_pay_batch->cust_main->company);
if ( $company ) {
- push @fields, $company, ''
+ push @fields, 'Business';
+ push @fields, $company, '';
+ $trans_code = $business_trans_code;
}
else {
+ push @fields, 'Personal';
push @fields, map { sprintf('%.64s', $_) }
$cust_pay_batch->first, $cust_pay_batch->last;
+ $trans_code = $personal_trans_code;
}
my ($account, $aba) = split('@', $cust_pay_batch->payinfo);
my($bankno, $branch);
$account,
sprintf('%.02f', $cust_pay_batch->amount);
# DB = debit
- push @fields, 'DB', $trans_code, $process_date;
+ push @fields, 'DB', $trans_code, $req_date;
push @fields, $cust_pay_batch->paybatchnum; # reference
# strip illegal characters that might occur in customer name
s/[,|']//g foreach @fields; # better substitution for these?
my $pay_batch = shift;
my $conf = FS::Conf->new;
my $agentnum = $pay_batch->agentnum;
- my $tomorrow = (localtime(time))[2] >= 10;
- my $process_date = process_date($conf, $agentnum);
- my $upload_date = $process_date - 86400;
+ my ($process_date, $upload_date) = process_dates($conf, $agentnum);
my $date_format = $conf->config('date_format') || '%D';
+ my $days_until_upload = $upload_date->delta_days(DateTime->now);
my $note = '';
- if ( $process_date - time < 86400*2 ) {
- $note = 'Upload this file before 11:00 AM '.
- ($tomorrow ? 'tomorrow' : 'today') .
- ' (' . time2str($date_format, $upload_date) . '). ';
+ if ( $days_until_upload->days == 0 ) {
+ $note = 'Upload this file before 11:00 AM today'.
+ ' (' . $upload_date->strftime($date_format) . '). ';
+ } elsif ( $days_until_upload->days == 1 ) {
+ $note = 'Upload this file before 11:00 AM tomorrow'.
+ ' (' . $upload_date->strftime($date_format) . '). ';
} else {
$note = 'Upload this file before 11:00 AM on '.
- time2str($date_format, $upload_date) . '. ';
+ $upload_date->strftime($date_format) . '. ';
}
$note .= 'Payments will be processed on '.
- time2str($date_format, $process_date) . '.';
+ $process_date->strftime($date_format) . '.';
$note;
}
-sub process_date {
+sub process_dates { # returns both process and upload dates
my ($conf, $agentnum) = @_;
my @config;
if ( $conf->exists('batch-spoolagent') ) {
} else {
@config = $conf->config('batchconfig-eft_canada');
}
-
- my $process_delay = $config[3] || 1;
-
- if ( (localtime(time))[2] >= 10 and $process_delay == 1 ) {
- # If downloading the batch after 10:00 local time, it likely won't make
- # the cutoff for next-day turnaround, and EFT will reject it.
- $process_delay++;
+
+ my $process_delay = $config[4] || 1;
+
+ my $ut = DateTime->now; # the latest time we assume the user
+ # could upload the file
+ $ut->truncate(to => 'day')->set_hour(10); # is 10 AM on whatever day
+ if ( $ut < DateTime->now ) {
+ # then we would submit the file today but it's already too late
+ $ut->add(days => 1);
}
+ while ( $ut->day_of_week == 6 # Saturday
+ or $ut->day_of_week == 7 # Sunday
+ or is_holiday($ut)
+ )
+ {
+ $ut->add(days => 1);
+ }
+ # $ut is now the latest time that the user can upload the file.
+
+ # that time, plus the process delay, is the _earliest_ process date we can
+ # request. if that's on a weekend or holiday, the process date has to be
+ # later.
- my $pt = time + ($process_delay * 86400);
- my @lt = localtime($pt);
- while ( $lt[6] == 0 #Sunday
- || $lt[6] == 6 #Saturday
- || $holiday_yearly{ $lt[4]+1 }{ $lt[3] }
- || $holiday{ $lt[5]+1900 }{ $lt[4]+1 }{ $lt[3] }
+ my $pt = $ut->clone();
+ $pt->add(days => $process_delay);
+ while ( $pt->day_of_week == 6
+ or $pt->day_of_week == 7
+ or is_holiday($pt)
)
{
- $pt += 86400;
- @lt = localtime($pt);
+ $pt->add(days => 1);
}
- $pt;
+ ($pt, $ut);
}
1;
projects / freeside.git / blobdiff