Bugzilla – Attachment 52830 Details for
Bug 10760
Use Street Number and Street type in Alternate Address section
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10760: Alternate Address: Display street number and street type
Bug-10760-Alternate-Address-Display-street-number-.patch (text/plain), 4.85 KB, created by
Kyle M Hall (khall)
on 2016-06-24 16:09:01 UTC
(
hide
)
Description:
Bug 10760: Alternate Address: Display street number and street type
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-06-24 16:09:01 UTC
Size:
4.85 KB
patch
obsolete
>From c06d08bca89740f7a26d8a052dd84ed4caf2c768 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 14 Jun 2016 10:57:52 +0200 >Subject: [PATCH] Bug 10760: Alternate Address: Display street number and > street type > >This patch displays alternate streetnumber and street type on patron's >detail page. > >To test: >- Apply patch >- Verify that the alternate address information displays follwing the > setting in syspref AddressFormat and contains street type and > street number (as appropriate) > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../en/includes/member-display-alt-address-style-de.inc | 16 ++++++++++++++++ > .../en/includes/member-display-alt-address-style-us.inc | 16 ++++++++++++++++ > .../intranet-tmpl/prog/en/modules/members/moremember.tt | 14 ++++++++------ > 3 files changed, 40 insertions(+), 6 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc >new file mode 100644 >index 0000000..fc36c94 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc >@@ -0,0 +1,16 @@ >+[% IF ( B_address or B_address2 ) %] >+ [% IF ( B_address ) %] >+ [% SET roadtype_desc = '' %] >+ [% IF B_streettype %] >+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %] >+ [% END %] >+ <li class="patronaddress1">[% B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF B_streetnumber %] [% B_streetnumber %][% END %]</li> >+ [% END %] >+ [% IF ( B_address2 ) %] >+ <li class="patronaddress2">[% B_address2 %]</li> >+ [% END %] >+[% END %] >+[% IF ( B_city ) %]<li class="patroncity"> >+ [%IF ( B_zipcode ) %][% B_zipcode %] [% END %][% B_city %][% IF ( B_state ) %]</br>[% B_state %][% END %] >+ [% IF ( B_country ) %]<br />[% B_country %][% END %]</li> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc >new file mode 100644 >index 0000000..69d2f2b >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc >@@ -0,0 +1,16 @@ >+[% IF ( B_address or B_address2 ) %] >+ [% IF ( B_address ) %] >+ [% SET roadtype_desc = '' %] >+ [% IF B_streettype %] >+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %] >+ [% END %] >+ <li class="patronaddress1">[% if (B_streetnumber) %][% B_streetnumber %][% end %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% B_address %][% end %]</li> >+ [% END %] >+ [% IF ( B_address2 ) %] >+ <li class="patronaddress2">[% B_address2 %]</li> >+ [% END %] >+[% END %] >+[% IF ( B_city ) %]<li class="patroncity"> >+ [% B_city %][% IF ( B_state ) %], [% B_state %][% END %] >+ [% B_zipcode %][% IF ( B_country ) %], [% B_country %][% END %]</li> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 0847fca..024d742 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -414,12 +414,14 @@ function validate1(date) { > [% UNLESS ( I ) %] > <div id="patron-alternate-address" style="padding-top: 1em;"> > <h3>Alternate address</h3> >- <div class="rows"> <ol><li><span class="label">Address: </span>[% B_address %]</li> >- <li><span class="label">Address 2: </span>[% B_address2 %]</li> >- <li><span class="label">City: </span>[% B_city %]</li> >- [% IF ( B_state ) %]<li><span class="label">State: </span>[% B_state %]</li>[% END %] >- <li><span class="label">ZIP/Postal code: </span>[% B_zipcode %]</li> >- [% IF ( B_country ) %]<li><span class="label">Country: </span>[% B_country %]</li>[% END %] >+ >+ [% IF Koha.Preference( 'AddressFormat' ) %] >+ [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >+ [% ELSE %] >+ [% INCLUDE 'member-display-alt-address-style-us.inc' %] >+ [% END %] >+ >+ <div class="rows"> <ol> > [% IF ( B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% B_phone %]">[% B_phone %]</a></li>[% END %] > [% IF ( B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% B_email %]" href="mailto:[% B_email %]">[% B_email %]</a></li>[% END %] > [% IF ( contactnote ) %]<li><span class="label">Contact note: </span> [% contactnote %]</li>[% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10760
:
52351
|
52352
|
52595
|
52598
|
52599
|
52600
|
52829
| 52830 |
52831