From e57aa461fee9965df9f2ac42a781ac580e30333a Mon Sep 17 00:00:00 2001
From: David Roberts <david@koha-ptfs.co.uk>
Date: Sun, 3 May 2020 23:48:09 +0000
Subject: [PATCH] Bug 25336: Show checkouts/fines to guarantor is in the wrong
 section of the patron file

This patch moves the "Show checkouts to guarantor" and "Show fines to
guarantor" data to display under the Contact information block

To test:

1) Enable the AllowStaffToSetCheckoutsVisibilityForGuarantor and AllowStaffToSetFinesVisibilityForGuarantor system preferences to Allow
2) View a patron record.
3) The "Show checkouts to guarantor" and "Show fines to guarantor" field
will be on the right hand side of the screen under the Library use
block.
4) Apply patch
5) Check that this data has now moved to the Contact information block
on the left hand side of the patron record.

Works for me!

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 3abc4fb8584e0df2b71dd9d38f033e34b205e829)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2478ba03f064b70e03da9c6ca3667c8b5fd37403)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
---
 .../prog/en/modules/members/moremember.tt     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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 7c3501c445..d7a0970957 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -249,6 +249,24 @@
                                                 </li>
                                             [% END %]
                                         [% END %]
+                                         <li id="patron-privacyguarantor">
+                                            <span class="label">Show checkouts to guarantor</span>
+                                            [% IF patron.privacy_guarantor_checkouts %]
+                                                Yes
+                                            [% ELSE %]
+                                                No
+                                            [% END %]
+                                        </li>
+
+                                        <li>
+                                            <span class="label">Show fines to guarantor</span>
+                                            [% IF patron.privacy_guarantor_fines %]
+                                                Yes
+                                            [% ELSE %]
+                                                No
+                                            [% END %]
+                                        </li>
+
                                         [% IF guarantees %]
                                             <li>
                                                 <span class="label">Guarantees:</span>
@@ -489,24 +507,6 @@
                                             </li>
                                         [% END %]
 
-                                        <li id="patron-privacyguarantor">
-                                            <span class="label">Show checkouts to guarantor</span>
-                                            [% IF patron.privacy_guarantor_checkouts %]
-                                                Yes
-                                            [% ELSE %]
-                                                No
-                                            [% END %]
-                                        </li>
-
-                                        <li>
-                                            <span class="label">Show fines to guarantor</span>
-                                            [% IF patron.privacy_guarantor_fines %]
-                                                Yes
-                                            [% ELSE %]
-                                                No
-                                            [% END %]
-                                        </li>
-
                                         [% IF ( patron.sort1 ) %]
                                             <li id="patron-sort1">
                                                 <span class="label">Sort field 1:</span>
-- 
2.39.5