From 44ebebb6a94a3baf8b41f56a2fbf7e533eff1579 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 11 Apr 2023 21:35:56 +0000 Subject: [PATCH] Bug 32986: (QA follow-up) Fix QA script complaints: tabs and TT filters * Perltidied the section with tabs in printslip.pl * Fixed indentation and tabs in letter.tt * Added missing TT filters to members-toolbar.inc --- .../prog/en/includes/members-toolbar.inc | 7 +++-- .../prog/en/modules/tools/letter.tt | 2 +- members/printslip.pl | 27 ++++++++++--------- tools/letter.pl | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 9976ec7bd1..4dfacc7d1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -32,10 +32,9 @@
  • Print overdues
  • [% END %]
  • Print checkin slip
  • - [% FOREACH notice IN Notices.GetTemplates( 'patron_slip' ) %] -
  • Print [% notice.name %] slip
  • - [% END %] - + [% FOREACH notice IN Notices.GetTemplates( 'patron_slip' ) %] +
  • Print [% notice.name | html %] slip
  • + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index f34c8ba2b7..a7c4a0afa9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -212,7 +212,7 @@ [% CASE 'claimissues' %]Claim serial issue [% CASE 'reserves' %]Holds [% CASE 'ill' %]Interlibrary loans - [% CASE 'members' %]Patrons + [% CASE 'members' %]Patrons [% CASE 'patron_slip' %]Patrons toolbar (slip) [% CASE 'serial' %]Serials (new issue) [% CASE 'suggestions' %]Suggestions diff --git a/members/printslip.pl b/members/printslip.pl index d693b7e55c..d7709775e6 100755 --- a/members/printslip.pl +++ b/members/printslip.pl @@ -66,13 +66,13 @@ my $patron = Koha::Patrons->find( $borrowernumber ); output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } ); my $branch=C4::Context->userenv->{'branch'}; -my ($letter, $slip, $is_html); +my ( $letter, $slip, $is_html ); if ( $print eq 'checkinslip' ) { my $checkinslip_branch = $session->param('branch') ? $session->param('branch') : $branch; # get today's checkins my @issue_ids = $patron->old_checkouts->filter_by_todays_checkins->get_column('issue_id'); - my %loops = ( + my %loops = ( old_issues => \@issue_ids, ); @@ -89,24 +89,25 @@ if ( $print eq 'checkinslip' ) { message_transport_type => 'print' ); -} elsif ( $print eq 'issueslip' ){ - $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumber, 0); -} elsif ( $print eq 'issueqslip' ){ - $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumber, 1); +} elsif ( $print eq 'issueslip' ) { + $letter = IssueSlip( $session->param('branch') || $branch, $borrowernumber, 0 ); +} elsif ( $print eq 'issueqslip' ) { + $letter = IssueSlip( $session->param('branch') || $branch, $borrowernumber, 1 ); } else { $letter = C4::Letters::GetPreparedLetter( - module => 'patron_slip', - letter_code => $print, - branchcode => $branch, - lang => $patron->lang, - tables => { - branches => $branch, - borrowers => $borrowernumber + module => 'patron_slip', + letter_code => $print, + branchcode => $branch, + lang => $patron->lang, + tables => { + branches => $branch, + borrowers => $borrowernumber }, message_transport_type => 'print' ); } + $slip = $letter->{content}; $is_html = $letter->{is_html}; diff --git a/tools/letter.pl b/tools/letter.pl index 85452aa531..4214d8e2cc 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -252,7 +252,7 @@ sub add_form { elsif ($module eq 'claimissues') { push @{$field_selection}, add_fields('aqbooksellers', 'serial', 'subscription', 'biblio', 'biblioitems'); } - elsif ($module eq 'patron_slip') { + elsif ( $module eq 'patron_slip' ) { push @{$field_selection}, add_fields('borrowers'); } elsif ($module eq 'serial') { -- 2.30.2