2 files changed, 4 insertions, 13 deletions
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index bfb0893e9..e61000618 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -42,12 +42,12 @@
 %}
 %
 
-<% include('/elements/tr-select-reason.html', 'reasonnum', $class) %>
+<% include('/elements/tr-select-reason.html', 'reasonnum', $class, '', '', '', 'document.sc_popup.submit' ) %>
 
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" VALUE="<% $submit %>">
+<INPUT TYPE="submit" NAME="submit" VALUE="<% $submit %>" disabled='true'>
 
 </FORM>
 </BODY>
diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index b53809854..01433a3dc 100755
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -55,22 +55,13 @@
 %}
 %
 %unless ($error) {
-%  my $cust_pkg_reason = new FS::cust_pkg_reason({ 'pkgnum'      => $pkgnum,
-%                                                  'reasonnum'   => $reasonnum,
-%  						   'otaker'      => $otaker,
-%						   'date'        => $date,
-%						  });
-%  $error = $cust_pkg_reason->insert;
-%}
-%
-%unless ($error) {
 %  if ($method eq 'expire'){
 %    my %hash = $cust_pkg->hash;
 %    $hash{'expire'}=$date;
 %    my $new = new FS::cust_pkg (\%hash);
-%    $error = $new->replace($cust_pkg);
+%    $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
 %  }else{
-%    $error = $cust_pkg->$method
+%    $error = $cust_pkg->$method( 'reason' => $reasonnum );
 %  }
 %}
 %