From 7b0dfe892915f433d4cab9da3974d1e613c461ce 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 | 40 +++++++++++-------- 3 files changed, 27 insertions(+), 22 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 df26293f09..4be070bbd3 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 2a11246d32..38d11b850c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -233,7 +233,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 c609efda71..f11f178c99 100755 --- a/members/printslip.pl +++ b/members/printslip.pl @@ -68,15 +68,15 @@ output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log my $branch=C4::Context->userenv->{'branch'}; my ($letter, $slip, $is_html); if ( $print eq 'checkinslip' ) { - my $checkinslip_branch = $session->param('branch') ? $session->param('branch') : $branch; + my $checkinslip_branch = + $session->param('branch') ? $session->param('branch') : $branch; # get today's checkins - my @issue_ids = $patron->old_checkouts->search( { branchcode => $checkinslip_branch } ) + my @issue_ids = + $patron->old_checkouts->search( { branchcode => $checkinslip_branch } ) ->filter_by_todays_checkins->get_column('issue_id'); - my %loops = ( - old_issues => \@issue_ids, - ); + my %loops = ( old_issues => \@issue_ids, ); $letter = C4::Letters::GetPreparedLetter( module => 'circulation', @@ -91,24 +91,30 @@ 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); -} else { +} +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}; -- 2.30.2