From 68831834bf06080c0f72f380a13f5d83f4ae40c9 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 27 Jul 2021 21:45:12 +0000
Subject: [PATCH] Bug 28762: handle notforloan better

Signed-off-by: Hayley Pelham <hayleypelham@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit e3e306efdb622f4c4857aa645c72c89320dac63d)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss      |  3 ++-
 .../intranet-tmpl/prog/en/includes/item-status.inc    | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 5c6ffac4f7..b4f1281c72 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2286,7 +2286,8 @@ td {
 .restricted,
 .damaged,
 .lost,
-.withdrawn {
+.withdrawn,
+.notforloan {
     color: #990000;
     display: block;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc
index 7da27283f6..f5e5dfe45c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/item-status.inc
@@ -62,17 +62,14 @@
     [% END %]
 [% END %]
 
-
-[% IF NOT ( item.isa('Koha::Item') ) AND item.itemnotforloan %]
+[% IF ( item.notforloan ) %]
     [% SET itemavailable = 0 %]
-    [% IF ( item.notforloanvalueopac ) %]
-        <span class="item-status notforloan">[% item.notforloanvalueopac | html %]</span>
+    [% av_lib_include = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %]
+    [% IF av_lib_include %]
+        <span class="item-status notforloan">[% av_lib_include | html %]</span>
     [% ELSE %]
         <span class="item-status notforloan">Not for loan</span>
     [% END %]
-[% ELSIF NOT ( item.isa('Koha::Item') ) AND item.notforloan_per_itemtype %]
-    [% SET itemavailable = 0 %]
-    <span class="item-status notforloan">Not for loan</span>
 [% END %]
 
 [% IF ( item.damaged ) %]
-- 
2.39.5