my $query = $cgi->param('browse');
if ( $query eq 'custnum' ) {
$sortby=\*custnum_sort;
- $orderby = 'ORDER BY custnum';
+ $orderby = "ORDER BY custnum";
} elsif ( $query eq 'last' ) {
$sortby=\*last_sort;
- $orderby = 'ORDER BY last';
+ $orderby = "ORDER BY LOWER(last || ' ' || first)";
} elsif ( $query eq 'company' ) {
$sortby=\*company_sort;
- $orderby = 'ORDER BY company';
+ $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
} else {
die "unknown browse field $query";
}
} else {
$sortby = \*last_sort; #??
- $orderby = 'ORDER BY last'; #??
+ $orderby = "ORDER BY LOWER(last || ' ' || first)"; #??
if ( $cgi->param('otaker_on') ) {
$cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
$search{otaker} = $1;
} else {
$view = $p. 'view/cust_main.cgi?'. $custnum;
}
+ my $pcompany = $company
+ ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
+ : '<FONT SIZE=-1> </FONT>';
print <<END;
<TR>
<TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
<TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
+ <TD ROWSPAN=$rowspan>$pcompany</TD>
END
if ( defined dbdef->table('cust_main')->column('ship_last') ) {
my($ship_last,$ship_first,$ship_company)=(
$cust_main->ship_last ? $cust_main->ship_first : $cust_main->first,
$cust_main->ship_last ? $cust_main->ship_company : $cust_main->company,
);
-print <<END;
+ my $pship_company = $ship_company
+ ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
+ : '<FONT SIZE=-1> </FONT>';
+ print <<END;
<TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
- <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A></TD>
+ <TD ROWSPAN=$rowspan>$pship_company</A></TD>
END
}
#
sub last_sort {
- $a->getfield('last') cmp $b->getfield('last');
+ lc($a->getfield('last')) cmp lc($b->getfield('last'))
+ || lc($a->first) cmp lc($b->first);
}
sub company_sort {
return -1 if $a->company && ! $b->company;
return 1 if ! $a->company && $b->company;
- $a->getfield('company') cmp $b->getfield('company');
+ lc($a->company) cmp lc($b->company)
+ || lc($a->getfield('last')) cmp lc($b->getfield('last'))
+ || lc($a->first) cmp lc($b->first);;
}
sub custnum_sort {