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

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