Attachment #66155 for bug #19129

View | Details | Raw Unified | Return to bug 19129
Collapse All | Expand All




        [% INCLUDE 'member-display-address-style-us.inc' %]
    [% END %]

    [% IF ( phone || mobile || phonepro ) %]<li class="patronphone">
    [% IF ( phone ) %]
        <a href="tel:[% phone | url %]">[% phone | html %]</a>
    [% ELSE %]
        [% IF ( mobile ) %]

            [% IF ( phonepro ) %]
                <a href="tel:[% phonepro | url %]">[% phonepro | html %]</a>
            [% END %]
        [% END %]
    [% END %]</li>[% END %]
    [% IF ( email ) %]
        <li class="email"> <a href="mailto:[% email | url %]" title="[% email | html %]">[% email | html %]</a></li>
    [% ELSE %]

Lines 199-205 function searchToHold(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-2 / +2 lines)
199	[% IF ( is_child ) %]	199	[% IF ( is_child ) %]
200	<li><a id="updatechild" href="#">Update child to adult patron</a></li>	200	<li><a id="updatechild" href="#">Update child to adult patron</a></li>
201	[% ELSE %]	201	[% ELSE %]
202	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li></li>	202	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li>
203	[% END %]	203	[% END %]
204	[% IF Koha.Preference('intranetreadinghistory') %]	204	[% IF Koha.Preference('intranetreadinghistory') %]
205	[%IF ( privacy == 2 ) %]	205	[%IF ( privacy == 2 ) %]
Lines 249-255 function searchToHold(){ Link Here
249	</div>	249	</div>
250	<div class="modal-footer">	250	<div class="modal-footer">
251	<button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>	251	<button class="btn btn-default approve" type="submit"><i class="fa fa-check"></i> Save</button>
252	<button class="btn btn-default deny" href="#" class="cancel" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>	252	<button class="btn btn-default deny cancel" href="#" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i> Cancel</button>
253	</div>	253	</div>
254	</form>	254	</form>
255	</div>	255	</div>




 <div class="yui-u first">
<div id="patron-information" style="padding : .5em;">

    [% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]

    <div class = "address">
        [% IF Koha.Preference( 'AddressFormat' ) %]

    </div>
		    
	<div class="rows">
    <ol>
        [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %]
        [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
        [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></li>[% END %]
        [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %]
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
            [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></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 title="[% email %]" href="mailto:[% email | url %]">[% email | html %]</a></li>[% END %]
        [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro | html %]</a></li>[% END %]
        [% UNLESS ( I ) %]
            [% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %]
            [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
            [% IF ( sex ) %]<li><span class="label">Gender:</span>
                [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
            </li>[% END %]
        [% END %]
        [% IF guarantees %]
            <li>
                <span class="label">Guarantees:</span>
                <ul>
                    [% FOREACH guarantee IN guarantees %]
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li>
                    [% END %]
                </ul>
            </li>
        [% ELSIF guarantor %]
            <li>
                <span class="label">Guarantor:</span>
                [% IF guarantor.borrowernumber %]
                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
                [% ELSE %]
                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
                [% END %]
            </li>
        [% END %]
    </ol>
        <li>
            <span class="label">Guarantor:</span>
            [% IF guarantor.borrowernumber %]
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
            [% ELSE %]
                [% guarantor.firstname | html %] [% guarantor.surname | html %]
            [% END %]
        </li>
    [% END %]
</ol>
</div>
      <div class="action">
        [% IF ( guarantor.borrowernumber ) %]

<ol>
    <li><span class="label">Card number: </span>[% cardnumber %]</li>
	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
    <li><span class="label">Category: </span>[% categoryname %] ([% categorycode %])</li>
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
    
    <li><span class="label">Expiration date: </span>

 </div>
    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3">Edit</a></div>
 
    [% UNLESS ( I ) %]
 <div id="patron-alternate-address" style="padding-top: 1em;">
    <h3>Alternate address</h3>


    </div>
</div>
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=6">Edit</a></div>
    [% END %]

 <div id="patron-alternative-contact" style="padding-top: 1em;">
 <h3>Alternative contact</h3>




    $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
}

# in template <TMPL_IF name="I"> => institutional (A for Adult, C for children)
$template->param( $data->{'categorycode'} => 1 );

# Display the language description instead of the code
# Note that this is certainly wrong
my ( $subtag, $region ) = split '-', $patron->lang;

    detailview      => 1,
    borrowernumber  => $borrowernumber,
    othernames      => $data->{'othernames'},
    categoryname    => $patron->category->description,
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
    totalprice      => sprintf("%.2f", $totalprice),

    overdues_exist  => $overdues_exist,
    StaffMember     => $category_type eq 'S',
    is_child        => $category_type eq 'C',
    $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
    samebranch      => $samebranch,
    quickslip       => $quickslip,
    housebound_role => scalar $patron->housebound_role,
- 

Return to bug 19129

Lines 223-229 function validate1(date) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-41 / +33 lines)
223	<div class="yui-u first">	223	<div class="yui-u first">
224	<div id="patron-information" style="padding : .5em;">	224	<div id="patron-information" style="padding : .5em;">
225		225
226	[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames \| html %]”[% END %]	226	[% IF ( othernames ) %]“[% othernames \| html %]”[% END %]
227		227
228	<div class = "address">	228	<div class = "address">
229	[% IF Koha.Preference( 'AddressFormat' ) %]	229	[% IF Koha.Preference( 'AddressFormat' ) %]
Lines 234-279 function validate1(date) { Link Here
234	</div>	234	</div>
235		235
236	<div class="rows">	236	<div class="rows">
237	<ol>	237	<ol>
238	[% IF ( I ) %]	238	[% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone \| html %]</a></li>[% END %]
239	[% IF ( phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% phonepro %]">[% phonepro \| html %]</a></li>[% END %]	239	[% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro \| html %]</a></li>[% END %]
240	[% IF ( emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% emailpro \| html %]</li>[% END %]	240	[% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile \| html %]</a></li>[% END %]
241	[% ELSE %]	241	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
242	[% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone \| html %]</a></li>[% END %]
243	[% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro \| html %]</a></li>[% END %]
244	[% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile \| html %]</a></li>[% END %]
245	[% END %]
246
247	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
248	[% UNLESS ( I ) %]
249	[% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email \| url %]">[% email \| html %]</a></li>[% END %]	242	[% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email \| url %]">[% email \| html %]</a></li>[% END %]
250	[% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro \| url %]">[% emailpro \| html %]</a></li>[% END %]	243	[% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro \| url %]">[% emailpro \| html %]</a></li>[% END %]
251	[% END %]	244	[% UNLESS ( I ) %]
252	[% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %]	245	[% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %]
253	[% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth \| $KohaDates %] ([% age %] years)</li>[% END %]	246	[% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth \| $KohaDates %] ([% age %] years)</li>[% END %]
254	[% IF ( sex ) %]<li><span class="label">Gender:</span>	247	[% IF ( sex ) %]<li><span class="label">Gender:</span>
255	[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]	248	[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
256	</li>[% END %][% END %]	249	</li>[% END %]
257	[% IF guarantees %]	250	[% END %]
258	<li>	251	[% IF guarantees %]
259	<span class="label">Guarantees:</span>	252	<li>
260	<ul>	253	<span class="label">Guarantees:</span>
261	[% FOREACH guarantee IN guarantees %]	254	<ul>
262	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname \| html %] [% guarantee.surname \| html %]</a></li>	255	[% FOREACH guarantee IN guarantees %]
		256	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname \| html %] [% guarantee.surname \| html %]</a></li>
		257	[% END %]
		258	</ul>
		259	</li>
		260	[% ELSIF guarantor %]
		261	<li>
		262	<span class="label">Guarantor:</span>
		263	[% IF guarantor.borrowernumber %]
		264	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname \| html %] [% guarantor.surname \| html %]</a>
		265	[% ELSE %]
		266	[% guarantor.firstname \| html %] [% guarantor.surname \| html %]
263	[% END %]	267	[% END %]
264	</ul>	268	</li>
265	</li>	269	[% END %]
266	[% ELSIF guarantor %]	270	</ol>
267	<li>
268	<span class="label">Guarantor:</span>
269	[% IF guarantor.borrowernumber %]
270	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname \| html %] [% guarantor.surname \| html %]</a>
271	[% ELSE %]
272	[% guarantor.firstname \| html %] [% guarantor.surname \| html %]
273	[% END %]
274	</li>
275	[% END %]
276	</ol>
277	</div>	271	</div>
278	<div class="action">	272	<div class="action">
279	[% IF ( guarantor.borrowernumber ) %]	273	[% IF ( guarantor.borrowernumber ) %]
Lines 400-406 function validate1(date) { Link Here
400	<ol>	394	<ol>
401	<li><span class="label">Card number: </span>[% cardnumber %]</li>	395	<li><span class="label">Card number: </span>[% cardnumber %]</li>
402	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>	396	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
403	<li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>	397	<li><span class="label">Category: </span>[% categoryname %] ([% categorycode %])</li>
404	<li><span class="label">Registration date: </span>[% dateenrolled \| $KohaDates %]</li>	398	<li><span class="label">Registration date: </span>[% dateenrolled \| $KohaDates %]</li>
405		399
406	<li><span class="label">Expiration date: </span>	400	<li><span class="label">Expiration date: </span>
Lines 471-477 function validate1(date) { Link Here
471	</div>	465	</div>
472	<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=3">Edit</a></div>	466	<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=3">Edit</a></div>
473		467
474	[% UNLESS ( I ) %]
475	<div id="patron-alternate-address" style="padding-top: 1em;">	468	<div id="patron-alternate-address" style="padding-top: 1em;">
476	<h3>Alternate address</h3>	469	<h3>Alternate address</h3>
477		470
Lines 489-495 function validate1(date) { Link Here
489	</div>	482	</div>
490	</div>	483	</div>
491	<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=6">Edit</a></div>	484	<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=6">Edit</a></div>
492	[% END %]
493		485
494	<div id="patron-alternative-contact" style="padding-top: 1em;">	486	<div id="patron-alternative-contact" style="padding-top: 1em;">
495	<h3>Alternative contact</h3>	487	<h3>Alternative contact</h3>

Lines 330-338 if ( C4::Context->preference("ExportCircHistory") ) { Link Here

(-)a/members/moremember.pl (-5 / +2 lines)
330	$template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);	330	$template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
331	}	331	}
332		332
333	# in template <TMPL_IF name="I"> => institutional (A for Adult, C for children)
334	$template->param( $data->{'categorycode'} => 1 );
335
336	# Display the language description instead of the code	333	# Display the language description instead of the code
337	# Note that this is certainly wrong	334	# Note that this is certainly wrong
338	my ( $subtag, $region ) = split '-', $patron->lang;	335	my ( $subtag, $region ) = split '-', $patron->lang;
Lines 344-350 $template->param( Link Here
344	detailview => 1,	341	detailview => 1,
345	borrowernumber => $borrowernumber,	342	borrowernumber => $borrowernumber,
346	othernames => $data->{'othernames'},	343	othernames => $data->{'othernames'},
347	categoryname => $data->{'description'},	344	categoryname => $patron->category->description,
348	was_renewed => scalar $input->param('was_renewed') ? 1 : 0,	345	was_renewed => scalar $input->param('was_renewed') ? 1 : 0,
349	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),	346	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
350	totalprice => sprintf("%.2f", $totalprice),	347	totalprice => sprintf("%.2f", $totalprice),
Lines 353-358 $template->param( Link Here
353	overdues_exist => $overdues_exist,	350	overdues_exist => $overdues_exist,
354	StaffMember => $category_type eq 'S',	351	StaffMember => $category_type eq 'S',
355	is_child => $category_type eq 'C',	352	is_child => $category_type eq 'C',
		353	$category_type => 1, # [% IF ( I ) %] = institutional/organisation
356	samebranch => $samebranch,	354	samebranch => $samebranch,
357	quickslip => $quickslip,	355	quickslip => $quickslip,
358	housebound_role => scalar $patron->housebound_role,	356	housebound_role => scalar $patron->housebound_role,
359	-

Lines 23-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-3 / +4 lines)
23	[% INCLUDE 'member-display-address-style-us.inc' %]	23	[% INCLUDE 'member-display-address-style-us.inc' %]
24	[% END %]	24	[% END %]
25		25
26	[% IF ( phone ) %]<li class="patronphone">	26	[% IF ( phone \|\| mobile \|\| phonepro ) %]<li class="patronphone">
		27	[% IF ( phone ) %]
27	<a href="tel:[% phone \| url %]">[% phone \| html %]</a>	28	<a href="tel:[% phone \| url %]">[% phone \| html %]</a>
28	[% ELSE %]	29	[% ELSE %]
29	[% IF ( mobile ) %]	30	[% IF ( mobile ) %]
Lines 32-39 Link Here
32	[% IF ( phonepro ) %]	33	[% IF ( phonepro ) %]
33	<a href="tel:[% phonepro \| url %]">[% phonepro \| html %]</a>	34	<a href="tel:[% phonepro \| url %]">[% phonepro \| html %]</a>
34	[% END %]	35	[% END %]
35	[% END %]</li>	36	[% END %]
36	[% END %]	37	[% END %]</li>[% END %]
37	[% IF ( email ) %]	38	[% IF ( email ) %]
38	<li class="email"> <a href="mailto:[% email \| url %]" title="[% email \| html %]">[% email \| html %]</a></li>	39	<li class="email"> <a href="mailto:[% email \| url %]" title="[% email \| html %]">[% email \| html %]</a></li>
39	[% ELSE %]	40	[% ELSE %]