<TD ALIGN="right">Reason</TD>
<TD>
<SELECT id="<% $name %>" name="<% $name %>" onFocus="sh_add<% $name %>()" onChange="sh_add<% $name %>()">
-% my @reasons = qsearch( { table =>'reason',
-% hashref => {},
-% extra_sql => $extra_sql,
-% addl_from => 'LEFT JOIN reason_type ON reason_type.typenum = reason.reason_type',
-% });
<OPTION VALUE="" <% ($init_reason eq "") ? 'SELECTED' : '' %>>Select Reason...</OPTION>
% foreach my $reason (@reasons) {
- <OPTION VALUE="<% $reason->reasonnum %>" <% ($init_reason == $reason->reasonnum) ? 'SELECTED' : '' %>><% $reason->reason %></OPTION>
+ <OPTION VALUE="<% $reason->reasonnum %>" <% ($init_reason == $reason->reasonnum) ? 'SELECTED' : '' %>><% $reason->reasontype->type %> : <% $reason->reason %></OPTION>
% }
% if ($curuser->access_right($access_right)) {
<OPTION VALUE="-1" <% ($init_reason == -1) ? 'SELECTED' : '' %>>Add new reason</OPTION>
</TD>
<TD>
<SELECT id="new<% $name %>T" name="new<% $name %>T" disabled="<% $disabled %>" style="display:<% $display %>">
-% for my $type (@types){
+% for my $type (@types) {
<OPTION VALUE="<% $type->typenum %>" <% ($init_type == $type->typenum) ? 'SELECTED' : '' %>><% $type->type %></OPTION>
% }
</SELECT>
<%init>
my($name, $class, $init_reason, $init_type, $init_newreason, $controlledbutton) = @_;
-my($extra_sql, $curuser, $access_right, $display, $disabled);
+my($access_right, $display, $disabled);
if ($class eq 'C') {
$access_right='Add on-the-fly cancel reason';
$disabled = 'true';
}
-$extra_sql = "WHERE class = '$class' and (disabled = '' OR disabled is NULL) ".
- "ORDER BY reason_type";
-$curuser = $FS::CurrentUser::CurrentUser;
+my $extra_sql =
+ "WHERE class = '$class' and (disabled = '' OR disabled is NULL)";
-</%init>
+my @reasons = qsearch({
+ table => 'reason',
+ hashref => {},
+ extra_sql => $extra_sql,
+ addl_from => 'LEFT JOIN reason_type '.
+ ' ON reason_type.typenum = reason.reason_type',
+ order_by => 'reason_type.type ASC, reason.reason ASC',
+});
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+</%init>