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

(-)a/circ/returns.pl (-1 / +3 lines)
Lines 44-49 use C4::Reserves; Link Here
44
use C4::Biblio;
44
use C4::Biblio;
45
use C4::Items;
45
use C4::Items;
46
use C4::Members;
46
use C4::Members;
47
use C4::Members::Messaging;
47
use C4::Branch; # GetBranches GetBranchName
48
use C4::Branch; # GetBranches GetBranchName
48
use C4::Koha;   # FIXME : is it still useful ?
49
use C4::Koha;   # FIXME : is it still useful ?
49
use C4::RotatingCollections;
50
use C4::RotatingCollections;
Lines 428-434 if ( $messages->{'ResFound'}) { Link Here
428
    my $reserve    = $messages->{'ResFound'};
429
    my $reserve    = $messages->{'ResFound'};
429
    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
430
    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
430
    my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
431
    my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
431
432
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
432
    if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
433
    if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
433
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
434
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
434
            $template->param(
435
            $template->param(
Lines 467-472 if ( $messages->{'ResFound'}) { Link Here
467
            borrowernumber => $reserve->{'borrowernumber'},
468
            borrowernumber => $reserve->{'borrowernumber'},
468
            itemnumber     => $reserve->{'itemnumber'},
469
            itemnumber     => $reserve->{'itemnumber'},
469
            reservenotes   => $reserve->{'reservenotes'},
470
            reservenotes   => $reserve->{'reservenotes'},
471
            bormessagepref => $holdmsgpreferences->{'transports'},
470
        );
472
        );
471
    } # else { ; }  # error?
473
    } # else { ; }  # error?
472
}
474
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +11 lines)
Lines 237-242 $(document).ready(function () { Link Here
237
            [% borcity %] [% borzip %]</li>
237
            [% borcity %] [% borzip %]</li>
238
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
238
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
239
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
239
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
240
           [% IF ( bormessagepref ) %]
241
               <li>Patron is notified:
242
               [% FOREACH key IN bormessagepref.keys %]
243
                   [% IF ( key == 'email' ) %] Email. [% END %]
244
                   [% IF ( key == 'phone' ) %] Phone. [% END %]
245
                   [% IF ( key == 'sms' ) %] SMS. [% END %]
246
               [% END %]
247
               </li>
248
           [% ELSE %]
249
               <li>Patron is not notified</li>
250
           [% END %]
240
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
251
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
241
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
252
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
242
		[% IF ( transfertodo ) %]
253
		[% IF ( transfertodo ) %]
243
- 

Return to bug 9543