Attachment 106351 Details for Bug 25654 – Bug 25654: Make the contact and non-patron guarantor sections separate on patron entry form

[patch] Bug 25654: Make the contact and non-patron guarantor sections separate on patron entry form

Bug-25654-Make-the-contact-and-non-patron-guaranto.patch (text/plain), 11.98 KB, created by Owen Leonard on 2020-06-26 20:37:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-06-26 20:37:43 UTC

Size: 11.98 KB

patch

obsolete

>From 4a0dec8c83c0c570ebda3a2daeec72baf85555c9 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 26 Jun 2020 20:12:58 +0000
>Subject: [PATCH] Bug 25654: Make the contact and non-patron guarantor sections
> separate on patron entry form
>
>This patch reverses what I think was an unintended change made by Bug
>14570 in which the non-patron guarantor fields are shown for all patron
>types (not just child patrons) and  grouped with the patron contact fields.
>
>This patch creates a new "Non-patron guarantor" fieldset to show along
>with "Patron guarantor" when adding or editing child patrons.
>
>To test, apply the patch check that the  BorrowerUnwantedField system
>preference does not contain contactname, contactfirstname,
>or relationship.
>
> - Open an adult patron for editing. You should see no guarantor-related
>   fields.
> - Open a child patron for editing. There should be two guarantor
>   sections: "Patron guarantor" and "Non-patron guarantor."
>   - Test that adding patron guarantors and non-patron guarantors works
>     correctly.
>   - Add "contactname|contactfirstname|relationship" to the
>     BorrowerUnwantedField system preference.
>   - Reload the child patron entry form. The non-patron guarantor
>     section should now be hidden.
>---
> .../prog/en/modules/members/memberentrygen.tt      | 113 +++++++++++----------
> 1 file changed, 60 insertions(+), 53 deletions(-)
>
>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 25c32db057..af845f8c12 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -409,7 +409,7 @@ legend:hover {
>                                     [% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
>                                     <span id="memberentry_guarantor_anchor">
>                                         <fieldset id="memberentry_guarantor" class="rows">
>-                                            <legend>Guarantor information</legend>
>+                                            <legend>Patron guarantor</legend>
> 
>                                             <span id="guarantor_relationships">
>                                                 [% FOREACH r IN relationships %]
>@@ -570,6 +570,65 @@ legend:hover {
>                                             </ol>
>                                         </fieldset> 
>                                     </span> 
>+
>+                                    [% UNLESS nocontactname && nocontactfirstname && norelationship %]
>+                                        <fieldset class="rows">
>+                                            <legend>Non-patron guarantor</legend>
>+                                            <ol>
>+                                                [% UNLESS nocontactname %]
>+                                                    <li>
>+                                                        [% IF ( mandatorycontactname ) %]
>+                                                            <label for="contactname" class="required">
>+                                                        [% ELSE %]
>+                                                            <label for="contactname">
>+                                                        [% END %]
>+                                                            Guarantor surname:
>+                                                        </label>
>+                                                        <input type="text" id="contactname" name="contactname" value="[% patron.contactname | html %]" />
>+                                                        [% IF ( mandatorycontactname ) %]
>+                                                            <span class="required">Required</span>
>+                                                        [% END %]
>+                                                        <div class="hint">Non-patron guarantor surname</div>
>+                                                    </li>
>+                                                [% END # /UNLESS nocontactname %]
>+
>+                                                [% UNLESS nocontactfirstname %]
>+                                                    <li>
>+                                                        [% IF ( mandatorycontactfirstname ) %]
>+                                                            <label for="contactfirstname" class="required">
>+                                                        [% ELSE %]
>+                                                            <label for="contactfirstname">
>+                                                        [% END %]
>+                                                            Guarantor first name:
>+                                                        </label>
>+                                                        <input type="text" id="contactfirstname" name="contactfirstname" value="[% patron.contactfirstname | html %]" />
>+                                                        [% IF ( mandatorycontactfirstname ) %]
>+                                                            <span class="required">Required</span>
>+                                                        [% END %]
>+                                                        <div class="hint">Non-patron guarantor first name</div>
>+                                                    </li>
>+                                                [% END # /UNLESS noaltcontactfirstname %]
>+
>+                                                [% UNLESS norelationship %]
>+                                                    [% IF possible_relationships %]
>+                                                        <li>
>+                                                            <label for="relationship">Relationship: </label>
>+                                                            <select class="relationship" name="relationship">
>+                                                                <option value=""></option>
>+                                                                [% FOREACH pr IN possible_relationships.split('\|') %]
>+                                                                    [% IF pr == relationship %]
>+                                                                        <option value="[% pr | html %]" selected="selected">[% pr | html %]</option>
>+                                                                    [% ELSE %]
>+                                                                        <option value="[% pr | html %]">[% pr | html %]</option>
>+                                                                    [% END %]
>+                                                                [% END %]
>+                                                            </select>
>+                                                        </li>
>+                                                    [% END #/IF possible_relationships %]
>+                                                [% END # /UNLESS norelationship %]
>+                                            </ol>
>+                                        </fieldset>
>+                                    [% END %]
>                                 [% END # /IF show_guarantor || guarantor  %]
> 
>                                 [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
>@@ -580,58 +639,6 @@ legend:hover {
>                                     <fieldset class="rows" id="memberentry_contact">
>                                         <legend id="contact_lgd">Contact</legend>
>                                         <ol>
>-                                            [% UNLESS nocontactname %]
>-                                                <li>
>-                                                    [% IF ( mandatorycontactname ) %]
>-                                                        <label for="contactname" class="required">
>-                                                    [% ELSE %]
>-                                                        <label for="contactname">
>-                                                    [% END %]
>-                                                        Guarantor surname:
>-                                                    </label>
>-                                                    <input type="text" id="contactname" name="contactname" value="[% patron.contactname | html %]" />
>-                                                    [% IF ( mandatorycontactname ) %]
>-                                                        <span class="required">Required</span>
>-                                                    [% END %]
>-                                                    <div class="hint">Non-patron guarantor surname</div>
>-                                                </li>
>-                                            [% END # /UNLESS nocontactname %]
>-
>-                                            [% UNLESS nocontactfirstname %]
>-                                                <li>
>-                                                    [% IF ( mandatorycontactfirstname ) %]
>-                                                        <label for="contactfirstname" class="required">
>-                                                    [% ELSE %]
>-                                                        <label for="contactfirstname">
>-                                                    [% END %]
>-                                                        Guarantor first name:
>-                                                    </label>
>-                                                    <input type="text" id="contactfirstname" name="contactfirstname" value="[% patron.contactfirstname | html %]" />
>-                                                    [% IF ( mandatorycontactfirstname ) %]
>-                                                        <span class="required">Required</span>
>-                                                    [% END %]
>-                                                    <div class="hint">Non-patron guarantor first name</div>
>-                                                </li>
>-                                            [% END # /UNLESS noaltcontactfirstname %]
>-
>-                                            [% UNLESS norelationship %]
>-                                                [% IF possible_relationships %]
>-                                                    <li>
>-                                                        <label for="relationship">Relationship: </label>
>-                                                        <select class="relationship" name="relationship">
>-                                                            <option value=""></option>
>-                                                            [% FOREACH pr IN possible_relationships.split('\|') %]
>-                                                                [% IF pr == relationship %]
>-                                                                    <option value="[% pr | html %]" selected="selected">[% pr | html %]</option>
>-                                                                [% ELSE %]
>-                                                                    <option value="[% pr | html %]">[% pr | html %]</option>
>-                                                                [% END %]
>-                                                            [% END %]
>-                                                        </select>
>-                                                    </li>
>-                                                [% END #/IF possible_relationships %]
>-                                            [% END # /UNLESS norelationship %]
>-
>                                             [% UNLESS nophone %]
>                                                 <li>
>                                                     [% IF ( mandatoryphone ) %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25654: 105490 | 106351 | 106355 | 106456 | 106457 | 108363