Attachment #78488 for bug #7534

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

Lines 140-145 __PACKAGE__->table("branches"); Link Here

(-)a/Koha/Schema/Result/Branch.pm (-2 / +10 lines)
140	is_nullable: 1	140	is_nullable: 1
141	size: 16	141	size: 16
142		142
		143	=head2 pickup_location
		144
		145	data_type: 'tinyint'
		146	default_value: 1
		147	is_nullable: 0
		148
143	=cut	149	=cut
144		150
145	__PACKAGE__->add_columns(	151	__PACKAGE__->add_columns(
Lines 187-192 __PACKAGE__->add_columns( Link Here
187	{ data_type => "varchar", is_nullable => 1, size => 255 },	193	{ data_type => "varchar", is_nullable => 1, size => 255 },
188	"marcorgcode",	194	"marcorgcode",
189	{ data_type => "varchar", is_nullable => 1, size => 16 },	195	{ data_type => "varchar", is_nullable => 1, size => 16 },
		196	"pickup_location",
		197	{ data_type => "tinyint", default_value => 1, is_nullable => 0 },
190	);	198	);
191		199
192	=head1 PRIMARY KEY	200	=head1 PRIMARY KEY
Lines 609-616 __PACKAGE__->has_many( Link Here
609	);	617	);
610		618
611		619
612	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53	620	# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-09-06 11:46:42
613	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QOMUFz2EjvAVWCkIpNmvtg	621	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hoXg+9Mgi3IglRt0NgHPCQ
614		622
615		623
616	# You can replace this text with custom code or comments, and it will be preserved on regeneration	624	# You can replace this text with custom code or comments, and it will be preserved on regeneration





        my $rank = $biblioData->{rank};
        if ( $itemNum ne '' ) {
            $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';
        }
        else {
            $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK';

            # Inserts a null into the 'itemnumber' field of 'reserves' table.
            $itemNum = undef;

        my $policy_holdallowed = !$itemLoopIter->{already_reserved};
        $policy_holdallowed &&=
            IsAvailableForItemLevelRequest($itemInfo,$patron_unblessed) &&
            CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';

        if ($policy_holdallowed) {
            my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } );

        }
    }

    $biblioLoopIter{holdable} &&= CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK';

    # For multiple holds per record, if a patron has previously placed a hold,
    # the patron can only place more holds of the same type. That is, if the
- 

Return to bug 7534

Lines 269-278 if ( $query->param('place_reserve') ) { Link Here

(-)a/opac/opac-reserve.pl (-5 / +4 lines)
269		269
270	my $rank = $biblioData->{rank};	270	my $rank = $biblioData->{rank};
271	if ( $itemNum ne '' ) {	271	if ( $itemNum ne '' ) {
272	$canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum, $branch )->{status} eq 'OK';	272	$canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';
273	}	273	}
274	else {	274	else {
275	$canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum, $branch )->{status} eq 'OK';	275	$canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK';
276		276
277	# Inserts a null into the 'itemnumber' field of 'reserves' table.	277	# Inserts a null into the 'itemnumber' field of 'reserves' table.
278	$itemNum = undef;	278	$itemNum = undef;
Lines 525-531 foreach my $biblioNum (@biblionumbers) { Link Here
525	my $policy_holdallowed = !$itemLoopIter->{already_reserved};	525	my $policy_holdallowed = !$itemLoopIter->{already_reserved};
526	$policy_holdallowed &&=	526	$policy_holdallowed &&=
527	IsAvailableForItemLevelRequest($itemInfo,$patron_unblessed) &&	527	IsAvailableForItemLevelRequest($itemInfo,$patron_unblessed) &&
528	CanItemBeReserved($borrowernumber,$itemNum, $branch)->{status} eq 'OK';	528	CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';
529		529
530	if ($policy_holdallowed) {	530	if ($policy_holdallowed) {
531	my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } );	531	my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } );
Lines 585-591 foreach my $biblioNum (@biblionumbers) { Link Here
585	}	585	}
586	}	586	}
587		587
588	$biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum,$branch)->{status} eq 'OK';	588	$biblioLoopIter{holdable} &&= CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK';
589		589
590	# For multiple holds per record, if a patron has previously placed a hold,	590	# For multiple holds per record, if a patron has previously placed a hold,
591	# the patron can only place more holds of the same type. That is, if the	591	# the patron can only place more holds of the same type. That is, if the
592	-