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 283-288 Link Here
283
283
284
    [% UNLESS ( multi_hold ) %]
284
    [% UNLESS ( multi_hold ) %]
285
        <h2>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %]by [% biblio.author | html %][% END %]</h2>
285
        <h2>Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %]by [% biblio.author | html %][% END %]</h2>
286
287
        [% IF ( patron && reserve_charge ) %]
288
            <div class="alert alert-warning" id="reserve_fee">
289
                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
290
                    <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
291
                    item
292
                [% ELSE %]
293
                    <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
294
                [% END %]
295
            </div>
296
        [% END %]
286
    [% ELSE %]
297
    [% ELSE %]
287
        <h2>
298
        <h2>
288
            [% IF ( patron ) %]
299
            [% IF ( patron ) %]
Lines 461-466 Link Here
461
                                        [% IF ( biblioloo.publicationyear ) %]
472
                                        [% IF ( biblioloo.publicationyear ) %]
462
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
473
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
463
                                        [% END %]
474
                                        [% END %]
475
                                        [% IF ( patron && biblioloo.reserve_charge ) %]
476
                                            <li>
477
                                                <span class="label">Hold fee:</span>
478
                                                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
479
                                                    [% biblioloo.reserve_charge | $Price %]
480
                                                    (charged when collected)
481
                                                [% ELSE %]
482
                                                    [% biblioloo.reserve_charge | $Price %]
483
                                                    (charged when placed)
484
                                                [% END %]
485
                                            </li>
486
                                        [% END %]
464
                                    </ul>
487
                                    </ul>
465
                                    [% IF ( biblioloo.warn ) %]
488
                                    [% IF ( biblioloo.warn ) %]
466
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
489
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
Lines 1209-1214 Link Here
1209
                                        [% IF ( biblioloo.publicationyear ) %]
1232
                                        [% IF ( biblioloo.publicationyear ) %]
1210
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
1233
                                            <li> <span class="label">Publication year:</span> [% biblioloo.publicationyear | html %] </li>
1211
                                        [% END %]
1234
                                        [% END %]
1235
                                        [% IF ( patron && biblioloo.reserve_charge ) %]
1236
                                            <li>
1237
                                                <span class="label">Hold fee:</span>
1238
                                                [% IF Koha.Preference('HoldFeeMode') == 'any_time_is_collected' %]
1239
                                                    [% biblioloo.reserve_charge | $Price %]
1240
                                                    (charged when collected)
1241
                                                [% ELSE %]
1242
                                                    [% biblioloo.reserve_charge | $Price %]
1243
                                                    (charged when placed)
1244
                                                [% END %]
1245
                                            </li>
1246
                                        [% END %]
1212
                                    </ul>
1247
                                    </ul>
1213
                                    [% IF ( biblioloo.warn ) %]
1248
                                    [% IF ( biblioloo.warn ) %]
1214
                                        <span class="not_holdable" title="[% biblioloo.biblionumber | html %]"></span>
1249
                                        <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 795-800 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
795
        $biblioloopiter{rank}         = $fixedRank;
795
        $biblioloopiter{rank}         = $fixedRank;
796
        $biblioloopiter{reserveloop}  = \@reserveloop;
796
        $biblioloopiter{reserveloop}  = \@reserveloop;
797
797
798
        # Pass through any reserve charge
799
        if ($patron) {
800
            $biblioloopiter{reserve_charge} = GetReserveFee( $patron->borrowernumber, $biblionumber );
801
        }
802
798
        if (@reserveloop) {
803
        if (@reserveloop) {
799
            $template->param( reserveloop => \@reserveloop );
804
            $template->param( reserveloop => \@reserveloop );
800
        }
805
        }
Lines 824-829 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
824
unless ($multi_hold) {
829
unless ($multi_hold) {
825
    my $biblio = Koha::Biblios->find( $biblionumbers[0] );
830
    my $biblio = Koha::Biblios->find( $biblionumbers[0] );
826
    $template->param( biblio => $biblio );
831
    $template->param( biblio => $biblio );
832
833
    # Pass through any reserve charge for single holds
834
    if ($borrowernumber_hold) {
835
        $template->param( reserve_charge => GetReserveFee( $borrowernumber_hold, $biblionumbers[0] ) );
836
    }
827
}
837
}
828
$template->param( biblionumbers => \@biblionumbers );
838
$template->param( biblionumbers => \@biblionumbers );
829
839
830
- 

Return to bug 40769