From 0528ef6d4dbcde1c7d94b854316984553a38a890 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Sun, 8 Jul 2018 00:00:17 +0000
Subject: [PATCH] Bug 19532 - Fixes to stop transfer recall modal from being
 displayed incorrectly

---
 C4/Circulation.pm                                        | 16 ++++++++--------
 circ/returns.pl                                          | 12 ++++++++++--
 .../prog/en/modules/admin/preferences/circulation.pref   |  2 +-
 .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt   |  1 -
 .../prog/en/modules/circ/circulation-home.tt             |  8 ++++++++
 .../prog/en/modules/circ/recalls_overdue.tt              |  3 ++-
 .../intranet-tmpl/prog/en/modules/circ/recalls_queue.tt  |  3 ++-
 .../prog/en/modules/circ/recalls_waiting.tt              |  3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt  |  1 -
 .../intranet-tmpl/prog/en/modules/members/moremember.tt  |  4 ++--
 .../prog/en/modules/members/recallshistory.tt            |  3 ++-
 11 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index b9f4cd1c6c..389184b8e2 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -353,17 +353,17 @@ sub transferbook {
             $dotransfer = 0;
             $messages->{'RecallPlacedAtHoldingBranch'} = 1;
         } else {
-            $dotransfer = 1;
+            $dotransfer = 0;
         }
-    } else {  #recalls take priority over holds, only check holds if no recalls
+#   } else {  #recalls take priority over holds, only check holds if no recalls
         # find reserves.....
-        my ( $resfound, $resrec, undef ) =
-            CheckReserves( $itemnumber );
-        if ( $resfound and not $ignoreRs ) {
-            $resrec->{'ResFound'} = $resfound;
+#       my ( $resfound, $resrec, undef ) =
+#           CheckReserves( $itemnumber );
+#       if ( $resfound and not $ignoreRs ) {
+#           $resrec->{'ResFound'} = $resfound;
 #         $messages->{'ResFound'} = $resrec;
-            $dotransfer = 1;
-        }
+#           $dotransfer = 1;
+#       }
     }
 
     #actually do the transfer....
diff --git a/circ/returns.pl b/circ/returns.pl
index dcf9785ced..edf648b801 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -513,14 +513,22 @@ if ( $messages->{'ResFound'}) {
 
 if ( $messages->{'RecallFound'} ){
     my $recall = $messages->{'Recall'};
+warn $userenv_branch;
+warn $recall->branchcode;
+    my $transfer_recall;
+    if ($userenv_branch  eq $recall->branchcode) {
+        $transfer_recall = 0;
+    } else {
+        $transfer_recall = 1;
+    }
     my $patron = Koha::Patrons->find( $recall->borrowernumber );
     $template->param(
         patron   => $patron,
         found    => 1,
         recalled => 1,
         recall   => $recall,
-        transfer_recall => ($userenv_branch eq $recall->branchcode ? 1 : 0 )
-#        address   => $patron->address,
+        transfer_recall => $transfer_recall,
+        address   => $patron->address,
 #        address2  => $patron->address2,
 #        streetnumber => $patron->streetnumber,
 #        city         => $patron->city,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 53c7ccfd62..e51198474d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -953,7 +953,7 @@ Circulation:
     Recalls:
         -
             - pref: UseRecalls
-             choices:
+              choices:
                  yes: Use
                  no: "Don't use"
             - recalls
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index e4212dbf61..7f12e214be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -204,7 +204,6 @@
                                                                 <span>Don't allow</span>
                                                             [% END %]
                                                         </td>
-                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
                                                         <td>[% rule.recall_due_date_interval %]</td>
                                                         <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
                                                         <td>[% rule.recall_shelf_time %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
index 8b58ab188f..9f03455c64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
@@ -65,6 +65,14 @@
                         <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
                     </li>
                 </ul>
+                [% IF Koha.Preference('UseRecalls') %]
+                  <h3>Recalls</h3>
+                    <ul class="buttons-list">
+                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_queue.pl"><i class="fa fa-tasks"></i> Recalls queue</a></li>
+                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_overdue.pl"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
+                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_waiting.pl"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
+                    </ul>
+                [% END %]
             </div>
 
             <!-- Add the extra clearfix for only the required viewport -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt
index dbcb4c4145..88f8c728ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt
@@ -1,3 +1,4 @@
+[% USE Asset %]
 [% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -5,7 +6,7 @@
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css"> p { margin-top: 0; }</style>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
-<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
+[% Asset.js("js/recalls.js") %]
 [% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'columns_settings.inc' %]
 </head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt
index be44dfddf8..c78efeaa78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt
@@ -1,3 +1,4 @@
+[% USE Asset %]
 [% USE Koha %]
 [% USE KohaDates %]
 [% SET footerjs = 1 %]
@@ -57,7 +58,7 @@
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
+    [% Asset.js("js/recalls.js") %]
     <script type="text/javascript">
     $(document).ready(function() {
             $(".old").hide();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt
index 0ab3a6eb6d..32b3d2f652 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt
@@ -1,3 +1,4 @@
+[% USE Asset %]
 [% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -5,7 +6,7 @@
 [% INCLUDE 'doc-head-close.inc' %]
 <style type="text/css"> p { margin-top: 0; }</style>
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
-<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
+[% Asset.js("js/recalls.js") %]
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
     $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index d9ffc24faf..5e2b1af50c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -558,7 +558,6 @@
                     <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
                     <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
                     <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
-                    <input type="hidden" name="transfer_recall" value="[% recall.branchcode %]" />
                 </div>
 
                 <div class="modal-footer">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 245e86b932..dc90a486fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -662,7 +662,7 @@
                                 </li>
                             [% END %]
                             [% IF Koha.Preference('UseRecalls') && recalls.count %]
-                                <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
+                                <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
                             [% END %]
                             [% IF Koha.Preference('ArticleRequests') %]
                                 <li>
@@ -780,7 +780,7 @@
                                 [% END %]
                             </div> [% # /div#reserves %]
                         [% END %]
-                        [% IF Koha.Preferernce('UseRecalls') && recalls.count %]
+                        [% IF Koha.Preference('UseRecalls') && recalls.count %]
                             [% INCLUDE 'recalls.inc' %]
                         [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
index fb6e93f212..ad3ba21998 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt
@@ -1,3 +1,4 @@
+[% USE Asset %]
 [% USE KohaDates %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -5,7 +6,7 @@
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
-<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
+[% Asset.js("js/recalls.js") %]
 </head>
 <body id="recalls_history" class="pat">
 [% INCLUDE 'header.inc' %]
-- 
2.11.0