Attachment #104661 for bug #25070

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




[% USE Koha %]
[% USE KohaDates %]
[% PROCESS 'member-display-address-style.inc' %]
[% IF ( patron.borrowernumber ) %]
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>



<ul class="patronbriefinfo">
    [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
        [% PROCESS 'display-address-style' %]
            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
        [% ELSE %]
            [% INCLUDE 'member-display-address-style-us.inc' %]
        [% END %]

        [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
        [% IF ( patron.phone ) %]




[% IF ( patron.address or patron.address2 ) %]
    [% IF ( patron.address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
        [% END %]
        <li class="patronaddress1">[% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]</li>
    [% END %]
    [% IF ( patron.address2 ) %]
        <li class="patronaddress2">[% patron.address2 | html %]</li>
    [% END %]
[% END %]
[% IF ( patron.city ) %]<li class="patroncity">
    [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
    [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]</li>
[% END %]




[% IF ( patron.address or patron.address2 ) %]
    [% IF ( patron.address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
        [% END %]
        <li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
        [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
            [% patron.address | html %]
        </li>
    [% END %]
    [% IF ( patron.address2 ) %]
        <li class="patronaddress2">[% patron.address2 | html %]</li>
    [% END %]
[% END %]
[% IF ( patron.city ) %]
    <li class="patroncity">[%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
    [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]</li>
[% END %]




[% IF ( patron.address or patron.address2 ) %]
    [% IF ( patron.address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
        [% END %]
        <li class="patronaddress1">[% if (patron.streetnumber) | html %][% patron.streetnumber |html  %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end | html %]</li>
    [% END %]
    [% IF ( patron.address2 ) %]
        <li class="patronaddress2">[% patron.address2 |html  %]</li>
    [% END %]
[% END %]
[% IF ( patron.city ) %]<li class="patroncity">
        [% patron.city |html  %][% IF ( patron.state ) %], [% patron.state |html  %][% END %]
        [% patron.zipcode |html  %][% IF ( patron.country ) %], [% patron.country |html  %][% END %]</li>
[% END %]




[% USE Koha %]
[% BLOCK 'display-address-style' %]
    [% IF Koha.Preference( 'AddressFormat' ) %]
        [% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
    [% ELSE %]
        [% PROCESS 'member-display-address-style-us' %]
    [% END %]
[% END %]

[% BLOCK 'member-display-address-style-us' %]
    [% IF ( patron.address or patron.address2 ) %]
        [% IF ( patron.address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
            [% END %]
            <li class="patronaddress1">[% if (patron.streetnumber) | html %][% patron.streetnumber |html  %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end | html %]</li>
        [% END %]
        [% IF ( patron.address2 ) %]
            <li class="patronaddress2">[% patron.address2 |html  %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.city ) %]
        <li class="patroncity">
            [% patron.city |html  %][% IF ( patron.state ) %], [% patron.state |html  %][% END %]
            [% patron.zipcode |html  %][% IF ( patron.country ) %], [% patron.country |html  %][% END %]
        </li>
    [% END %]
[% END %]

[% BLOCK 'member-display-address-style-de' %]
    [% IF ( patron.address or patron.address2 ) %]
        [% IF ( patron.address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
            [% END %]
            <li class="patronaddress1">[% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]</li>
        [% END %]
        [% IF ( patron.address2 ) %]
            <li class="patronaddress2">[% patron.address2 | html %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.city ) %]
        <li class="patroncity">
            [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
            [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]
        </li>
    [% END %]
[% END %]

[% BLOCK 'member-display-address-style-fr' %]
    [% IF ( patron.address or patron.address2 ) %]
        [% IF ( patron.address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
            [% END %]
            <li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
            [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
                [% patron.address | html %]
            </li>
        [% END %]
        [% IF ( patron.address2 ) %]
            <li class="patronaddress2">[% patron.address2 | html %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.city ) %]
        <li class="patroncity">
            [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
            [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]
        </li>
    [% END %]
[% END %]




[% USE ItemTypes %]
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% BLOCK display_bormessagepref %]
    [% IF ( bormessagepref ) %]

[% END %]

[% BLOCK display_holdpatron_address %]
    [% PROCESS 'display-address-style' %]
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
    [% ELSE %]
        [% INCLUDE 'member-display-address-style-us.inc' %]
    [% END %]
[% END %]

[% INCLUDE 'doc-head-open.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Check duplicate patron</title>

        [% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
        <div class = "address">
            <ul>
                [% PROCESS 'display-address-style' %]
                    [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
                [% ELSE %]
                    [% INCLUDE 'member-display-address-style-us.inc' %]
                [% END %]
            </ul>
        </div>
    <div class="rows">




[% USE KohaDates %]
[% USE Price %]
[% USE ItemTypes %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]

[% PROCESS 'accounts.inc' %]

        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | uri %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3>

        <ul>
            [% PROCESS 'display-address-style' %]
                [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
            [% ELSE %]
                [% INCLUDE 'member-display-address-style-us.inc' %]
            [% END %]
            <li>[% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %]</li>
            <li>[% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %]</li>
            [% IF ( patron.emailpro ) %]




[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
[% USE Price %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]


                                <div class="address">
                                    <ul>
                                        [% PROCESS 'display-address-style' %]
                                            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
                                        [% ELSE %]
                                            [% INCLUDE 'member-display-address-style-us.inc' %]
                                        [% END %]
                                    </ul>
                                </div>

- 

Return to bug 25070

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-5 / +2 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE KohaDates %]	2	[% USE KohaDates %]
		3	[% PROCESS 'member-display-address-style.inc' %]
3	[% IF ( patron.borrowernumber ) %]	4	[% IF ( patron.borrowernumber ) %]
4	<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>	5	<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
5		6
Lines 29-39 Link Here
29		30
30	<ul class="patronbriefinfo">	31	<ul class="patronbriefinfo">
31	[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]	32	[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
32	[% IF Koha.Preference( 'AddressFormat' ) %]	33	[% PROCESS 'display-address-style' %]
33	[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
34	[% ELSE %]
35	[% INCLUDE 'member-display-address-style-us.inc' %]
36	[% END %]
37		34
38	[% IF ( patron.phone \|\| patron.mobile \|\| patron.phonepro ) %]<li class="patronphone">	35	[% IF ( patron.phone \|\| patron.mobile \|\| patron.phonepro ) %]<li class="patronphone">
39	[% IF ( patron.phone ) %]	36	[% IF ( patron.phone ) %]

Lines 1-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc (-16 lines)
1	[% IF ( patron.address or patron.address2 ) %]
2	[% IF ( patron.address ) %]
3	[% SET roadtype_desc = '' %]
4	[% IF patron.streettype %]
5	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
6	[% END %]
7	<li class="patronaddress1">[% patron.address \| html %][%IF roadtype_desc %] [% roadtype_desc \| html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber \| html %][% END %]</li>
8	[% END %]
9	[% IF ( patron.address2 ) %]
10	<li class="patronaddress2">[% patron.address2 \| html %]</li>
11	[% END %]
12	[% END %]
13	[% IF ( patron.city ) %]<li class="patroncity">
14	[%IF ( patron.zipcode ) %][% patron.zipcode \| html %] [% END %][% patron.city \| html %][% IF ( patron.state ) %]</br>[% patron.state \| html %][% END %]
15	[% IF ( patron.country ) %]<br />[% patron.country \| html %][% END %]</li>
16	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (+74 lines)
		1	[% USE Koha %]
		2	[% BLOCK 'display-address-style' %]
		3	[% IF Koha.Preference( 'AddressFormat' ) %]
		4	[% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
		5	[% ELSE %]
		6	[% PROCESS 'member-display-address-style-us' %]
		7	[% END %]
		8	[% END %]
		9
		10	[% BLOCK 'member-display-address-style-us' %]
		11	[% IF ( patron.address or patron.address2 ) %]
		12	[% IF ( patron.address ) %]
		13	[% SET roadtype_desc = '' %]
		14	[% IF patron.streettype %]
		15	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
		16	[% END %]
		17	<li class="patronaddress1">[% if (patron.streetnumber) \| html %][% patron.streetnumber \|html %][% end \| html %] [% patron.address \| html %] [% IF roadtype_desc %][% roadtype_desc \|html %] [% END %][% end \| html %]</li>
		18	[% END %]
		19	[% IF ( patron.address2 ) %]
		20	<li class="patronaddress2">[% patron.address2 \|html %]</li>
		21	[% END %]
		22	[% END %]
		23	[% IF ( patron.city ) %]
		24	<li class="patroncity">
		25	[% patron.city \|html %][% IF ( patron.state ) %], [% patron.state \|html %][% END %]
		26	[% patron.zipcode \|html %][% IF ( patron.country ) %], [% patron.country \|html %][% END %]
		27	</li>
		28	[% END %]
		29	[% END %]
		30
		31	[% BLOCK 'member-display-address-style-de' %]
		32	[% IF ( patron.address or patron.address2 ) %]
		33	[% IF ( patron.address ) %]
		34	[% SET roadtype_desc = '' %]
		35	[% IF patron.streettype %]
		36	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
		37	[% END %]
		38	<li class="patronaddress1">[% patron.address \| html %][%IF roadtype_desc %] [% roadtype_desc \| html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber \| html %][% END %]</li>
		39	[% END %]
		40	[% IF ( patron.address2 ) %]
		41	<li class="patronaddress2">[% patron.address2 \| html %]</li>
		42	[% END %]
		43	[% END %]
		44	[% IF ( patron.city ) %]
		45	<li class="patroncity">
		46	[% IF ( patron.zipcode ) %][% patron.zipcode \| html %] [% END %][% patron.city \| html %][% IF ( patron.state ) %]</br>[% patron.state \| html %][% END %]
		47	[% IF ( patron.country ) %]<br />[% patron.country \| html %][% END %]
		48	</li>
		49	[% END %]
		50	[% END %]
		51
		52	[% BLOCK 'member-display-address-style-fr' %]
		53	[% IF ( patron.address or patron.address2 ) %]
		54	[% IF ( patron.address ) %]
		55	[% SET roadtype_desc = '' %]
		56	[% IF patron.streettype %]
		57	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
		58	[% END %]
		59	<li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber \| html %] [% END %]
		60	[%IF roadtype_desc %][% roadtype_desc \| html %] [% END %]
		61	[% patron.address \| html %]
		62	</li>
		63	[% END %]
		64	[% IF ( patron.address2 ) %]
65	<li class="patronaddress2">[% patron.address2 \| html %]</li>
66	[% END %]
67	[% END %]
68	[% IF ( patron.city ) %]
69	<li class="patroncity">
70	[% IF ( patron.zipcode ) %][% patron.zipcode \| html %] [% END %][% patron.city \| html %][% IF ( patron.state ) %]</br>[% patron.state \| html %][% END %]
71	[% IF ( patron.country ) %]<br />[% patron.country \| html %][% END %]
72	</li>
73	[% END %]
74	[% END %]

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-5 / +2 lines)
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
7	[% USE AuthorisedValues %]	7	[% USE AuthorisedValues %]
8	[% USE ColumnsSettings %]	8	[% USE ColumnsSettings %]
		9	[% PROCESS 'member-display-address-style.inc' %]
9	[% SET footerjs = 1 %]	10	[% SET footerjs = 1 %]
10	[% BLOCK display_bormessagepref %]	11	[% BLOCK display_bormessagepref %]
11	[% IF ( bormessagepref ) %]	12	[% IF ( bormessagepref ) %]
Lines 23-33 Link Here
23	[% END %]	24	[% END %]
24		25
25	[% BLOCK display_holdpatron_address %]	26	[% BLOCK display_holdpatron_address %]
26	[% IF Koha.Preference( 'AddressFormat' ) %]	27	[% PROCESS 'display-address-style' %]
27	[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
28	[% ELSE %]
29	[% INCLUDE 'member-display-address-style-us.inc' %]
30	[% END %]
31	[% END %]	28	[% END %]
32		29
33	[% INCLUDE 'doc-head-open.inc' %]	30	[% INCLUDE 'doc-head-open.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-5 / +2 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
		4	[% PROCESS 'member-display-address-style.inc' %]
4	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Koha &rsaquo; Check duplicate patron</title>	7	<title>Koha &rsaquo; Check duplicate patron</title>
Lines 21-31 Link Here
21	[% IF ( patron.othernames ) %]“[% patron.othernames \| html %]”[% END %]	22	[% IF ( patron.othernames ) %]“[% patron.othernames \| html %]”[% END %]
22	<div class = "address">	23	<div class = "address">
23	<ul>	24	<ul>
24	[% IF Koha.Preference( 'AddressFormat' ) %]	25	[% PROCESS 'display-address-style' %]
25	[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
26	[% ELSE %]
27	[% INCLUDE 'member-display-address-style-us.inc' %]
28	[% END %]
29	</ul>	26	</ul>
30	</div>	27	</div>
31	<div class="rows">	28	<div class="rows">