From 958d25ac51c912f123e6003b09495c74489f9b43 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 31 Oct 2014 05:31:24 -0400 Subject: [PATCH] [PASSED QA] Bug 10860 [QA Followup] - Use Koha.Preference Signed-off-by: Katrin Fischer --- circ/circulation.pl | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index db21100..2a1f211 100755 --- a/circ/circulation.pl +++ b/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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 956779f..a8f79c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -499,7 +499,7 @@ No patron matched [% message %] [% IF ( borrowernumber ) %]
-[% IF !noissues || onsite_checkout_forced %] +[% IF !noissues || Koha.Preference('OnSiteCheckoutsForce') %] [% IF ( flagged ) %]
[% ELSE %] @@ -575,7 +575,7 @@ No patron matched [% message %] [% IF ( noissues ) %]
[% ELSE %]
[% END %] [% IF flagged %] - [% IF NOT noissues || ( noissues && onsite_checkout_forced ) %] + [% IF NOT noissues || ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %]
[% ELSE %]

Checking out to [% INCLUDE 'patron-title.inc' %]

@@ -584,7 +584,7 @@ No patron matched [% message %]

[% IF noissues %] Cannot check out! - [% IF onsite_checkout_forced %] + [% IF Koha.Preference('OnSiteCheckoutsForce') %] Only on-site checkouts are allowed [% END %] [% ELSE %] -- 1.9.1