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

(-)a/circ/circulation.pl (+3 lines)
Lines 453-462 if ($patron) { Link Here
453
        holds_count  => $holds->count(),
453
        holds_count  => $holds->count(),
454
        WaitingHolds => $waiting_holds,
454
        WaitingHolds => $waiting_holds,
455
    );
455
    );
456
456
    if ( C4::Context->preference('UseRecalls') ) {
457
    if ( C4::Context->preference('UseRecalls') ) {
458
        my $waiting_recalls = $patron->recalls->search({ status => 'waiting' });
457
        $template->param(
459
        $template->param(
458
            recalls => $patron->recalls->filter_by_current->search({},{ order_by => { -asc => 'created_date' } }),
460
            recalls => $patron->recalls->filter_by_current->search({},{ order_by => { -asc => 'created_date' } }),
459
            specific_patron => 1,
461
            specific_patron => 1,
462
            waiting_recalls => $waiting_recalls,
460
        );
463
        );
461
    }
464
    }
462
}
465
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (+57 lines)
Lines 129-134 Link Here
129
129
130
[% END # /F ( has_modifications || warndeparture... %]
130
[% END # /F ( has_modifications || warndeparture... %]
131
131
132
[% IF waiting_recalls.count %]
133
    <div id="recallswaiting" class="circmessage">
134
        [% SET waiting_here = 0 %]
135
        [% SET waiting_elsewhere = 0 %]
136
        [% FOREACH w IN waiting_recalls %]
137
            [% IF ( w.pickup_library_id == Branches.GetLoggedInBranchcode()  ) %]
138
                [% waiting_here = waiting_here + 1 %]
139
            [% ELSE %]
140
                [% waiting_elsewhere = waiting_elsewhere + 1 %]
141
            [% END %]
142
        [% END %]
143
144
        [% IF ( waiting_here > 0 ) %]
145
            <h4>Recalls waiting here ([% waiting_here | html %])</h4>
146
            <ul>
147
                [% FOREACH w IN waiting_recalls %]
148
                    [% IF ( w.pickup_library_id == Branches.GetLoggedInBranchcode()  ) %]
149
                        <li>
150
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
151
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
152
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
153
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
154
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
155
                            <br />
156
                            <strong class="waitinghere">
157
                                [% SET expires_on = w.expiration_date %]
158
                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
159
                            </strong>
160
                        </li>
161
                    [% END %]
162
                [% END %]
163
            </ul>
164
        [% END %]
165
166
        [% IF ( waiting_elsewhere > 0 ) %]
167
            <h4>Recalls waiting at other libraries ([% waiting_elsewhere | html %])</h4>
168
            <ul>
169
                [% FOREACH w IN waiting_recalls %]
170
                    [% IF ( w.pickup_library_id != Branches.GetLoggedInBranchcode()  ) %]
171
                        <li>
172
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
173
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
174
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
175
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
176
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
177
                            <br />
178
                            <strong>
179
                                [% SET expires_on = w.expiration_date %]
180
                                Waiting at [% Branches.GetName( w.pickup_library_id ) | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
181
                            </strong>
182
                        </li>
183
                    [% END %]
184
                [% END %]
185
            </ul>
186
        [% END %]
187
    </div>
188
[% END # /IF waiting_recalls.count %]
132
189
133
[% IF WaitingHolds.count %]
190
[% IF WaitingHolds.count %]
134
    <div id="holdswaiting" class="circmessage">
191
    <div id="holdswaiting" class="circmessage">
(-)a/members/moremember.pl (-1 / +5 lines)
Lines 199-204 $template->param( Link Here
199
    WaitingHolds => $waiting_holds,
199
    WaitingHolds => $waiting_holds,
200
);
200
);
201
201
202
if ( C4::Context->preference('UseRecalls') ) {
203
    my $waiting_recalls = $patron->recalls->search({ status => 'waiting' });
204
    $template->param( waiting_recalls => $waiting_recalls );
205
}
206
202
my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
207
my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
203
$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
208
$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
204
if ( defined $no_issues_charge_guarantees ) {
209
if ( defined $no_issues_charge_guarantees ) {
205
- 

Return to bug 30905