improve echeck validation for canada, deprecate echeck-nonus and cust_main-require...

[freeside.git] / httemplate / misc / process / cancel_pkg.html

diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index d265c18..a4371e6 100755 (executable)
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -1,4 +1,4 @@
-<% header("Package $past{$method}") %>
+<% header(emt("Package $past{$method}")) %>
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();
   </SCRIPT>
@@ -44,16 +44,13 @@ my $date = time;
 if ($method eq 'expire' || $method eq 'adjourn'){
   #untaint date
   $date = $cgi->param('date');
-  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+  parse_datetime($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
   $date = $1;
+  $method = ($method eq 'expire') ? 'cancel' : 'suspend';
 }
 
 my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );
 
-#my $otaker = $FS::CurrentUser::CurrentUser->name;
-#$otaker = $FS::CurrentUser::CurrentUser->username
-#  if ($otaker eq "User, Legacy");
-
 if ($reasonnum == -1) {
   $reasonnum = {
     'typenum' => scalar( $cgi->param('newreasonnumT') ),
@@ -61,15 +58,7 @@ if ($reasonnum == -1) {
   };
 }
 
-my $error;
-if ($method eq 'expire' || $method eq 'adjourn'){
-  my %hash = $cust_pkg->hash;
-  $hash{$method} = $date;
-  my $new = new FS::cust_pkg \%hash;
-  $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
-} else {
-  $error = $cust_pkg->$method( 'reason' => $reasonnum );
-}
+my $error = $cust_pkg->$method( 'reason' => $reasonnum, 'date' => $date );
 
 if ($error) {
   $cgi->param('error', $error);