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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (+35 lines)
Lines 285-290 Link Here
285
285
286
    [% UNLESS ( multi_hold ) %]
286
    [% UNLESS ( multi_hold ) %]
287
        <h2>Place hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %]by [% biblio.author | html %][% END %]</h2>
287
        <h2>Place hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %]by [% biblio.author | html %][% END %]</h2>
288
289
        [% IF ( patron && reserve_charge ) %]
290
            <div class="alert alert-warning" id="reserve_fee">
291
                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
292
                    <strong>Note:</strong> [% INCLUDE 'patron-title.inc' patron = patron no_title = 1 no_cardnumber = 1 hide_patron_infos_if_needed = 1 %] will be charged a hold fee of [% reserve_charge | $Price %] when they collect this
293
                    item
294
                [% ELSE %]
295
                    <strong>Note:</strong> [% INCLUDE 'patron-title.inc' patron = patron no_title = 1 no_cardnumber = 1 hide_patron_infos_if_needed = 1 %] will be charged a hold fee of [% reserve_charge | $Price %] for placing this hold
296
                [% END %]
297
            </div>
298
        [% END %]
288
    [% ELSE %]
299
    [% ELSE %]
289
        <h2>
300
        <h2>
290
            [% IF ( patron ) %]
301
            [% IF ( patron ) %]
Lines 463-468 Link Here
463
                                        [% IF ( biblioloo.publicationyear ) %]
474
                                        [% IF ( biblioloo.publicationyear ) %]
464
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
475
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
465
                                        [% END %]
476
                                        [% END %]
477
                                        [% IF ( patron && biblioloo.reserve_charge ) %]
478
                                            <li>
479
                                                <span class="label">Hold fee:</span>
480
                                                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
481
                                                    [% biblioloo.reserve_charge | $Price %]
482
                                                    (charged when collected)
483
                                                [% ELSE %]
484
                                                    [% biblioloo.reserve_charge | $Price %]
485
                                                    (charged when placed)
486
                                                [% END %]
487
                                            </li>
488
                                        [% END %]
466
                                    </ul>
489
                                    </ul>
467
                                    [% IF ( biblioloo.warn ) %]
490
                                    [% IF ( biblioloo.warn ) %]
468
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
491
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
Lines 1211-1216 Link Here
1211
                                        [% IF ( biblioloo.publicationyear ) %]
1234
                                        [% IF ( biblioloo.publicationyear ) %]
1212
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
1235
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
1213
                                        [% END %]
1236
                                        [% END %]
1237
                                        [% IF ( patron && biblioloo.reserve_charge ) %]
1238
                                            <li>
1239
                                                <span class="label">Hold fee:</span>
1240
                                                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
1241
                                                    [% biblioloo.reserve_charge | $Price %]
1242
                                                    (charged when collected)
1243
                                                [% ELSE %]
1244
                                                    [% biblioloo.reserve_charge | $Price %]
1245
                                                    (charged when placed)
1246
                                                [% END %]
1247
                                            </li>
1248
                                        [% END %]
1214
                                    </ul>
1249
                                    </ul>
1215
                                    [% IF ( biblioloo.warn ) %]
1250
                                    [% IF ( biblioloo.warn ) %]
1216
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
1251
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
(-)a/reserve/request.pl (-2 / +11 lines)
Lines 33-39 use Date::Calc qw( Date_to_Days ); Link Here
33
use C4::Output      qw( output_html_with_http_headers );
33
use C4::Output      qw( output_html_with_http_headers );
34
use C4::Auth        qw( get_template_and_user );
34
use C4::Auth        qw( get_template_and_user );
35
use C4::Reserves
35
use C4::Reserves
36
    qw( AlterPriority ToggleLowestPriority CanBookBeReserved GetMaxPatronHoldsForRecord CanItemBeReserved IsAvailableForItemLevelRequest );
36
    qw( AlterPriority ToggleLowestPriority CanBookBeReserved GetMaxPatronHoldsForRecord CanItemBeReserved IsAvailableForItemLevelRequest GetReserveFee );
37
use C4::Items       qw( get_hostitemnumbers_of );
37
use C4::Items       qw( get_hostitemnumbers_of );
38
use C4::Koha        qw( getitemtypeimagelocation );
38
use C4::Koha        qw( getitemtypeimagelocation );
39
use C4::Serials     qw( CountSubscriptionFromBiblionumber );
39
use C4::Serials     qw( CountSubscriptionFromBiblionumber );
Lines 769-774 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
769
        $biblioloopiter{rank}         = $fixedRank;
769
        $biblioloopiter{rank}         = $fixedRank;
770
        $biblioloopiter{reserveloop}  = \@reserveloop;
770
        $biblioloopiter{reserveloop}  = \@reserveloop;
771
771
772
        # Pass through any reserve charge
773
        if ($patron) {
774
            $biblioloopiter{reserve_charge} = GetReserveFee( $patron->borrowernumber, $biblionumber );
775
        }
776
772
        if (@reserveloop) {
777
        if (@reserveloop) {
773
            $template->param( reserveloop => \@reserveloop );
778
            $template->param( reserveloop => \@reserveloop );
774
        }
779
        }
Lines 798-803 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
798
unless ($multi_hold) {
803
unless ($multi_hold) {
799
    my $biblio = Koha::Biblios->find( $biblionumbers[0] );
804
    my $biblio = Koha::Biblios->find( $biblionumbers[0] );
800
    $template->param( biblio => $biblio );
805
    $template->param( biblio => $biblio );
806
807
    # Pass through any reserve charge for single holds
808
    if ($borrowernumber_hold) {
809
        $template->param( reserve_charge => GetReserveFee( $borrowernumber_hold, $biblionumbers[0] ) );
810
    }
801
}
811
}
802
$template->param( biblionumbers => \@biblionumbers );
812
$template->param( biblionumbers => \@biblionumbers );
803
813
804
- 

Return to bug 40769