View | Details | Raw Unified | Return to bug 7198
Collapse All | Expand All

(-)a/circ/overdue.pl (-7 / +10 lines)
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},                        
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-2 / +1 lines)
Lines 116-122 Link Here
116
<tbody>[% FOREACH overdueloo IN overdueloop %]
116
<tbody>[% FOREACH overdueloo IN overdueloop %]
117
    <tr>
117
    <tr>
118
        <td>[% overdueloo.duedate %]</td>
118
        <td>[% overdueloo.duedate %]</td>
119
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.name %]</a>
119
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %] [% overdueloo.firstname %]</a>
120
        [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
120
        [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
121
        [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
121
        [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
122
        <td>[% overdueloo.branchcode %]</td>
122
        <td>[% overdueloo.branchcode %]</td>
123
- 

Return to bug 7198