From 9d10d076122c4adb6c14b1b86b3bcca0e33ecc4a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Aug 2018 10:03:42 -0300 Subject: [PATCH] Bug 21137: Replace BORROWER_INFO with logged_in_user it also removes 'category_type' and 'description' from a couple of opac scripts, they are not needed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../bootstrap/en/includes/patron-title.inc | 13 +++--- .../en/modules/opac-account-pay-error.tt | 2 +- .../bootstrap/en/modules/opac-account.tt | 2 +- .../bootstrap/en/modules/opac-illrequests.tt | 2 +- .../bootstrap/en/modules/opac-issue-note.tt | 2 +- .../opac-memberentry-update-submitted.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-messaging.tt | 2 +- .../bootstrap/en/modules/opac-passwd.tt | 2 +- .../bootstrap/en/modules/opac-privacy.tt | 2 +- .../en/modules/opac-readingrecord.tt | 2 +- .../en/modules/opac-routing-lists.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 44 +++++++++---------- opac/opac-account.pl | 6 --- opac/opac-messaging.pl | 2 +- opac/opac-routing-lists.pl | 5 --- opac/opac-user.pl | 3 +- 17 files changed, 43 insertions(+), 52 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc index 265125df5b..81a4e72591 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-title.inc @@ -1,5 +1,8 @@ -[% IF category_type == 'I' %] - [% surname %] [% IF othernames %] ([% othernames %]) [% END %] -[% ELSE %] - [% firstname %] [% surname %] -[% END %] +[%- IF patron.category.category_type == 'I' -%] + [% patron.surname %][% IF patron.othernames %] ([% patron.othernames %]) [%- END -%] +[%- ELSE -%] + [%- IF patron.title -%] + [% patron.title %] + [%- END -%] + [% patron.firstname %] [% patron.surname %] +[%- END -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt index d4fb5b5ce2..712f7bc251 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt @@ -9,7 +9,7 @@
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 2ea86074f2..f381668bc8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -19,7 +19,7 @@
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index 67cc39abe3..2ad7d56c70 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -17,7 +17,7 @@
  • Home ›
    • [% IF ( logged_in_user ) %] -
  • [% INCLUDE patron-title.inc patron = logged_in_user %] ›
    • +
  • [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ›
    • [% END %] [% IF method != 'list' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt index 03a6a7b6ea..f8ecf55d06 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt @@ -12,7 +12,7 @@
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt index 30714e0e04..a92a01ed25 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt @@ -10,7 +10,7 @@
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 7b391960af..f72274a57d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -24,7 +24,7 @@
    • Home ›
      • [% IF action == 'edit' %] -
    • [% borrower.firstname %] [% borrower.surname %] ›
      • +
    • [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ›
    • Your personal details
      • [% ELSE %]
    • Register a new account
      • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt index 6adfc97144..c12b0f84c7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -10,7 +10,7 @@
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt index f34b9193a7..07ba100df0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt @@ -11,7 +11,7 @@
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt index 143f4e023b..b7762890da 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt @@ -10,7 +10,7 @@
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 3fcd3fcc76..bf7f4132df 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -19,7 +19,7 @@
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt index 189b307cb7..c2b42ee138 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt @@ -15,7 +15,7 @@
      diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 3185ba1dda..5fc9a1a48d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -25,7 +25,7 @@
      @@ -41,10 +41,10 @@ [% INCLUDE 'opac-note.inc' %] -

      Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %] +

      Hello, [% INCLUDE 'patron-title.inc' patron = logged_in_user %]

      -

      Click here if you're not [% BORROWER_INFO.title %] [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]

      +

      Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]

      [% IF ( patronupdate ) %]

      Thank you!

      Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.

      [% END %] @@ -55,16 +55,16 @@
      [% END %] - [% IF ( BORROWER_INFO.warndeparture ) %] + [% IF ( borrower.warndeparture ) %]
      - Please note: Your card will expire on [% BORROWER_INFO.warndeparture | $KohaDates %]. Please contact the library for more information. - [% IF ( BORROWER_INFO.returnbeforeexpiry ) %] Also note that you must return all checked out items before your card expires.[% END %] + Please note: Your card will expire on [% borrower.warndeparture | $KohaDates %]. Please contact the library for more information. + [% IF ( borrower.returnbeforeexpiry ) %] Also note that you must return all checked out items before your card expires.[% END %]
      [% END %] - [% IF ( BORROWER_INFO.warnexpired ) %] + [% IF ( borrower.warnexpired ) %]
      - Please note: Your account has expired as of [% BORROWER_INFO.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account. + Please note: Your account has expired as of [% borrower.warnexpired | $KohaDates %]. Please contact the library if you wish to renew your account.
      [% END %] @@ -98,33 +98,33 @@ [% ELSE %]
    • Please note: Your account has been frozen. - [% IF ( BORROWER_INFO.debarredcomment ) %] + [% IF ( borrower.debarredcomment ) %] Comment: - [% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] + [% IF borrower.debarredcomment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% borrower.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] [% ELSE %] - [% BORROWER_INFO.debarredcomment | html_line_break %] + [% borrower.debarredcomment | html_line_break %] [% END %] [% END %] - [% IF ( BORROWER_INFO.userdebarreddate && debarred_date != '9999-12-31' ) %] + [% IF ( borrower.userdebarreddate && debarred_date != '9999-12-31' ) %] End date: - [% BORROWER_INFO.userdebarreddate | $KohaDates %] + [% borrower.userdebarreddate | $KohaDates %] [% END %] Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. Go to your account page
      • [% END %] [% END %] - [% IF ( BORROWER_INFO.gonenoaddress ) %] + [% IF ( borrower.gonenoaddress ) %]
    • Please note: According to our records, we don't have up-to-date contact information. Please contact the library. [% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %] [% IF ( Koha.Preference('OPACPatronDetails') ) %](Please note: there may be a delay in restoring your account if you submit online.)[% END %]
      • [% END %] - [% IF ( BORROWER_INFO.lost ) %] + [% IF ( borrower.lost ) %]
    • Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
      • [% END %] [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %] @@ -145,9 +145,9 @@ [% IF relatives %]
    • Relatives' checkouts
      • [% END %] [% IF ( overdues_count ) %]
    • Overdue ([% overdues_count %])
      • [% END %] [% IF ( OPACFinesTab ) %] - [% IF ( BORROWER_INFO.amountoverfive ) %]
    • Fines ([% amountoutstanding | $Price %])
      • [% END %] - [% IF ( BORROWER_INFO.amountoverzero ) %]
    • Fines ([% amountoutstanding | $Price %])
      • [% END %] - [% IF ( BORROWER_INFO.amountlessthanzero ) %]
    • Credits ([% amountoutstanding | $Price %])
      • [% END %] + [% IF ( borrower.amountoverfive ) %]
    • Fines ([% amountoutstanding | $Price %])
      • [% END %] + [% IF ( borrower.amountoverzero ) %]
    • Fines ([% amountoutstanding | $Price %])
      • [% END %] + [% IF ( borrower.amountlessthanzero ) %]
    • Credits ([% amountoutstanding | $Price %])
      • [% END %] [% END %] [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] @@ -367,7 +367,7 @@ [% IF ( OPACFinesTab ) %] - [% IF BORROWER_INFO.amountoverfive %] + [% IF borrower.amountoverfive %]

      Fines and charges

      @@ -381,7 +381,7 @@ [% END %] - [% IF BORROWER_INFO.amountoverzero %] + [% IF borrower.amountoverzero %]

      Fines and charges

      Amount
      @@ -395,7 +395,7 @@ [% END %] - [% IF BORROWER_INFO.amountlessthanzero %] + [% IF borrower.amountlessthanzero %]

      Credits

      Amount
      diff --git a/opac/opac-account.pl b/opac/opac-account.pl index 9611554b58..2cbbf4e053 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -40,12 +40,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $patron = Koha::Patrons->find( $borrowernumber ); -my $category = $patron->category; -my $borrower= $patron->unblessed; -$borrower->{description} = $category->description; -$borrower->{category_type} = $category->category_type; -$template->param( BORROWER_INFO => $borrower ); - my $total = $patron->account->balance; my $accts = Koha::Account::Lines->search( { borrowernumber => $patron->borrowernumber }, diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index d2c403311f..8189493197 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -71,7 +71,7 @@ if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) { C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $patron->borrowernumber }, $template); -$template->param( BORROWER_INFO => $patron->unblessed, +$template->param( messagingview => 1, SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above SMSSendDriver => C4::Context->preference("SMSSendDriver"), diff --git a/opac/opac-routing-lists.pl b/opac/opac-routing-lists.pl index 67bb5fa9a3..8c806e905c 100755 --- a/opac/opac-routing-lists.pl +++ b/opac/opac-routing-lists.pl @@ -42,11 +42,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $patron = Koha::Patrons->find( $borrowernumber ); -my $category = $patron->category; -my $borrower= $patron->unblessed; -$borrower->{description} = $category->description; -$borrower->{category_type} = $category->category_type; -$template->param( BORROWER_INFO => $borrower ); $template->param( routinglistsview => 1, diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 78bd30b319..94b0614f80 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -163,7 +163,7 @@ if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') # pass on any renew errors to the template for displaying my $renew_error = $query->param('renew_error'); -$template->param( BORROWER_INFO => $borr, +$template->param( amountoutstanding => $amountoutstanding, borrowernumber => $borrowernumber, patron_flagged => $borr->{flagged}, @@ -350,7 +350,6 @@ if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor' } $template->param( - borrower => scalar Koha::Patrons->find($borrowernumber), patron_messages => $patron_messages, opacnote => $borr->{opacnote}, patronupdate => $patronupdate, -- 2.39.5
      Amount