From ede0b2393bfe25813b65947a45b772823888752f Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Fri, 27 Oct 2023 23:36:05 +0000 Subject: [PATCH] Bug 27992: Call AddReturn on stats patron --- C4/Circulation.pm | 16 +++++++++-- .../prog/en/modules/circ/circulation.tt | 27 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 2e9ed52bdcd..fe3964230c9 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -826,8 +826,20 @@ sub CanBookBeIssued { interface => C4::Context->interface, } ); - ModDateLastSeen( $item_object->itemnumber ); # FIXME Move to Koha::Item - return( { STATS => 1 }, {}); + my $block_lost_return = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0; + my ( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower) = + AddReturn( $item_object->barcode, C4::Context->userenv->{'branch'} ); + ModDateLastSeen( $item_object->itemnumber, $block_lost_return ); # FIXME Move to Koha::Item + return ( + { + STATS => 1, + CHECKEDIN => $stats_return, + MESSAGES => $stats_messages, + ITEM => $stats_iteminformation, + BORROWER => $stats_borrower, + }, + {} + ); } if ( $patron->gonenoaddress && $patron->gonenoaddress == 1 ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index dfc42a6b9e1..dc612cb2a7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -417,8 +417,33 @@ [% IF ( STATS ) %]
  • Local use recorded
  • + [% IF ( CHECKEDIN ) %] +
  • Item returned from: [% INCLUDE 'patron-title.inc' patron=BORROWER %]
  • + [% END %] + [% IF ( MESSAGES.ResFound ) %] +
  • Item on hold, please checkin.
  • + [% END %] + [% IF ( MESSAGES.ReturnClaims ) %] +
  • Item claimed returned, please checkin.
  • + [% END %] + [% IF ( MESSAGES.RecallFound ) %] +
  • Item can fill a recall, please checkin.
  • + [% END %] + [% IF ( MESSAGES.WasLost ) %] + [% IF ( Koha.Preference('BlockReturnOfLostItems') ) %] +
  • Item was lost, cannot be returned.
  • + [% ELSE %] +
  • Item was lost, now found.
  • + [% END %] + [% END %] + [% IF ( MESSAGES.withdrawn ) %] + [% IF ( Koha.Preference('BlockReturnOfWithdrawnItems') ) %] +
  • Item was withdrawn, cannot be returned.
  • + [% ELSE %] +
  • Item was withdrawn
  • + [% END %] + [% END %] [% END %] - [% IF ( INVALID_DATE ) %]
  • The due date "[% INVALID_DATE | $KohaDates %]" is invalid
  • [% END %] -- 2.30.2