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

(-)a/circ/waitingreserves.pl (-2 / +6 lines)
Lines 86-91 my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch( Link Here
86
# get reserves for the branch we are logged into, or for all branches
86
# get reserves for the branch we are logged into, or for all branches
87
87
88
my $today = Date_to_Days(&Today);
88
my $today = Date_to_Days(&Today);
89
my $max_pickup_delay = C4::Context->preference('ReservesMaxPickUpDelay');
90
$max_pickup_delay-- if C4::Context->preference('ExpireReservesMaxPickUpDelay');
91
89
foreach my $num (@getreserves) {
92
foreach my $num (@getreserves) {
90
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
93
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
91
94
Lines 106-114 foreach my $num (@getreserves) { Link Here
106
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
109
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
107
    $getreserv{'waitingdate'} = $num->{'waitingdate'};
110
    $getreserv{'waitingdate'} = $num->{'waitingdate'};
108
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
111
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
112
109
    ( $waiting_year, $waiting_month, $waiting_day ) =
113
    ( $waiting_year, $waiting_month, $waiting_day ) =
110
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
114
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
111
        C4::Context->preference('ReservesMaxPickUpDelay'));
115
        $max_pickup_delay);
112
    my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day );
116
    my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day );
113
117
114
    $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
118
    $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
Lines 158-164 $template->param( Link Here
158
    overloop    => \@overloop,
162
    overloop    => \@overloop,
159
    overcount   => $overcount,
163
    overcount   => $overcount,
160
    show_date   => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
164
    show_date   => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
161
    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
165
    ReservesMaxPickUpDelay => $max_pickup_delay,
162
);
166
);
163
167
164
if ($cancelall) {
168
if ($cancelall) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-3 / +6 lines)
Lines 71-78 Link Here
71
    [% ELSE %]
71
    [% ELSE %]
72
        <div id="resultlist" class="toptabs">
72
        <div id="resultlist" class="toptabs">
73
            <ul>
73
            <ul>
74
                <li><a href="#holdswaiting">[% reservecount %] Hold(s) waiting</a></li>
74
                <li><a href="#holdswaiting">Holds waiting: [% reservecount %]</a></li>
75
                <li><a href="#holdsover">[% overcount %] Hold(s) over</a></li>
75
                <li>
76
                    <a href="#holdsover">
77
                        Holds waiting over [% ReservesMaxPickUpDelay %] days: [% overcount %]
78
                    </a>
79
                </li>
76
            </ul>
80
            </ul>
77
            <div id="holdswaiting">
81
            <div id="holdswaiting">
78
            [% IF ( reserveloop ) %]
82
            [% IF ( reserveloop ) %]
79
- 

Return to bug 14134