Attachment 164721 Details for Bug 33478 – Bug 33478: Apply formatting to ISSUESLIP, ISSUEQSLIP, CHECKINSLIP

[patch] Bug 33478: Apply formatting to ISSUESLIP, ISSUEQSLIP, CHECKINSLIP

Bug-33478-Apply-formatting-to-ISSUESLIP-ISSUEQSLIP.patch (text/plain), 2.65 KB, created by Nick Clemens (kidclamp) on 2024-04-11 14:09:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2024-04-11 14:09:41 UTC

Size: 2.65 KB

patch

obsolete

>From 58ca7a1d6c234f3110a7b308eae87541173a0eee 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>
>---
> .../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 85157a6d558..fd8077bcc44 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 d7709775e60..67df3fd808b 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.2

Actions: View | Diff | Splinter Review

Attachments on bug 33478: 149743 | 149785 | 149786 | 149787 | 149914 | 149915 | 149916 | 149917 | 149918 | 149999 | 150000 | 150001 | 150002 | 150003 | 150004 | 150005 | 150006 | 150007 | 150008 | 150009 | 150010 | 150011 | 150012 | 150265 | 150266 | 150267 | 150268 | 150269 | 150270 | 150271 | 150272 | 150273 | 150274 | 150275 | 150276 | 150277 | 150324 | 150325 | 150326 | 150327 | 150328 | 150329 | 150330 | 150331 | 150332 | 150333 | 150334 | 150335 | 150336 | 150337 | 150338 | 150339 | 150340 | 150341 | 150342 | 150343 | 150344 | 150345 | 151548 | 151580 | 151581 | 151582 | 151583 | 151584 | 151585 | 151586 | 151587 | 151588 | 151589 | 151590 | 151591 | 151592 | 151593 | 156469 | 157368 | 157369 | 157370 | 157371 | 157372 | 157373 | 157374 | 157375 | 157376 | 157377 | 157378 | 157379 | 157380 | 157381 | 157382 | 157387 | 158835 | 158836 | 158837 | 158838 | 158839 | 158840 | 158841 | 158842 | 158843 | 158844 | 158845 | 158846 | 158847 | 158848 | 158849 | 158856 | 162556 | 162557 | 162558 | 162559 | 162560 | 162561 | 162562 | 162563 | 162564 | 162565 | 162566 | 162567 | 162568 | 162569 | 163903 | 163904 | 163905 | 163906 | 163907 | 163908 | 163909 | 163910 | 163911 | 163912 | 163913 | 163914 | 163915 | 163916 | 163924 | 163925 | 163926 | 163927 | 163928 | 163929 | 163930 | 163931 | 163932 | 163933 | 163934 | 163935 | 163936 | 163937 | 163938 | 164719 | 164720 | 164721 | 164722 | 164723 | 164724 | 164725 | 164726 | 164727 | 164728 | 164729 | 164730 | 164731 | 164732 | 164733 | 164741 | 164742 | 164743 | 164744 | 164745 | 164746 | 164747 | 164748 | 164749 | 164750 | 164751 | 164752 | 164753 | 164754 | 164755