gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 20948: Simplify existing code 

No changes expected here.

Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit bdffc685f2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 62021926df)
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
This commit is contained in:
Jonathan Druart 2019-11-18 10:10:56 +01:00 committed by Hayley Mapley
parent 616c113d78
commit caf97029df
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
catalogue/detail.pl
View File

@ -281,13 +281,7 @@ foreach my $item (@items) {
my $item_object = Koha::Items->find( $item->{itemnumber} );
my $holds = $item_object->current_holds;
if ( my $first_hold = $holds->next ) {
my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
$item->{backgroundcolor} = 'reserved';
$item->{reservedate} = $first_hold->reservedate;
$item->{ReservedFor} = $patron,
$item->{ExpectedAtLibrary} = $first_hold->branchcode;
# Check waiting status
$item->{waitingdate} = $first_hold->waitingdate;
$item->{first_hold} = $first_hold;
}
if ( my $checkout = $item_object->checkout ) {

13
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
View File

@ -484,18 +484,19 @@
[% END %]
[% END %]
[% IF ( item.reservedate ) %]
[% IF ( item.waitingdate ) %]
Waiting at [% Branches.GetName( item.ExpectedAtLibrary ) | html %] since [% item.waitingdate | $KohaDates %].
[% SET hold = item.first_hold %]
[% IF hold %]
[% IF hold.waitingdate %]
Waiting at [% Branches.GetName( hold.branchcode ) | html %] since [% hold.waitingdate | $KohaDates %].
[% ELSE %]
Item-level hold (placed [% item.reservedate | $KohaDates %]) for delivery at [% Branches.GetName( item.ExpectedAtLibrary ) | html %].
Item-level hold (placed [% hold.reservedate | $KohaDates %]) for delivery at [% Branches.GetName( hold.branchcode ) | html %].
[% END %]
[% IF ( canreservefromotherbranches ) %]
Hold for:
[% INCLUDE 'patron-title.inc' patron=item.ReservedFor hide_patron_infos_if_needed=1 %]
[% INCLUDE 'patron-title.inc' patron=hold.borrower hide_patron_infos_if_needed=1 %]
[% END %]
[% END %]
[% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || item.reservedate ) %]
[% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold ) %]
Available
[% END %]