From 05c1ebc11c9555bf6db93060d2b985adfa95f773 Mon Sep 17 00:00:00 2001
From: Charles Farmer <charles.farmer@inLibro.com>
Date: Mon, 19 Feb 2018 10:21:23 -0500
Subject: [PATCH] Bug 11879: (QA follow-up) Fix problems found in code review

Signed-off-by: Lucie Gay <lucie.gay@ens-paris-saclay.fr>

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

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
---
 .../borrowers_primary_contact_method.sql           |  2 +-
 .../prog/en/modules/members/memberentrygen.tt      |  5 ++---
 .../prog/en/modules/members/moremember-brief.tt    |  8 ++++----
 .../prog/en/modules/members/moremember.tt          |  9 ---------
 members/moremember.pl                              |  3 ---
 opac/opac-memberentry.pl                           | 22 +++++++++++-----------
 6 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
index 000791d8cb..65b6b58c91 100644
--- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
+++ b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql
@@ -1,3 +1,3 @@
-ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `lastseen`;
+ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`;
 ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`;
 ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `extended_attributes`;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index b6104a59a2..a1a55c0c56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -432,8 +432,7 @@
 
 [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
   <fieldset class="rows" id="memberentry_contact">
-    <legend id="contact_lgd">Contact</legend>
-<ol>
+    <legend id="contact_lgd">Contact</legend><ol>
         [% UNLESS nophone %]
       <li>
       [% IF ( mandatoryphone ) %]
@@ -496,7 +495,7 @@
 	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-    [% UNLESS nofax %]
+        [% UNLESS nofax %]
     <li>
       [% IF ( mandatoryfax ) %]
       <label for="fax" class="required">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index dab14e5ede..16e9f857f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -19,7 +19,7 @@
             <div class="col-xs-6">
                 <div id="patron-information">
 
-     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]
+     [% UNLESS ( I ) %][% IF ( patron.othernames ) %]&ldquo;[% patron.othernames %]&rdquo;[% END %]
         <div class = "address">
             <ul>
                 [% IF Koha.Preference( 'AddressFormat' ) %]
@@ -61,9 +61,9 @@
 	<h3>Library use</h3>
 	<div class="rows">
 	<ol>
-    <li><span class="label">Card number: </span>[% cardnumber | html %]</li>
-	<li><span class="label">Borrowernumber: </span> [% borrowernumber | html %]</li>
-    <li><span class="label">Category: </span>[% categoryname | html %] ([% categorycode | html %])</li>
+    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
+    <li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
+    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
     <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
     <li><span class="label">Expiration date: </span>
     [% IF ( was_renewed ) %]
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 62626287bb..d608c27df5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -255,15 +255,6 @@
                                                     [% END %]
                                                 </ul>
                                             </li>
-                                        [% ELSIF guarantor %]
-                                            <li>
-                                                <span class="label">Guarantor:</span>
-                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
-                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
-                                                [% ELSE %]
-                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
-                                                [% END %]
-                                            </li>
                                         [% END %]
 
                                         [% IF ( primary_contact_method ) %]
diff --git a/members/moremember.pl b/members/moremember.pl
index c97d144f24..4974c623db 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -319,9 +319,6 @@ $template->param(
     patron          => $patron,
     translated_language => $translated_language,
     detailview      => 1,
-    borrowernumber  => $borrowernumber,
-    othernames      => $data->{'othernames'},
-    categoryname    => $patron->category->description,
     primary_contact_method  => $data->{'primary_contact_method'},
     was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
     todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 5eef07683d..4afbd1b36c 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -95,18 +95,18 @@ $template->param(
     OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
 );
 my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
-        my @field_check=split(/\|/,$check_BorrowerMandatoryField);
-        my @contactprincipalloop;
-        my @fieldArray = qw(phone phonepro mobile email emailpro fax);
-        foreach my $field (@fieldArray) {
-           if ( !(grep { $field eq $_ } @field_check)){
-                push @contactprincipalloop,{
-                    'currentis_' . $field => 1
-                };
-            }
-        }
+my @field_check=split(/\|/,$check_BorrowerMandatoryField);
+my @contactprincipalloop;
+my @fieldArray = qw(phone phonepro mobile email emailpro fax);
+foreach my $field (@fieldArray) {
+   if ( !(grep { $field eq $_ } @field_check)){
+        push @contactprincipalloop,{
+            'currentis_' . $field => 1
+        };
+    }
+}
 
-        $template->param('contactprincipalloop' => \@contactprincipalloop);
+$template->param('contactprincipalloop' => \@contactprincipalloop);
 
 my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
 my $conflicting_attribute = 0;
-- 
2.11.0