From 652a31dc269a6f48fab6bf6cfb64dd39c1bf0ea9 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Tue, 18 Mar 2025 10:53:18 +0100 Subject: [PATCH] Bug 34756: (follow-up) Rework the transfer cancellation modal --- .../prog/en/includes/holds_table.inc | 3 ++- .../prog/en/modules/reserve/request.tt | 16 +++++++++++++--- reserve/request.pl | 7 +++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index c671eb1e..ccc09ba0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -186,6 +186,7 @@ [%- IF ( hold.atdestination ) -%] Item waiting at [% hold.wbrname | html %][% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %] [%- ELSIF (hold.intransit) -%] + Item being transferred to [% hold.wbrname | html %] [%- ELSIF (hold.inprocessing) -%] Item being processed at [% hold.wbrname | html %] @@ -299,7 +300,7 @@ [%- END -%] [%- END -%] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index f54b32da..2bc72ae8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1406,6 +1406,7 @@ [% END %] +
@@ -1796,13 +1797,22 @@ let reserve_id = cancel_link.data('id'); let biblionumber = cancel_link.data('biblionumber'); let transfer = cancel_link.data('transfer'); + let transferTo = cancel_link.data('transfer-to'); + let transferFrom = cancel_link.data('transfer-from'); + let transferDate = cancel_link.data('transfer-date'); $("#cancel_modal_form #inputs").append(''); $("#cancel_modal_form #inputs").append(''); $("#cancel_modal_form #inputs").append(''); if(transfer){ - $("#transfer-cancellation").empty() - $("#transfer-cancellation").append(''); - $("#transfer-cancellation").append(' '); + let transferElement = $("#transfer-cancellation"); + transferElement.empty(); + transferElement[0].classList.add("alert", "alert-warning", "audio-alert-warning"); + transferElement.append('

A transfer related to this hold has been detected

'); + transferElement.append(' Date: ' + transferDate + '
'); + transferElement.append('From: ' + transferFrom + '
'); + transferElement.append('To: ' + transferTo + '
'); + transferElement.append(''); + transferElement.append(' '); } $('#cancelModal').modal('show'); return false; diff --git a/reserve/request.pl b/reserve/request.pl index 158e4c94..05d2d278 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -116,6 +116,7 @@ if ( $op eq 'cud-move' ) { my $hold = Koha::Holds->find($reserve_id); if( $transfer ) { + warn "Cancelling Transfer"; warn($hold->item()->get_transfer); $hold->item()->get_transfer->cancel( { reason => 'Manual', 'force' => '1' } ); } @@ -648,6 +649,12 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) $reserve{'inprocessing'} = $res->is_in_processing(); $reserve{'intransit'} = $res->is_in_transit(); $reserve{'transfer'} = $res->item()->get_transfer() ? '1' : '0'; + my $transfer = $res->item()->get_transfer(); + if ($transfer){ + $reserve{'transferdate'} = $transfer->datesent; + $reserve{'transferfrom'} = $transfer->frombranch; + $reserve{'transferto'} = $transfer->tobranch; + } } elsif ( $res->priority() > 0 ) { if ( my $item = $res->item() ) { $reserve{'itemnumber'} = $item->id(); -- 2.30.2