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

(-)a/C4/Search.pm (-2 / +3 lines)
Lines 28-34 use C4::Dates qw(format_date); Link Here
28
use C4::Members qw(GetHideLostItemsPreference);
28
use C4::Members qw(GetHideLostItemsPreference);
29
use C4::XSLT;
29
use C4::XSLT;
30
use C4::Branch;
30
use C4::Branch;
31
use C4::Reserves;    # GetReserveStatus
31
use C4::Reserves;    # CheckReserves
32
use C4::Debug;
32
use C4::Debug;
33
use C4::Charset;
33
use C4::Charset;
34
use YAML;
34
use YAML;
Lines 1901-1906 sub searchResults { Link Here
1901
1901
1902
                # is item on the reserve shelf?
1902
                # is item on the reserve shelf?
1903
                my $reservestatus = '';
1903
                my $reservestatus = '';
1904
                my $reserveitem;
1904
1905
1905
                unless ($item->{wthdrawn}
1906
                unless ($item->{wthdrawn}
1906
                        || $item->{itemlost}
1907
                        || $item->{itemlost}
Lines 1921-1927 sub searchResults { Link Here
1921
                    #        should map transit status to record indexed in Zebra.
1922
                    #        should map transit status to record indexed in Zebra.
1922
                    #
1923
                    #
1923
                    ($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
1924
                    ($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
1924
                    $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber}, $oldbiblio->{biblionumber} );
1925
                    ($reservestatus, $reserveitem, undef) = C4::Reserves::CheckReserves( $item->{itemnumber}, $oldbiblio->{biblionumber} );
1925
                }
1926
                }
1926
1927
1927
                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
1928
                # item is withdrawn, lost, damaged, not for loan, reserved or in transit
(-)a/C4/XSLT.pm (-1 / +1 lines)
Lines 264-270 sub buildKohaItemsNamespace { Link Here
264
264
265
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
265
        my ( $transfertwhen, $transfertfrom, $transfertto ) = C4::Circulation::GetTransfers($item->{itemnumber});
266
266
267
        my $reservestatus = C4::Reserves::GetReserveStatus( $item->{itemnumber} );
267
        my ( $reservestatus, $reserveitem, undef ) = C4::Reserves::CheckReserves($item->{itemnumber});
268
268
269
        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
269
        if ( $itemtypes->{ $item->{itype} }->{notforloan} || $item->{notforloan} || $item->{onloan} || $item->{wthdrawn} || $item->{itemlost} || $item->{damaged} || 
270
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
270
             (defined $transfertwhen && $transfertwhen ne '') || $item->{itemnotforloan} || (defined $reservestatus && $reservestatus eq "Waiting") ){ 
(-)a/circ/circulation.pl (-1 / +2 lines)
Lines 488-494 sub build_issue_data { Link Here
488
            $it->{'borrowernumber'},$it->{'itemnumber'}
488
            $it->{'borrowernumber'},$it->{'itemnumber'}
489
        );
489
        );
490
        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
490
        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
491
        my $restype = C4::Reserves::GetReserveStatus( $it->{'itemnumber'} );
491
        my ( $restype, $reserves, undef ) = CheckReserves( $it->{'itemnumber'} );
492
492
        $it->{'can_renew'} = $can_renew;
493
        $it->{'can_renew'} = $can_renew;
493
        $it->{'can_confirm'} = !$can_renew && !$restype;
494
        $it->{'can_confirm'} = !$can_renew && !$restype;
494
        $it->{'renew_error'} = ( $restype eq "Waiting" or $restype eq "Reserved" ) ? 1 : 0;
495
        $it->{'renew_error'} = ( $restype eq "Waiting" or $restype eq "Reserved" ) ? 1 : 0;
(-)a/opac/opac-detail.pl (-1 / +2 lines)
Lines 589-595 for my $itm (@items) { Link Here
589
         $itm->{'lostimageurl'}   = $lostimageinfo->{ 'imageurl' };
589
         $itm->{'lostimageurl'}   = $lostimageinfo->{ 'imageurl' };
590
         $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' };
590
         $itm->{'lostimagelabel'} = $lostimageinfo->{ 'label' };
591
     }
591
     }
592
     my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber});
592
593
     my ( $reserve_status, $res, undef ) = CheckReserves( $itm->{'itemnumber'} );
593
      if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; }
594
      if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; }
594
      if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; }
595
      if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; }
595
    
596
    
(-)a/opac/opac-user.pl (-1 / +1 lines)
Lines 158-164 my $issues = GetPendingIssues($borrowernumber); Link Here
158
if ($issues){
158
if ($issues){
159
    foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
159
    foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
160
        # check for reserves
160
        # check for reserves
161
        my $restype = GetReserveStatus( $issue->{'itemnumber'} );
161
        my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} );
162
        if ( $restype ) {
162
        if ( $restype ) {
163
            $issue->{'reserved'} = 1;
163
            $issue->{'reserved'} = 1;
164
        }
164
        }
(-)a/t/db_dependent/Reserves.t (-4 / +3 lines)
Lines 107-113 $biblionumber = $bibnum2; Link Here
107
AddReserve ($branch, $borrowernumber, $biblionumber,
107
AddReserve ($branch, $borrowernumber, $biblionumber,
108
        $constraint, $bibitems,  $priority, $resdate, $expdate, $notes,
108
        $constraint, $bibitems,  $priority, $resdate, $expdate, $notes,
109
        $title, $checkitem, $found);
109
        $title, $checkitem, $found);
110
        
110
111
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
111
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
112
is($status, "Reserved", "Reserved - item level hold, still on shelf");
112
is($status, "Reserved", "Reserved - item level hold, still on shelf");
113
113
Lines 160-166 AddReserve ($branch, $borrowernumber, $biblionumber, Link Here
160
160
161
# Check first item
161
# Check first item
162
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
162
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
163
is($status, "Reserved", "Reserved - item level hold on this item"); 
163
is($status, "Reserved", "Reserved - item level hold on this item");
164
164
165
# Check second item
165
# Check second item
166
($status, $reserve, $all_reserves) = CheckReserves($itemnumber3);
166
($status, $reserve, $all_reserves) = CheckReserves($itemnumber3);
Lines 177-183 AddReserve ($branch, $borrowernumber, $biblionumber, Link Here
177
        $title, undef, $found);
177
        $title, undef, $found);
178
178
179
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
179
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
180
is($status, "Reserved", "Reserved - first item can fill title level hold"); 
180
is($status, "Reserved", "Reserved - first item can fill title level hold");
181
181
182
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
182
($status, $reserve, $all_reserves) = CheckReserves($itemnumber2);
183
is($status, "Reserved", "Reserved - second item can also fill title level hold");
183
is($status, "Reserved", "Reserved - second item can also fill title level hold");
184
- 

Return to bug 10697