Attachment #130656 for bug #19532

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

Lines 1125-1131 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-1 / +1 lines)
1125	# Only bother doing this if UseRecalls is enabled and the item is recallable	1125	# Only bother doing this if UseRecalls is enabled and the item is recallable
1126	# Don't look at recalls that are in transit	1126	# Don't look at recalls that are in transit
1127	if ( C4::Context->preference('UseRecalls') and $item_object->can_be_waiting_recall ) {	1127	if ( C4::Context->preference('UseRecalls') and $item_object->can_be_waiting_recall ) {
1128	my @recalls = $biblio->recalls;	1128	my @recalls = $biblio->recalls->as_list;
1129		1129
1130	foreach my $r ( @recalls ) {	1130	foreach my $r ( @recalls ) {
1131	if ( $r->itemnumber and	1131	if ( $r->itemnumber and

Lines 413-419 sub CanItemBeReserved { Link Here

(-)a/C4/Reserves.pm (-1 / +1 lines)
413		413
414	# check if a recall exists on this item from this borrower	414	# check if a recall exists on this item from this borrower
415	return { status => 'recall' }	415	return { status => 'recall' }
416	if Koha::Recalls->search({ borrowernumber => $borrowernumber, itemnumber => $itemnumber, old => undef })->count;	416	if Koha::Recalls->search({ borrowernumber => $patron->borrowernumber, itemnumber => $item->itemnumber, old => undef })->count;
417		417
418	my $controlbranch = C4::Context->preference('ReservesControlBranch');	418	my $controlbranch = C4::Context->preference('ReservesControlBranch');
419		419





sub recalls {
    my ( $self, $params ) = @_;

    my $args = {
        biblionumber => $self->biblionumber,
        old => undef,
    };
    $args->{ borrowernumber } = $params->{ borrowernumber } if $params->{ borrowernumber };

    my $recalls_rs = $self->_result->recalls->search( $args, { order_by => { -asc => 'recalldate' } });
    return Koha::Recalls->_new_from_dbic( $recalls_rs );
}

=head3 can_be_recalled

        $branchcode = $patron->branchcode;
    }

    my @all_items = Koha::Items->search({ biblionumber => $self->biblionumber })->as_list;

    # if there are no available items at all, no recall can be placed
    return 0 if ( scalar @all_items == 0 );





sub recall {
    my ( $self ) = @_;
    my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, old => undef }, { order_by => { -asc => 'recalldate' } })->as_list;
    foreach my $recall (@recalls) {
        if ( $recall->item_level_recall and $recall->itemnumber == $self->itemnumber ){
            return $recall;


    # check item availability
    # items are unavailable for recall if they are lost, withdrawn or notforloan
    my @items = Koha::Items->search({ biblionumber => $self->biblionumber, itemlost => 0, withdrawn => 0, notforloan => 0 })->as_list;

    # if there are no available items at all, no recall can be placed
    return 0 if ( scalar @items == 0 );

sub check_recalls {
    my ( $self ) = @_;

    my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, itemnumber => [ $self->itemnumber, undef ], status => [ 'R','O','W','T' ] }, { order_by => { -asc => 'recalldate' } })->as_list;

    my $recall;
    # iterate through relevant recalls to find the best one.

Lines 110-116 sub checkout { Link Here

(-)a/Koha/Recall.pm (-1 / +1 lines)
110		110
111	unless ( $self->item_level_recall ) {	111	unless ( $self->item_level_recall ) {
112	# Only look at checkouts of items that are allowed to be recalled, and get the oldest one	112	# Only look at checkouts of items that are allowed to be recalled, and get the oldest one
113	my @items = Koha::Items->search({ biblionumber => $self->biblionumber });	113	my @items = Koha::Items->search({ biblionumber => $self->biblionumber })->as_list;
114	my @itemnumbers;	114	my @itemnumbers;
115	foreach (@items) {	115	foreach (@items) {
116	my $recalls_allowed = Koha::CirculationRules->get_effective_rule({	116	my $recalls_allowed = Koha::CirculationRules->get_effective_rule({

Lines 178-184 if ( $query->param('recall_id') ) { Link Here

(-)a/circ/returns.pl (-2 / +2 lines)
178	my $itemnumber = $query->param('itemnumber');	178	my $itemnumber = $query->param('itemnumber');
179	my $return_branch = $query->param('returnbranch');	179	my $return_branch = $query->param('returnbranch');
180		180
181	my $expirationdate = $recall->calc_expirationdate;
182	my $item;	181	my $item;
183	if ( !$recall->item_level_recall ) {	182	if ( !$recall->item_level_recall ) {
184	$item = Koha::Items->find( $itemnumber );	183	$item = Koha::Items->find( $itemnumber );
Lines 187-193 if ( $query->param('recall_id') ) { Link Here
187	if ( $recall->branchcode ne $return_branch ) {	186	if ( $recall->branchcode ne $return_branch ) {
188	$recall->start_transfer({ item => $item }) if !$recall->in_transit;	187	$recall->start_transfer({ item => $item }) if !$recall->in_transit;
189	} else {	188	} else {
190	$recall->set_waiting({ item => $item }) if !$recall->waiting;	189	my $expirationdate = $recall->calc_expirationdate;
		190	$recall->set_waiting({ item => $item, expirationdate => $expirationdate }) if !$recall->waiting;
191	}	191	}
192	}	192	}
193		193

Lines 18-24 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/title-actions-menu.inc (-1 / +1 lines)
18	[% END # / OPACHoldRequests %]	18	[% END # / OPACHoldRequests %]
19		19
20	[% IF Koha.Preference('UseRecalls') %]	20	[% IF Koha.Preference('UseRecalls') %]
21	<span class="actions"><a class="btn btn-link recall" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% items.biblionumber \| html %]"><i class="fa fa-fw fa-bookmark-o" aria-hidden="true"></i> Place recall</a></span>	21	<span class="actions"><a class="btn btn-link btn-sm recall" href="/cgi-bin/koha/opac-recall.pl?biblionumber=[% items.biblionumber \| html %]"><i class="fa fa-fw fa-bookmark-o" aria-hidden="true"></i> Place recall</a></span>
22	[% END %]	22	[% END %]
23		23
24	[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]	24	[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]




                                        [% FOREACH RECALL IN RECALLS %]
                                        <tr>
                                            <td class="title">
                                                <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber | html %]">[% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio %]</a> [% IF RECALL.item_level_recall %]<p class="hint">Item recalled: [% RECALL.item.barcode | html %]</p>[% END %]
                                                    [% RECALL.biblio.title | html %]
                                                    [% FOREACH s IN RECALL.biblio.subtitle %]
                                                        [% s | html %]
                                                    [% END %]
                                                </a>
                                                [% RECALL.biblio.author | html %]
                                            </td>
                                            <td class="recalldate">
                                                <span title="[% RECALL.recalldate | html %]">

Lines 37-43 use C4::Log; Link Here

(-)a/misc/cronjobs/recalls/expire_recalls.pl (-1 / +1 lines)
37		37
38	cronlogaction();	38	cronlogaction();
39		39
40	my @recalls = Koha::Recalls->search({ old => undef });	40	my @recalls = Koha::Recalls->search({ old => undef })->as_list;
41	foreach my $recall (@recalls) {	41	foreach my $recall (@recalls) {
42	if ( ( $recall->requested or $recall->overdue ) and $recall->expirationdate and dt_from_string( $recall->expirationdate ) < dt_from_string() ){	42	if ( ( $recall->requested or $recall->overdue ) and $recall->expirationdate and dt_from_string( $recall->expirationdate ) < dt_from_string() ){
43	# recall is requested or overdue and has surpassed the specified expiration date	43	# recall is requested or overdue and has surpassed the specified expiration date

Lines 36-42 use C4::Log; Link Here

(-)a/misc/cronjobs/recalls/overdue_recalls.pl (-1 / +1 lines)
36		36
37	cronlogaction();	37	cronlogaction();
38		38
39	my @recalls = Koha::Recalls->search({ status => 'R' });	39	my @recalls = Koha::Recalls->search({ status => 'R' })->as_list;
40	foreach my $recall (@recalls){	40	foreach my $recall (@recalls){
41	if ( $recall->should_be_overdue ){	41	if ( $recall->should_be_overdue ){
42	$recall->set_overdue({ interface => 'COMMANDLINE' });	42	$recall->set_overdue({ interface => 'COMMANDLINE' });

Lines 43-52 if ( C4::Context->preference('UseRecalls') ) { Link Here

(-)a/opac/opac-recall.pl (-3 / +2 lines)
43		43
44	unless ( $biblio->can_be_recalled({ patron => $patron }) ) { $error = 'unavailable'; }	44	unless ( $biblio->can_be_recalled({ patron => $patron }) ) { $error = 'unavailable'; }
45		45
46	my $items = Koha::Items->search({ biblionumber => $biblionumber });	46	my $items = Koha::Items->search({ biblionumber => $biblionumber })->as_list;
47		47
48	# check if already recalled	48	# check if already recalled
49	my $recalled = scalar $biblio->recalls({ borrowernumber => $borrowernumber });	49	my $recalled = $biblio->recalls({ borrowernumber => $borrowernumber })->count;
50	if ( defined $recalled and $recalled > 0 ) {	50	if ( defined $recalled and $recalled > 0 ) {
51	my $recalls_per_record = Koha::CirculationRules->get_effective_rule({	51	my $recalls_per_record = Koha::CirculationRules->get_effective_rule({
52	categorycode => $patron->categorycode,	52	categorycode => $patron->categorycode,
53	-

Return to bug 19532

Lines 1172-1183 Return all active recalls attached to this biblio, sorted by oldest first Link Here

(-)a/Koha/Biblio.pm (-7 / +10 lines)
1172		1172
1173	sub recalls {	1173	sub recalls {
1174	my ( $self, $params ) = @_;	1174	my ( $self, $params ) = @_;
1175	if ( $params->{borrowernumber} ) {	1175
1176	my @recalls_rs = Koha::Recalls->search({ biblionumber => $self->biblionumber, old => undef, borrowernumber => $params->{borrowernumber} }, { order_by => { -asc => 'recalldate' } });	1176	my $args = {
1177	return @recalls_rs;	1177	biblionumber => $self->biblionumber,
1178	}	1178	old => undef,
1179	my @recalls_rs = Koha::Recalls->search({ biblionumber => $self->biblionumber, old => undef }, { order_by => { -asc => 'recalldate' } });	1179	};
1180	return @recalls_rs;	1180	$args->{ borrowernumber } = $params->{ borrowernumber } if $params->{ borrowernumber };
		1181
		1182	my $recalls_rs = $self->_result->recalls->search( $args, { order_by => { -asc => 'recalldate' } });
		1183	return Koha::Recalls->_new_from_dbic( $recalls_rs );
1181	}	1184	}
1182		1185
1183	=head3 can_be_recalled	1186	=head3 can_be_recalled
Lines 1200-1206 sub can_be_recalled { Link Here
1200	$branchcode = $patron->branchcode;	1203	$branchcode = $patron->branchcode;
1201	}	1204	}
1202		1205
1203	my @all_items = Koha::Items->search({ biblionumber => $self->biblionumber });	1206	my @all_items = Koha::Items->search({ biblionumber => $self->biblionumber })->as_list;
1204		1207
1205	# if there are no available items at all, no recall can be placed	1208	# if there are no available items at all, no recall can be placed
1206	return 0 if ( scalar @all_items == 0 );	1209	return 0 if ( scalar @all_items == 0 );

Lines 1444-1450 Return the relevant recall for this item Link Here

(-)a/Koha/Item.pm (-3 / +3 lines)
1444		1444
1445	sub recall {	1445	sub recall {
1446	my ( $self ) = @_;	1446	my ( $self ) = @_;
1447	my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, old => undef }, { order_by => { -asc => 'recalldate' } });	1447	my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, old => undef }, { order_by => { -asc => 'recalldate' } })->as_list;
1448	foreach my $recall (@recalls) {	1448	foreach my $recall (@recalls) {
1449	if ( $recall->item_level_recall and $recall->itemnumber == $self->itemnumber ){	1449	if ( $recall->item_level_recall and $recall->itemnumber == $self->itemnumber ){
1450	return $recall;	1450	return $recall;
Lines 1517-1523 sub can_be_recalled { Link Here
1517		1517
1518	# check item availability	1518	# check item availability
1519	# items are unavailable for recall if they are lost, withdrawn or notforloan	1519	# items are unavailable for recall if they are lost, withdrawn or notforloan
1520	my @items = Koha::Items->search({ biblionumber => $self->biblionumber, itemlost => 0, withdrawn => 0, notforloan => 0 });	1520	my @items = Koha::Items->search({ biblionumber => $self->biblionumber, itemlost => 0, withdrawn => 0, notforloan => 0 })->as_list;
1521		1521
1522	# if there are no available items at all, no recall can be placed	1522	# if there are no available items at all, no recall can be placed
1523	return 0 if ( scalar @items == 0 );	1523	return 0 if ( scalar @items == 0 );
Lines 1591-1597 Get the most relevant recall for this item. Link Here
1591	sub check_recalls {	1591	sub check_recalls {
1592	my ( $self ) = @_;	1592	my ( $self ) = @_;
1593		1593
1594	my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, itemnumber => [ $self->itemnumber, undef ], status => [ 'R','O','W','T' ] }, { order_by => { -asc => 'recalldate' } });	1594	my @recalls = Koha::Recalls->search({ biblionumber => $self->biblionumber, itemnumber => [ $self->itemnumber, undef ], status => [ 'R','O','W','T' ] }, { order_by => { -asc => 'recalldate' } })->as_list;
1595		1595
1596	my $recall;	1596	my $recall;
1597	# iterate through relevant recalls to find the best one.	1597	# iterate through relevant recalls to find the best one.

Lines 767-779 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-7 / +1 lines)
767	[% FOREACH RECALL IN RECALLS %]	767	[% FOREACH RECALL IN RECALLS %]
768	<tr>	768	<tr>
769	<td class="title">	769	<td class="title">
770	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber \| html %]">	770	<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RECALL.biblionumber \| html %]">[% INCLUDE 'biblio-title.inc' biblio=RECALL.biblio %]</a> [% IF RECALL.item_level_recall %]<p class="hint">Item recalled: [% RECALL.item.barcode \| html %]</p>[% END %]
771	[% RECALL.biblio.title \| html %]
772	[% FOREACH s IN RECALL.biblio.subtitle %]
773	[% s \| html %]
774	[% END %]
775	</a>
776	[% RECALL.biblio.author \| html %]
777	</td>	771	</td>
778	<td class="recalldate">	772	<td class="recalldate">
779	<span title="[% RECALL.recalldate \| html %]">	773	<span title="[% RECALL.recalldate \| html %]">