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

(-)a/circ/circulation.pl (-7 / +11 lines)
Lines 48-53 use Koha::CsvProfiles; Link Here
48
use Koha::Patrons;
48
use Koha::Patrons;
49
use Koha::DateUtils qw( dt_from_string );
49
use Koha::DateUtils qw( dt_from_string );
50
use Koha::Patron::Restriction::Types;
50
use Koha::Patron::Restriction::Types;
51
use Koha::Patron::Quotas;
51
use Koha::Plugins;
52
use Koha::Plugins;
52
use Koha::Database;
53
use Koha::Database;
53
use Koha::BiblioFrameworks;
54
use Koha::BiblioFrameworks;
Lines 183-195 my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || Link Here
183
if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
184
if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
184
    undef $restoreduedatespec;
185
    undef $restoreduedatespec;
185
}
186
}
186
my $issueconfirmed = $query->param('issueconfirmed');
187
my $issueconfirmed    = $query->param('issueconfirmed');
187
my $cancelreserve  = $query->param('cancelreserve');
188
my $cancelreserve     = $query->param('cancelreserve');
188
my $cancel_recall  = $query->param('cancel_recall');
189
my $cancel_recall     = $query->param('cancel_recall');
189
my $selected_quota_id = $query->param('selected_quota_id');
190
my $selected_quota_id = $query->param('selected_quota_id');
190
my $recall_id      = $query->param('recall_id');
191
my $recall_id         = $query->param('recall_id');
191
my $debt_confirmed = $query->param('debt_confirmed') || 0;     # Don't show the debt error dialog twice
192
my $debt_confirmed    = $query->param('debt_confirmed') || 0;     # Don't show the debt error dialog twice
192
my $charges        = $query->param('charges')        || q{};
193
my $charges           = $query->param('charges')        || q{};
193
194
194
# Check if stickyduedate is turned off
195
# Check if stickyduedate is turned off
195
if (@$barcodes) {
196
if (@$barcodes) {
Lines 321-326 if ($patron) { Link Here
321
        $template->param( limited_category => 1 );
322
        $template->param( limited_category => 1 );
322
    }
323
    }
323
324
325
    # Add quota details
326
    my $quotas = $patron->all_quotas;
327
    $template->param( quotas => $quotas );
324
}
328
}
325
329
326
#
330
#
Lines 548-554 if ( @$barcodes && $op eq 'cud-checkout' ) { Link Here
548
                    undef, undef,
552
                    undef, undef,
549
                    {
553
                    {
550
                        onsite_checkout        => $onsite_checkout,        auto_renew => $session->param('auto_renew'),
554
                        onsite_checkout        => $onsite_checkout,        auto_renew => $session->param('auto_renew'),
551
                        switch_onsite_checkout => $switch_onsite_checkout, cancel_recall => $cancel_recall,
555
                        switch_onsite_checkout => $switch_onsite_checkout, cancel_recall     => $cancel_recall,
552
                        recall_id              => $recall_id,              selected_quota_id => $selected_quota_id,
556
                        recall_id              => $recall_id,              selected_quota_id => $selected_quota_id,
553
                    }
557
                    }
554
                );
558
                );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +14 lines)
Lines 179-184 Link Here
179
    </ul>
179
    </ul>
180
[% END # /F ( has_modifications || warndeparture... %]
180
[% END # /F ( has_modifications || warndeparture... %]
181
181
182
[% IF quotas %]
183
    <div id="quota" class="circmessage">
184
        <h4>Quota details</h4>
185
        <ul>
186
            [% FOREACH quota IN quotas %]
187
                <li
188
                    >[% IF quota.patron_id != issue.borrowernumber %][% INCLUDE 'patron-title.inc' patron = quota.patron no_cardnumber = 1 %] -[% END %][% quota.description | html %] : [% quota.used | html %] /
189
                    [% quota.allocation | html %]</li
190
                >
191
            [% END %]
192
        </ul>
193
    </div>
194
[% END %]
195
182
[% IF waiting_recalls.count %]
196
[% IF waiting_recalls.count %]
183
    <div id="recallswaiting" class="circmessage">
197
    <div id="recallswaiting" class="circmessage">
184
        [% SET waiting_here = 0 %]
198
        [% SET waiting_here = 0 %]
185
- 

Return to bug 38924