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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-5 / +2 lines)
Lines 1-5 Link Here
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 ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc (-16 lines)
Lines 1-16 Link Here
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 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc (-19 lines)
Lines 1-19 Link Here
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">[% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
8
        [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
9
            [% patron.address | html %]
10
        </li>
11
    [% END %]
12
    [% IF ( patron.address2 ) %]
13
        <li class="patronaddress2">[% patron.address2 | html %]</li>
14
    [% END %]
15
[% END %]
16
[% IF ( patron.city ) %]
17
    <li class="patroncity">[%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
18
    [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]</li>
19
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc (-16 lines)
Lines 1-16 Link Here
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">[% if (patron.streetnumber) | html %][% patron.streetnumber |html  %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end | html %]</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
        [% patron.city |html  %][% IF ( patron.state ) %], [% patron.state |html  %][% END %]
15
        [% patron.zipcode |html  %][% IF ( patron.country ) %], [% patron.country |html  %][% END %]</li>
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (+74 lines)
Line 0 Link Here
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 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-5 / +2 lines)
Lines 6-11 Link Here
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' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-5 / +2 lines)
Lines 1-6 Link Here
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 ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
22
        [% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% 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">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-5 / +2 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Price %]
4
[% USE Price %]
5
[% USE ItemTypes %]
5
[% USE ItemTypes %]
6
[% PROCESS 'member-display-address-style.inc' %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
8
8
[% PROCESS 'accounts.inc' %]
9
[% PROCESS 'accounts.inc' %]
Lines 17-27 Link Here
17
        <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>
18
        <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>
18
19
19
        <ul>
20
        <ul>
20
            [% IF Koha.Preference( 'AddressFormat' ) %]
21
            [% PROCESS 'display-address-style' %]
21
                [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
22
            [% ELSE %]
23
                [% INCLUDE 'member-display-address-style-us.inc' %]
24
            [% END %]
25
            <li>[% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %]</li>
22
            <li>[% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %]</li>
26
            <li>[% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %]</li>
23
            <li>[% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %]</li>
27
            [% IF ( patron.emailpro ) %]
24
            [% IF ( patron.emailpro ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-6 / +2 lines)
Lines 6-11 Link Here
6
[% USE AuthorisedValues %]
6
[% USE AuthorisedValues %]
7
[% USE ColumnsSettings %]
7
[% USE ColumnsSettings %]
8
[% USE Price %]
8
[% USE Price %]
9
[% PROCESS 'member-display-address-style.inc' %]
9
[% SET footerjs = 1 %]
10
[% SET footerjs = 1 %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
12
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
Lines 184-194 Link Here
184
185
185
                                <div class="address">
186
                                <div class="address">
186
                                    <ul>
187
                                    <ul>
187
                                        [% IF Koha.Preference( 'AddressFormat' ) %]
188
                                        [% PROCESS 'display-address-style' %]
188
                                            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
189
                                        [% ELSE %]
190
                                            [% INCLUDE 'member-display-address-style-us.inc' %]
191
                                        [% END %]
192
                                    </ul>
189
                                    </ul>
193
                                </div>
190
                                </div>
194
191
195
- 

Return to bug 25070