From f9f92fd7133b2dc4f8eebbe9c425da6130014ad4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 31 Dec 2014 13:23:06 +0100 Subject: [PATCH] Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT notices If only 1 item exist in the message, the marker is not removed. This marker is removed by render_metadata, but this method is only called on appending. Test plan: 1/ Enable the CHECKIN and/or CHECKOUT notices for a patron 2/ check and item in or out and verify that the marker is no longer displayed in the generated notices. Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 936a4f22288ff013a2e4269a934df7fa900c7336) Signed-off-by: Chris Cormack --- C4/Message.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/C4/Message.pm b/C4/Message.pm index a63b3caa96..eb27a20b0f 100644 --- a/C4/Message.pm +++ b/C4/Message.pm @@ -159,8 +159,13 @@ sub enqueue { my ($class, $letter, $borrower, $transport) = @_; my $metadata = _metadata($letter); my $to_address = _to_address($borrower, $transport); + + # Same as render_metadata + my $format ||= sub { $_[0] || "" }; + my $body = join('', map { $format->($_) } @{$metadata->{body}}); + $letter->{content} = $metadata->{header} . $body . $metadata->{footer}; + $letter->{metadata} = Dump($metadata); - #carp "enqueuing... to $to_address"; C4::Letters::EnqueueLetter({ letter => $letter, borrowernumber => $borrower->{borrowernumber}, -- 2.39.5