From 9c339f5941a3a628645e3f13c8fdbc92077ea4fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Fri, 20 May 2016 11:01:18 +0200 Subject: [PATCH] Bug 9543 - (Follow-up) Show patrons messaging subscription on holds notification As of comment #19 - Code de-duplicated to a BLOCK statement - Variable renamed - Wording slightly changed. I like it that way, but feel free to change it in a follow-up Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher --- .../prog/en/modules/circ/returns.tt | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index ec5f99bccf..f092ea83ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -6,6 +6,20 @@ [% USE AuthorisedValues %] [% USE ColumnsSettings %] +[% BLOCK display_bormessagepref %] + [% IF ( bormessagepref ) %] +
  • Patron notification: + [% FOREACH mtt IN bormessagepref.keys %] + [% IF ( mtt == 'email' ) %] Email. [% END %] + [% IF ( mtt == 'phone' ) %] Phone. [% END %] + [% IF ( mtt == 'sms' ) %] SMS. [% END %] + [% END %] +
  • + [% ELSE %] +
  • Patron is not notified.
  • + [% END %] +[% END %] + [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Check in [% title |html %] @@ -238,17 +252,7 @@ $(document).ready(function () { [% borcity %] [% borzip %] [% IF ( borphone ) %]
  • [% borphone %]
  • [% END %] [% IF ( boremail ) %]
  • [% boremail %]
  • [% END %] - [% IF ( bormessagepref ) %] -
  • Patron is notified: - [% FOREACH key IN bormessagepref.keys %] - [% IF ( key == 'email' ) %] Email. [% END %] - [% IF ( key == 'phone' ) %] Phone. [% END %] - [% IF ( key == 'sms' ) %] SMS. [% END %] - [% END %] -
  • - [% ELSE %] -
  • Patron is not notified
  • - [% END %] + [% INCLUDE display_bormessagepref %] [% IF ( debarred ) %]
  • Patron is RESTRICTED
  • [% END %] [% IF ( gonenoaddress ) %]
  • Patron's address is in doubt
  • [% END %] [% IF ( transfertodo ) %] @@ -410,17 +414,7 @@ $(document).ready(function () { [% IF ( borphone ) %]
  • [% borphone %]
  • [% END %] [% IF ( boremail ) %]
  • [% IF ( transfertodo ) %][% boremail %][% ELSE %][% boremail %][% END %]
  • [% END %] [% UNLESS ( transfertodo) %] - [% IF ( bormessagepref ) %] -
  • Patron is notified: - [% FOREACH key IN bormessagepref.keys %] - [% IF ( key == 'email' ) %] Email. [% END %] - [% IF ( key == 'phone' ) %] Phone. [% END %] - [% IF ( key == 'sms' ) %] SMS. [% END %] - [% END %] -
  • - [% ELSE %] -
  • Patron is not notified
  • - [% END %] + [% INCLUDE display_bormessagepref %] [% END %] [% IF ( debarred ) %]
  • Patron is RESTRICTED
  • [% END %] [% IF ( gonenoaddress ) %]
  • Patron's address is in doubt
  • [% END %] -- 2.39.5