From a887aeb2dff4e52f35f1f64bfc267867987cbb53 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 18 Aug 2017 00:14:52 +0200 Subject: [PATCH] Bug 19129 - Follow-up - Add changes to patron duplicate warning Adds logic from the previous fix to the brief patron summary shown when checking a possible patron duplicate. Bonus: Also fixes missing patron category description there. To Test: - Add 2 patrons - Add a patron with the same surname and firstname as an existing patron in order to trigger the duplicate message - Click "View existing patron" - Verify display is correct when existing patron is - an organisation - not an organisation - Verify that the patron category description shows Signed-off-by: Aleisha Amohia Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- .../en/modules/members/moremember-brief.tt | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index b95a4c050d..9cf356d644 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -26,27 +26,17 @@
    - [% IF ( I ) %] - [% IF ( phonepro ) %]
  1. Organization phone: [% phonepro %]
    2. [% END %] - [% IF ( emailpro ) %]
  2. Organization email: [% emailpro %]
    3. [% END %] - [% ELSE %] [% IF ( phone ) %]
  3. Primary phone: [% phone %]
    4. [% END %] [% IF ( phonepro ) %]
  4. Secondary phone: [% phonepro %]
    5. [% END %] [% IF ( mobile ) %]
  5. Other phone: [% mobile %]
    6. [% END %] - [% END %] - - [% IF ( P ) %] - [% IF ( phone ) %]
  6. Primary phone: [% phone %]
    7. [% END %] - [% IF ( mobile ) %]
  7. Other phone: [% mobile %]
    8. [% END %] - [% END %] - [% IF ( fax ) %]
  8. Fax: [% fax %]
    9. [% END %] - [% UNLESS ( I ) %] - [% IF ( email ) %][% END %] - [% IF ( emailpro ) %][% END %] - [% END %] -
  9. Initials: [% initials %]
    10. -
  10. Date of birth:[% dateofbirth | $KohaDates %]
    11. -
  11. Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
    12. [% END %] + [% IF ( fax ) %]
  12. Fax: [% fax %]
    13. [% END %] + [% IF ( email ) %][% END %] + [% IF ( emailpro ) %][% END %] + [% UNLESS ( I ) %] + [% IF ( inititals ) %]
  13. Initials: [% initials %]
    14. [% END %] + [% IF ( dateofbirth ) %]
  14. Date of birth:[% dateofbirth | $KohaDates %]
    15. [% END %] + [% IF ( sex ) %]
  15. Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
    16. [% END %][% END %] + [% END %] [% IF ( isguarantee ) %] [% IF ( guaranteeloop ) %]
  16. Guarantees:
    17. @@ -67,7 +57,7 @@
    1. Card number: [% cardnumber %]
    2. Borrowernumber: [% borrowernumber %]
      3. -
    3. Category: [% description %] ([% categorycode %])
      4. +
    4. Category: [% categoryname %] ([% categorycode %])
    5. Registration date: [% dateenrolled | $KohaDates %]
    6. Expiration date: [% IF ( was_renewed ) %] -- 2.39.5