Browse Source

Bug 10860 [QA Followup] - Use Koha.Preference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
3.18.x
Kyle Hall 8 years ago
committed by Tomas Cohen Arazi
parent
commit
1334cd33b4
  1. 1
      circ/circulation.pl
  2. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

1
circ/circulation.pl

@ -601,7 +601,6 @@ $template->param(
canned_bor_notes_loop => $canned_notes,
debarments => GetDebarments({ borrowernumber => $borrowernumber }),
todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59),
onsite_checkout_forced => C4::Context->preference("OnSiteCheckoutsForce"),
);
output_html_with_http_headers $query, $cookie, $template->output;

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

@ -499,7 +499,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF ( borrowernumber ) %]
<div class="yui-g">
[% IF !noissues || onsite_checkout_forced %]
[% IF !noissues || Koha.Preference('OnSiteCheckoutsForce') %]
[% IF ( flagged ) %]
<div class="yui-u first">
[% ELSE %]
@ -575,7 +575,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %]
[% IF flagged %]
[% IF NOT noissues || ( noissues && onsite_checkout_forced ) %]
[% IF NOT noissues || ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
<div id="circmessages" class="circmessage attention">
[% ELSE %]
<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
@ -584,7 +584,7 @@ No patron matched <span class="ex">[% message %]</span>
<h3>
[% IF noissues %]
Cannot check out!
[% IF onsite_checkout_forced %]
[% IF Koha.Preference('OnSiteCheckoutsForce') %]
<span style="color:red;">Only on-site checkouts are allowed</span>
[% END %]
[% ELSE %]

Loading…
Cancel
Save