Attachment #77184 for bug #20469

View | Details | Raw Unified | Return to bug 20469
Collapse All | Expand All




    return Koha::Holds->_new_from_dbic($hold_rs);
}

=head3 is_waiting_or_transit

    Returns true if an item has a waiting or transit hold

=cut

sub is_waiting_or_transit {
    my ( $self ) = @_;
    return 1 if Koha::Holds->search({ itemnumber => $self->itemnumber, found => ['W', 'T'] })->count > 0;
    return q{};
}

=head3 type

=cut

Lines 42-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (+8 lines)
42	</ul>	42	</ul>
43	</div>	43	</div>
44	[% END %]	44	[% END %]
		45	[% BLOCK item_status %][%# pass Koha::Item into myitem %]
		46	[% IF myitem.onloan %]Checked out
		47	[% ELSIF myitem.is_waiting_or_transit %]On hold
		48	[% ELSE %]Available
		49	[% END %]
		50	[% END %]
45		51
46	<body id="circ_article-requests" class="circ">	52	<body id="circ_article-requests" class="circ">
47	[% INCLUDE 'header.inc' %]	53	[% INCLUDE 'header.inc' %]
Lines 176-181 Link Here
176	[% END %]	182	[% END %]
177		183
178	[% ar.item.itemcallnumber %]	184	[% ar.item.itemcallnumber %]
		185	<p>[% PROCESS 'item_status' myitem = ar.item %]</p>
179	</td>	186	</td>
180	<td class="ar-copynumber">[% ar.item.copynumber %]</td>	187	<td class="ar-copynumber">[% ar.item.copynumber %]</td>
181	<td class="ar-enumchron">[% ar.item.enumchron %]</td>	188	<td class="ar-enumchron">[% ar.item.enumchron %]</td>
Lines 284-289 Link Here
284	[% END %]	291	[% END %]
285		292
286	[% ar.item.itemcallnumber %]	293	[% ar.item.itemcallnumber %]
		294	<p>[% PROCESS 'item_status' myitem = ar.item %]</p>
287	</td>	295	</td>
288	<td class="ar-copynumber">[% ar.item.copynumber %]</td>	296	<td class="ar-copynumber">[% ar.item.copynumber %]</td>
289	<td class="ar-enumchron">[% ar.item.enumchron %]</td>	297	<td class="ar-enumchron">[% ar.item.enumchron %]</td>





use Modern::Perl;

use Test::More tests => 10;
use Test::Exception;

use C4::Circulation;

my $schema = Koha::Database->new->schema;
$schema->storage->txn_begin;

our $builder     = t::lib::TestBuilder->new;
my $biblioitem  = $builder->build( { source => 'Biblioitem' } );
my $library     = $builder->build( { source => 'Branch' } );
my $nb_of_items = Koha::Items->search->count;

$retrieved_item_1->delete;
is( Koha::Items->search->count, $nb_of_items + 1, 'Delete should have deleted the item' );

subtest 'is_waiting_or_transit' => sub {
    plan tests => 3;

    my $hold = $builder->build_object({ class => 'Koha::Holds', value => { found => 'W' } });
    is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 1,
        'Item is waiting' );
    $hold->found('T')->store;
    is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 1,
        'Item has transit hold' );
    $hold->found(undef)->store;
    is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, q{},
        'Item should be available' );
};

$schema->storage->txn_rollback;

- 

Return to bug 20469

Lines 19-25 Link Here

(-)a/t/db_dependent/Koha/Items.t (-3 / +16 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 9;	22	use Test::More tests => 10;
23	use Test::Exception;	23	use Test::Exception;
24		24
25	use C4::Circulation;	25	use C4::Circulation;
Lines 34-40 use t::lib::Mocks; Link Here
34	my $schema = Koha::Database->new->schema;	34	my $schema = Koha::Database->new->schema;
35	$schema->storage->txn_begin;	35	$schema->storage->txn_begin;
36		36
37	my $builder = t::lib::TestBuilder->new;	37	our $builder = t::lib::TestBuilder->new;
38	my $biblioitem = $builder->build( { source => 'Biblioitem' } );	38	my $biblioitem = $builder->build( { source => 'Biblioitem' } );
39	my $library = $builder->build( { source => 'Branch' } );	39	my $library = $builder->build( { source => 'Branch' } );
40	my $nb_of_items = Koha::Items->search->count;	40	my $nb_of_items = Koha::Items->search->count;
Lines 164-168 subtest 'can_be_transferred' => sub { Link Here
164	$retrieved_item_1->delete;	164	$retrieved_item_1->delete;
165	is( Koha::Items->search->count, $nb_of_items + 1, 'Delete should have deleted the item' );	165	is( Koha::Items->search->count, $nb_of_items + 1, 'Delete should have deleted the item' );
166		166
		167	subtest 'is_waiting_or_transit' => sub {
		168	plan tests => 3;
		169
		170	my $hold = $builder->build_object({ class => 'Koha::Holds', value => { found => 'W' } });
		171	is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 1,
		172	'Item is waiting' );
		173	$hold->found('T')->store;
		174	is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, 1,
		175	'Item has transit hold' );
		176	$hold->found(undef)->store;
		177	is( Koha::Items->find($hold->itemnumber)->is_waiting_or_transit, q{},
		178	'Item should be available' );
		179	};
		180
167	$schema->storage->txn_rollback;	181	$schema->storage->txn_rollback;
168		182
169	-

Lines 282-287 sub current_holds { Link Here

(-)a/Koha/Item.pm (+12 lines)
282	return Koha::Holds->_new_from_dbic($hold_rs);	282	return Koha::Holds->_new_from_dbic($hold_rs);
283	}	283	}
284		284
		285	=head3 is_waiting_or_transit
		286
		287	Returns true if an item has a waiting or transit hold
		288
		289	=cut
		290
		291	sub is_waiting_or_transit {
		292	my ( $self ) = @_;
		293	return 1 if Koha::Holds->search({ itemnumber => $self->itemnumber, found => ['W', 'T'] })->count > 0;
		294	return q{};
		295	}
		296
285	=head3 type	297	=head3 type
286		298
287	=cut	299	=cut