@@ -, +, @@
---
C4/Items.pm | 2 +-
C4/XSLT.pm | 4 ++--
Koha/Item.pm | 6 +++---
koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc | 2 +-
t/db_dependent/Items.t | 4 ++--
t/db_dependent/Koha/Item.t | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
--- a/C4/Items.pm
+++ a/C4/Items.pm
@@ -944,7 +944,7 @@ sub GetItemsInfo {
holding.opac_info as holding_branch_opac_info,
home.opac_info as home_branch_opac_info
";
- $query .= ",IF(tmp_holdsqueue.itemnumber,1,0) AS pending_hold" if !C4::Context->preference('AllowItemsOnHoldCheckout');
+ $query .= ",IF(tmp_holdsqueue.itemnumber,1,0) AS has_pending_hold" if !C4::Context->preference('AllowItemsOnHoldCheckout');
$query .= "
FROM items
LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
--- a/C4/XSLT.pm
+++ a/C4/XSLT.pm
@@ -317,7 +317,7 @@ sub buildKohaItemsNamespace {
my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
if ( ( $item->{itype} && $itemtypes->{ $item->{itype} }->{notforloan} ) || $item->{notforloan} || $item->{onloan} || $item->{withdrawn} || $item->{itemlost} || $item->{damaged} ||
- (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") || $item->{pending_hold} ){
+ (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") || $item->{has_pending_hold} ){
if ( $item->{notforloan} < 0) {
$status = "On order";
}
@@ -342,7 +342,7 @@ sub buildKohaItemsNamespace {
if (defined $reservestatus && $reservestatus eq "Waiting") {
$status = 'Waiting';
}
- if ($item->{pending_hold}) {
+ if ($item->{has_pending_hold}) {
$status = 'Pending hold';
}
} else {
--- a/Koha/Item.pm
+++ a/Koha/Item.pm
@@ -354,15 +354,15 @@ sub add_to_rota {
return $self;
}
-=head3 pending_hold
+=head3 has_pending_hold
- my $is_pending_hold = $item->pending_hold();
+ my $is_pending_hold = $item->has_pending_hold();
This method checks the tmp_holdsqueue to see if this item has been selected for a hold, but not filled yet and returns true or false
=cut
-sub pending_hold {
+sub has_pending_hold {
my ( $self ) = @_;
my $pending_hold = $self->_result->tmp_holdsqueues;
return !C4::Context->preference('AllowItemsOnHoldCheckout') && $pending_hold->count ? 1: 0;
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
@@ -89,7 +89,7 @@
On order
[% END %]
-[% IF item.pending_hold %]
+[% IF item.has_pending_hold %]
[% SET itemavailable = 0 %]
Pending hold
[% END %]
--- a/t/db_dependent/Items.t
+++ a/t/db_dependent/Items.t
@@ -318,11 +318,11 @@ subtest 'GetItemsInfo tests' => sub {
my $dbh = C4::Context->dbh;
$dbh->do(q{INSERT INTO tmp_holdsqueue (biblionumber, itemnumber, surname, borrowernumber ) VALUES (?, ?, "Zorro", 42)}, undef, $item_bibnum, $itemnumber);
@results = GetItemsInfo( $biblio->biblionumber );
- is( $results[0]->{ pending_hold }, "1",
+ is( $results[0]->{ has_pending_hold }, "1",
'Hold marked as pending/unavailable if not AllowItemsOnHoldCheckout' );
t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 1 );
@results = GetItemsInfo( $biblio->biblionumber );
- is( $results[0]->{ pending_hold }, undef,
+ is( $results[0]->{ has_pending_hold }, undef,
'Hold not marked as pending/unavailable if AllowItemsOnHoldCheckout' );
--- a/t/db_dependent/Koha/Item.t
+++ a/t/db_dependent/Koha/Item.t
@@ -62,7 +62,7 @@ subtest 'hidden_in_opac() tests' => sub {
$schema->storage->txn_rollback;
};
-subtest 'pending_hold() tests' => sub {
+subtest 'has_pending_hold() tests' => sub {
plan tests => 3;
@@ -75,10 +75,10 @@ subtest 'pending_hold() tests' => sub {
# disable AllowItemsOnHoldCheckout as it ignores pending holds
t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 0 );
$dbh->do("INSERT INTO tmp_holdsqueue (surname,borrowernumber,itemnumber) VALUES ('Clamp',42,$itemnumber)");
- ok( $item->pending_hold, "Yes, we have a pending hold");
+ ok( $item->has_pending_hold, "Yes, we have a pending hold");
t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 1 );
- ok( !$item->pending_hold, "We don't consider a pending hold if hold items can be checked out");
+ ok( !$item->has_pending_hold, "We don't consider a pending hold if hold items can be checked out");
t::lib::Mocks::mock_preference( 'AllowItemsOnHoldCheckout', 0 );
$dbh->do("DELETE FROM tmp_holdsqueue WHERE itemnumber=$itemnumber");
- ok( !$item->pending_hold, "We don't have a pending hold if nothing in the tmp_holdsqueue");
+ ok( !$item->has_pending_hold, "We don't have a pending hold if nothing in the tmp_holdsqueue");
};
--