From 258f18c9e58cf6a75ff1c05ebd4df33cc26434e4 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleisha@catalyst.net.nz>
Date: Sun, 12 Nov 2023 21:15:20 +0000
Subject: [PATCH] Bug 33478: Apply formatting to ISSUESLIP, ISSUEQSLIP,
 CHECKINSLIP

To test:

1. Check out an item to a patron
2. Click Print in the members toolbar, then Print quick slip
3. Confirm your format settings for ISSUEQSLIP are applied

4. Click Print in the members toolbar, then Print slip
5. Confirm your format settings for ISSUESLIP are applied

6. Return the item
7. When the item is checked in, click the 'Print checkin slip' button
8. Confirm your format settings for CHECKINSLIP are applied

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../intranet-tmpl/prog/en/modules/circ/printslip.tt   |  4 ++--
 members/printslip.pl                                  | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
index 85157a6d55..fd8077bcc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
@@ -29,7 +29,6 @@
 [% IF ( Koha.Preference('SlipCSS') ) %]
 <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | $raw %]" />
 [% END %]
-[% IF slip.style %]<style>[% slip.style | $raw %]</style>[% END %]
 
 [% INCLUDE 'slip-print.inc' #printThenClose %]
 </head>
@@ -37,9 +36,10 @@
 <div id="receipt">
 
 [% UNLESS slips && slips.size %]
-    [% SET slips = [{content => slip, is_html => !plain}] %]
+    [% SET slips = [{content => slip, is_html => !plain, style => style }] %]
 [% END %]
 [% FOR slip IN slips %]
+[% IF slip.style %]<style>[% slip.style | $raw %]</style>[% END %]
 [% UNLESS slip.is_html %]
 <pre>
 [% IF ( slip.content ) %][% slip.content | html %][% ELSE %]No slip template found[% END %]
diff --git a/members/printslip.pl b/members/printslip.pl
index d7709775e6..67df3fd808 100755
--- a/members/printslip.pl
+++ b/members/printslip.pl
@@ -113,12 +113,13 @@ $is_html = $letter->{is_html};
 
 
 $template->param(
-    slip => $slip,
-    plain => !$is_html,
+    slip           => $slip,
+    plain          => !$is_html,
     borrowernumber => $borrowernumber,
-    caller => 'members',
-    stylesheet => C4::Context->preference("SlipCSS"),
-    error           => $error,
+    caller         => 'members',
+    stylesheet     => C4::Context->preference("SlipCSS"),
+    error          => $error,
+    style          => $letter->{style},
 );
 
 $template->param( IntranetSlipPrinterJS => C4::Context->preference('IntranetSlipPrinterJS' ) );
-- 
2.39.5