From b2b4be996aba9356662b05e4427d00e33dda9081 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Sat, 21 Jan 2017 15:48:57 +0100
Subject: [PATCH] Bug 17964: Add old_issues

If it's a CHECKIN, C4::Circulation::SendCirculationAlert set a
"old_issues" key instead of "issues".

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 C4/Letters.pm                            |  6 ++++++
 t/db_dependent/Letters/TemplateToolkit.t | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index cf13bae474..749ce78136 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -1545,6 +1545,12 @@ sub _get_tt_params {
             plural   => 'checkouts',
             fk       => 'itemnumber',
         },
+        old_issues => {
+            module   => 'Koha::Old::Checkouts',
+            singular => 'old_checkout',
+            plural   => 'old_checkouts',
+            fk       => 'itemnumber',
+        },
         borrower_modifications => {
             module   => 'Koha::Patron::Modifications',
             singular => 'patron_modification',
diff --git a/t/db_dependent/Letters/TemplateToolkit.t b/t/db_dependent/Letters/TemplateToolkit.t
index b52097db84..1161690e1e 100644
--- a/t/db_dependent/Letters/TemplateToolkit.t
+++ b/t/db_dependent/Letters/TemplateToolkit.t
@@ -417,13 +417,13 @@ The following items have been checked out:
 Thank you for visiting <<branches.branchname>>.
 |;
         reset_template( { template => $checkout_template, code => $checkout_code, module => 'circulation' } );
-        my $checkin_template = q|
+        my $checkin_template = q[
 The following items have been checkin out:
 ----
-<<biblio.title>>
+<<biblio.title>> was due on <<old_issues.date_due | dateonly>>
 ----
 Thank you for visiting <<branches.branchname>>.
-|;
+];
         reset_template( { template => $checkin_template, code => $checkin_code, module => 'circulation' } );
 
         C4::Circulation::AddIssue( $patron, $item1->{barcode} );
@@ -447,13 +447,13 @@ The following items have been checked out:
 Thank you for visiting [% branch.branchname %].
 |;
         reset_template( { template => $checkout_template, code => $checkout_code, module => 'circulation' } );
-        $checkin_template = q|
+        $checkin_template = q[
 The following items have been checkin out:
 ----
-[% biblio.title %]
+[% biblio.title %] was due on [% old_checkout.date_due | $KohaDates %]
 ----
 Thank you for visiting [% branch.branchname %].
-|;
+];
         reset_template( { template => $checkin_template, code => $checkin_code, module => 'circulation' } );
 
         C4::Circulation::AddIssue( $patron, $item1->{barcode} );
-- 
2.39.5