From a1edf06869c3bf2e82577a32aee3eefbb7dc9219 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 30 Sep 2022 12:01:36 +0000
Subject: [PATCH] Bug 31664: Display pending transfer information on details
 page

If a transfer is requested, but not sent, we should display this information on biblio details for staff

This patch also removes nocancel parameter that was not used, passes transfer object directly to template

To test
1 - Manually transfer an item
2 - Note the item shows in transit on details page
3 - Remove the datesent to emulate a pending transfer
    UPDATE branchtransfers SET datesent = NULL itemnumber=1;
4 - View details page - no info on transfer
5 - Apply patch
6 - Item shows 'Transit pending'

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 catalogue/detail.pl                                   |  7 ++-----
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 11 ++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 3af82774ce..5cb556ae05 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -402,11 +402,8 @@ foreach my $item (@items) {
 
     # Check the transit status
     my $transfer = $item->get_transfer;
-    if ( $transfer && $transfer->in_transit ) {
-        $item_info->{transfertwhen} = $transfer->datesent;
-        $item_info->{transfertfrom} = $transfer->frombranch;
-        $item_info->{transfertto} = $transfer->tobranch;
-        $item_info->{nocancel} = 1;
+    if ( $transfer ) {
+        $item_info->{transfer} = $transfer;
     }
 
     foreach my $f (qw( itemnotes )) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 5a14e60aaa..93aa33516e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -475,8 +475,13 @@ Note that permanent location is a code, and location may be an authval.
                                 [% END %]
                                 : due [% item.checkout.date_due | $KohaDates as_due_date => 1 %]
                             </span>
-                        [% ELSIF ( item.transfertwhen ) %]
-                            <span class="intransit">In transit from [% Branches.GetName( item.transfertfrom ) | html %] to [% Branches.GetName( item.transfertto ) | html %] since [% item.transfertwhen | $KohaDates %]</span>
+                        [% ELSIF ( item.transfer ) %]
+                            [% IF (item.transfer.datesent) %]
+                                <span class="intransit">In transit from [% Branches.GetName( item.transfer.frombranch ) | html %] to [% Branches.GetName( item.transfer.tobranch ) | html %] since [% item.transfer.datesent | $KohaDates %]</span>
+                            [% ELSE %]
+                                <span class="transitrequested">Transit pending from [% Branches.GetName( item.transfer.frombranch ) | html %] to [% Branches.GetName( item.transfer.tobranch ) | html %] since [% item.transfer.daterequested | $KohaDates %]</span>
+
+                            [% END %]
                         [% END %]
 
                         [% IF ( item.itemlost ) %]
@@ -547,7 +552,7 @@ Note that permanent location is a code, and location may be an authval.
                             [% END %]
                         [% END %]
 
-                        [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || ( Koha.Preference('UseRecalls') && recall ) ) %]
+                        [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfer || hold || ( Koha.Preference('UseRecalls') && recall ) ) %]
                             <span>Available</span>
                         [% END %]
 
-- 
2.39.5