From 0402e4e636605beacff69c3635218681d1d536e4 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Thu, 30 Oct 2014 20:33:35 +0100
Subject: [PATCH] Bug 10860: Follow-up - fix some template variable issues

Fixing some simple display issues caused by missing/misnamed
variables, probably consequence of the renaming before.

Amended test plan:
- Make sure that if OnSiteCheckoutsForce is set, you can
  still perform onsite checkouts and only those.
- Check the detail page in staff says *currently in local use by*
  for an on-site checked out item
- Check the detail page in OPAC with OPACShowCheckoutName active
  for the same.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 circ/circulation.pl                                         | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 2a1f2115da..db2110093e 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -601,6 +601,7 @@ $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/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 89607efa86..efd1dc4eaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -586,13 +586,13 @@ function verify_images() {
                     <td class="status">
 
                         [% IF ( item.datedue ) %]
-                          [% IF onsite_checkout %]
+                          [% IF item.onsite_checkout %]
                             <span>Currently in local use
                           [% ELSE %]
                             <span class="datedue">Checked out
                           [% END %]
                                 [% UNLESS ( item.NOTSAMEBRANCH ) %]
-                                  [% IF onsite_checkout %]
+                                  [% IF item.onsite_checkout %]
                                     by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
                                   [% ELSE %]
                                     to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
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 c6b72a0fc9..956779ff4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -585,7 +585,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% IF noissues %]
           Cannot check out!
           [% IF onsite_checkout_forced %]
-            <span style="color:red;">Only on-site checkouts is allowed</span>
+            <span style="color:red;">Only on-site checkouts are allowed</span>
           [% END %]
         [% ELSE %]
           Attention:
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
index f9b27c06fb..f8980a6836 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
@@ -19,7 +19,7 @@ not use an API to fetch items that populates item.datedue.
         [% END %]
     [% END %]
 [% ELSIF ( item.datedue || issue.date_due ) %]
-  [% IF onsite_checkout %]
+  [% IF item.onsite_checkout %]
     [% IF ( OPACShowCheckoutName ) %]
         Currently in local use by [% item.cardnumber %] [% item.firstname %] [% item.surname %]
     [% ELSE %]
-- 
2.39.5