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

(-)a/circ/returns.pl (+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 415-420 if ( $messages->{'ResFound'}) { Link Here
415
    my $reserve    = $messages->{'ResFound'};
416
    my $reserve    = $messages->{'ResFound'};
416
    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
417
    my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
417
    my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
418
    my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
419
    my $holdmsgpreferences =  C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name   => 'Hold_Filled' } );
418
420
419
    if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
421
    if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
420
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
422
        if ( $reserve->{'ResFound'} eq "Waiting" ) {
Lines 454-459 if ( $messages->{'ResFound'}) { Link Here
454
            borrowernumber => $reserve->{'borrowernumber'},
456
            borrowernumber => $reserve->{'borrowernumber'},
455
            itemnumber     => $reserve->{'itemnumber'},
457
            itemnumber     => $reserve->{'itemnumber'},
456
            reservenotes   => $reserve->{'reservenotes'},
458
            reservenotes   => $reserve->{'reservenotes'},
459
            bormessagepref => $holdmsgpreferences->{'transports'},
457
        );
460
        );
458
    } # else { ; }  # error?
461
    } # else { ; }  # error?
459
}
462
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +11 lines)
Lines 212-217 $(document).ready(function () { Link Here
212
            [% borcity %] [% borzip %]</li>
212
            [% borcity %] [% borzip %]</li>
213
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
213
           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
214
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
214
		   [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
215
           [% IF ( bormessagepref ) %]
216
               <li>Patron is notified:
217
               [% FOREACH key IN bormessagepref.keys %]
218
                   [% IF ( key == 'email' ) %] Email. [% END %]
219
                   [% IF ( key == 'phone' ) %] Phone. [% END %]
220
                   [% IF ( key == 'sms' ) %] SMS. [% END %]
221
               [% END %]
222
               </li>
223
           [% ELSE %]
224
               <li>Patron is not notified</li>
225
           [% END %]
215
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
226
[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
216
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
227
[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
217
		[% IF ( transfertodo ) %]
228
		[% IF ( transfertodo ) %]
218
- 

Return to bug 9543