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

(-)a/circ/waitingreserves.pl (-2 / +6 lines)
Lines 87-92 my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch( Link Here
87
# get reserves for the branch we are logged into, or for all branches
87
# get reserves for the branch we are logged into, or for all branches
88
88
89
my $today = Date_to_Days(&Today);
89
my $today = Date_to_Days(&Today);
90
my $max_pickup_delay = C4::Context->preference('ReservesMaxPickUpDelay');
91
$max_pickup_delay-- if C4::Context->preference('ExpireReservesMaxPickUpDelay');
92
90
foreach my $num (@getreserves) {
93
foreach my $num (@getreserves) {
91
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
94
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
92
95
Lines 107-115 foreach my $num (@getreserves) { Link Here
107
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
110
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
108
    $getreserv{'waitingdate'} = $num->{'waitingdate'};
111
    $getreserv{'waitingdate'} = $num->{'waitingdate'};
109
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
112
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
113
110
    ( $waiting_year, $waiting_month, $waiting_day ) =
114
    ( $waiting_year, $waiting_month, $waiting_day ) =
111
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
115
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
112
        C4::Context->preference('ReservesMaxPickUpDelay'));
116
        $max_pickup_delay);
113
    my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day );
117
    my $calcDate = Date_to_Days( $waiting_year, $waiting_month, $waiting_day );
114
118
115
    $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
119
    $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
Lines 159-165 $template->param( Link Here
159
    overloop    => \@overloop,
163
    overloop    => \@overloop,
160
    overcount   => $overcount,
164
    overcount   => $overcount,
161
    show_date   => format_date(C4::Dates->today('iso')),
165
    show_date   => format_date(C4::Dates->today('iso')),
162
    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
166
    ReservesMaxPickUpDelay => $max_pickup_delay,
163
);
167
);
164
168
165
if ($cancelall) {
169
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