From 24ff7998dde7c26ff7cfdea538754d97373833a0 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 9 May 2016 17:59:52 +0100
Subject: [PATCH] Bug 16478: Fix checkout history tabs - intranet
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Test plan:
Same as before for the intranet.
And please retest the OPAC => I have changed the filter's values to
match OPAC/intranet

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3c80b7c19e07ae2c19a45949d91b78ac339a30e9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/members/readingrec.tt   | 7 +++----
 .../opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt  | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
index 59b845dcff..6e21cdd88a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
@@ -86,11 +86,10 @@
       [% FOREACH issue IN loop_reading %]
         [% IF  issue.returndate  %]<tr>[% ELSE %]<tr class="onissue">[% END %]
           <td style="display:none;">
-            [% IF issue.onsite_checkout %]
-              onsite_checkout
-            [% ELSE %]
-              standard_checkout
+            [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %]
+            [% ELSE %][% issuetype = 'standard_checkout' %]
             [% END %]
+            [% issuetype %]
           </td>
           <td>
             <span title="[% issue.issuestimestamp %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 %]</span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index 19bbe49d86..c4a74195ee 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -80,8 +80,8 @@
                                             [% FOREACH issue IN READING_RECORD %]
                                                 <tr>
                                                     <td style="display:none;">
-                                                      [% IF issue.onsite_checkout %][% issuetype = 'onsite' %]
-                                                      [% ELSE %][% issuetype = 'checkout' %]
+                                                      [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %]
+                                                      [% ELSE %][% issuetype = 'standard_checkout' %]
                                                       [% END %]
                                                       [% issuetype %]
                                                     </td>
@@ -192,9 +192,9 @@
             select: function(e, ui) {
                 var id = $(ui.tab).attr("id");
                 if ( id == "tab_checkout" ) {
-                    table.fnFilter("checkout", 0);
+                    table.fnFilter("standard_checkout", 0);
                 } else if ( id == "tab_onsite_checkout" ) {
-                    table.fnFilter("onsite", 0);
+                    table.fnFilter("onsite_checkout", 0);
                 } else { // all
                     table.fnFilter('', 0);
                 }
-- 
2.20.1