0f4644a5bf
The following three templates are using [% guarantorborrowernumber %] while they should be using [% guarantor.borrowernumber %]: members/members-toolbar.inc members/moremember-brief.tt members/moremember.tt This doesn't result in any breakage; just a couple of 'Edit' links that do not pass the guarantorid in the URL, and one case where guarantor information is not shown in the staff client. This patch fixes that. Test plan: 0) [PREREQUISITE] Create a patron with a guarantor if you don't have one. 1) Go to Home > Patrons and search for a patron that has a guarantor. In the Details page for that patron, the 'Edit' link in the toolbar does not pass the guarantor's id in the URL (...&guarantorid=&...). 2) In the same page, the 'Edit' link under the patrons name (immediately under 'Guarantor') again does not include the guarantor id in the URL. 3) Go to Home > Patrons and click on 'New patron'. Pick any category from the drop down menu. Enter the Surname, First name, and Date of birth of the patron you used in step 1). This triggers the 'Duplicate patron record?' warning -- click on 'View existing record' and notice how the guarantor information is missing. 4) Apply the patch. 5) Repeat steps 1), 2), and 3) above. The URLs are fixed and patron info is showing. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
91 lines
4.3 KiB
Text
91 lines
4.3 KiB
Text
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Check duplicate patron</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<style type="text/css">
|
|
#custom-doc { width:44.23em;*width:43.12em;min-width:491px; margin:auto; text-align:left; }
|
|
</style>
|
|
</head>
|
|
<body id="pat_moremember-brief" class="pat" style="padding:.5em;">
|
|
<div id="custom-doc" class="yui-t7">
|
|
<div id="bd">
|
|
<h3>[% UNLESS ( I ) %]
|
|
[% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
|
|
<div class="yui-g">
|
|
<div class="yui-u first">
|
|
<div id="patron-information" style="padding: .5em;">
|
|
|
|
[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
|
|
<div class = "address">
|
|
[% IF Koha.Preference( 'AddressFormat' ) %]
|
|
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
|
|
[% ELSE %]
|
|
[% INCLUDE 'member-display-address-style-us.inc' %]
|
|
[% END %]
|
|
</div>
|
|
<div class="rows">
|
|
<ol>
|
|
[% IF ( I ) %]
|
|
[% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %]
|
|
[% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %]
|
|
[% ELSE %]
|
|
[% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
|
|
[% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]
|
|
[% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
|
|
[% END %]
|
|
|
|
[% IF ( P ) %]
|
|
[% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
|
|
[% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
|
|
[% END %]
|
|
[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
|
|
[% UNLESS ( I ) %]
|
|
[% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
|
|
[% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
|
|
[% END %]
|
|
<li><span class="label">Initials: </span>[% initials %]</li>
|
|
<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>
|
|
<li><span class="label">Gender:</span>[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %]
|
|
[% IF ( isguarantee ) %]
|
|
[% IF ( guaranteeloop ) %]
|
|
<li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %] </a></li>[% END %]</ul></li>
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( guarantor.borrowernumber ) %]
|
|
<li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.surname %], [% guarantor.firstname %]</a></li>
|
|
[% END %]
|
|
[% END %]
|
|
</ol>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="yui-u">
|
|
<div id="patron-library-details">
|
|
<h3>Library use</h3>
|
|
<div class="rows">
|
|
<ol>
|
|
<li><span class="label">Card number: </span>[% cardnumber %]</li>
|
|
<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
|
|
<li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
|
|
<li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
|
|
<li><span class="label">Expiration date: </span>
|
|
[% IF ( was_renewed ) %]
|
|
<strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
|
|
[% ELSE %]
|
|
[% dateexpiry | $KohaDates %]
|
|
[% END %]
|
|
</li>
|
|
<li><span class="label">Library: </span>[% branchname %]</li>
|
|
|
|
[% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% lib1 %]</li>[% END %]
|
|
[% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% lib2 %]</li>[% END %]
|
|
</ol>
|
|
</div>
|
|
</div>
|
|
<fieldset class="action"><input type="button" class="close" value="Close window" /></fieldset>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'popup-bottom.inc' %]
|