Lines 236-242
if ($noreport) {
Link Here
|
236 |
|
236 |
|
237 |
my $strsth="SELECT date_due, |
237 |
my $strsth="SELECT date_due, |
238 |
borrowers.title as borrowertitle, |
238 |
borrowers.title as borrowertitle, |
239 |
concat(surname,' ', firstname) as borrower, |
239 |
borrowers.surname, |
|
|
240 |
borrowers.firstname, |
240 |
borrowers.streetnumber, |
241 |
borrowers.streetnumber, |
241 |
borrowers.streettype, |
242 |
borrowers.streettype, |
242 |
borrowers.address, |
243 |
borrowers.address, |
Lines 281-291
if ($noreport) {
Link Here
|
281 |
$strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist; |
282 |
$strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist; |
282 |
$strsth =~ s/WHERE 1=1/WHERE 0=1/ if $have_pattr_filter_data && !$bnlist; # no match if no borrowers matched patron attrs |
283 |
$strsth =~ s/WHERE 1=1/WHERE 0=1/ if $have_pattr_filter_data && !$bnlist; # no match if no borrowers matched patron attrs |
283 |
$strsth.=" ORDER BY " . ( |
284 |
$strsth.=" ORDER BY " . ( |
284 |
($order eq "borrower" or $order eq "borrower desc") ? "$order, date_due" : |
285 |
($order eq "borrower") ? "surname, firstname, date_due" : |
285 |
($order eq "title" or $order eq "title desc") ? "$order, date_due, borrower" : |
286 |
($order eq "borrower desc") ? "surname desc, firstname desc, date_due" : |
286 |
($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, borrower" : |
287 |
($order eq "title" or $order eq "title desc") ? "$order, date_due, surname, firstname" : |
287 |
($order eq "date_due desc") ? "date_due DESC, borrower" : |
288 |
($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, surname, firstname" : |
288 |
"date_due, borrower" # default sort order |
289 |
($order eq "date_due desc") ? "date_due DESC, surname, firstname" : |
|
|
290 |
"date_due, surname, firstname" # default sort order |
289 |
); |
291 |
); |
290 |
$template->param(sql=>$strsth); |
292 |
$template->param(sql=>$strsth); |
291 |
my $sth=$dbh->prepare($strsth); |
293 |
my $sth=$dbh->prepare($strsth); |
Lines 313-319
if ($noreport) {
Link Here
|
313 |
barcode => $data->{barcode}, |
315 |
barcode => $data->{barcode}, |
314 |
itemnum => $data->{itemnumber}, |
316 |
itemnum => $data->{itemnumber}, |
315 |
borrowertitle => $data->{borrowertitle}, |
317 |
borrowertitle => $data->{borrowertitle}, |
316 |
name => $data->{borrower}, |
318 |
surname => $data->{surname}, |
|
|
319 |
firstname => $data->{firstname}, |
317 |
streetnumber => $data->{streetnumber}, |
320 |
streetnumber => $data->{streetnumber}, |
318 |
streettype => $data->{streettype}, |
321 |
streettype => $data->{streettype}, |
319 |
address => $data->{address}, |
322 |
address => $data->{address}, |