From 714ebfb66cba912aca366c946d26a0fa4dcbf63b Mon Sep 17 00:00:00 2001
From: Paul Derscheid <paul.derscheid@lmscloud.de>
Date: Tue, 6 Aug 2024 13:22:10 +0000
Subject: [PATCH] Bug 36915: (follow-up) Include branchname in sample notice

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 Koha/Booking.pm                                      | 2 +-
 installer/data/mysql/en/mandatory/sample_notices.yml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Koha/Booking.pm b/Koha/Booking.pm
index e5297d8d17..de230e0774 100644
--- a/Koha/Booking.pm
+++ b/Koha/Booking.pm
@@ -262,7 +262,7 @@ sub delete {
         message_transport_type => 'email',
         branchcode             => $pickup_library->branchcode,
         lang                   => $patron->lang,
-        objects                => { booking => $self }
+        objects                => { booking => $self, branch => $pickup_library }
     );
 
     if ($letter) {
diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index bf7e31eb44..b23f9db57e 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -62,7 +62,9 @@ tables:
             - "<br>"
             - "Dates: [% booking.start_date | $KohaDates %] to [% booking.end_date | $KohaDates %]<br>"
             - "<br>"
-            - "Your library."
+            - "Kind regards<br>"
+            - "<br>"
+            - "[% branch.branchname %]"
 
         - module: catalogue
           code: TICKET_ACKNOWLEDGE
-- 
2.39.5