Attachment #110921 for bug #25261

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

Lines 898-907 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-4 / +4 lines)
898	}	898	}
899		899
900	# Additional Materials Check	900	# Additional Materials Check
901	if ( C4::Context->preference("CircConfirmItemParts") ) {	901	if ( C4::Context->preference("CircConfirmItemParts")
902	if ( $item_object->materials ) {	902	&& $item_object->materials )
903	$needsconfirmation{additional_materials} = $item_object->materials;	903	{
904	}	904	$needsconfirmation{additional_materials} = $item_object->materials;
905	}	905	}
906		906
907	#	907	#




    my $return_date = $dropboxmode ? $dropboxdate : $return_date_override_dt;

    # Block return if multi-part and confirm has not been received
    my $needs_confirm =
         C4::Context->preference("CircConfirmItemParts")
      && $item->materials
      && !$query->param('multiple_confirm');
        }
    }

    # do the return
    ( $returned, $messages, $issue, $borrower ) =
      AddReturn( $barcode, $userenv_branch, $exemptfine, $return_date )
          unless $needs_confirm;

    if ($returned) {
        my $time_now = dt_from_string()->truncate( to => 'minute');




use Modern::Perl;
use utf8;

use Test::More tests => 49;
use Test::Exception;
use Test::MockModule;
use Test::Deep qw( cmp_deeply );


    t::lib::Mocks::mock_preference('CircConfirmItemParts', 1);

    my $library =
      $builder->build_object( { class => 'Koha::Libraries' } )->store;
    my $patron = $builder->build_object(
        {
            class => 'Koha::Patrons',

        }
    )->store;

    my $item = $builder->build_sample_item(
        {
            class => 'Koha::ItemTypes',
            value => {
                notforloan         => 0,
                rentalcharge       => 0,
                rentalcharge_daily => 0
            }
        }
    );

    my $biblioitem = $builder->build( { source => 'Biblioitem' } );
    my $item = $builder->build_object(
        {
            materials => 'includes DVD',
            value => {
                homebranch       => $library->id,
                holdingbranch    => $library->id,
                notforloan       => 0,
                itemlost         => 0,
                withdrawn        => 0,
                itype            => $itemtype->id,
                biblionumber     => $biblioitem->{biblionumber},
                biblioitemnumber => $biblioitem->{biblioitemnumber},
                materials        => 'includes DVD',
            }
        }
    )->store;

    my $dt_due = dt_from_string->add( days => 3 );
    my $dt_from = dt_from_string();
    my $dt_due = $dt_from->clone->add( days => 3 );

    my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef );
    is_deeply( $needsconfirmation, { additional_materials => 'includes DVD' }, 'Item needs confirmation of additional parts' );
};

- 

Return to bug 25261

Lines 295-311 if ($barcode) { Link Here

(-)a/circ/returns.pl (-7 / +5 lines)
295	my $return_date = $dropboxmode ? $dropboxdate : $return_date_override_dt;	295	my $return_date = $dropboxmode ? $dropboxdate : $return_date_override_dt;
296		296
297	# Block return if multi-part and confirm has not been received	297	# Block return if multi-part and confirm has not been received
298	my $needs_confirm = 0;	298	my $needs_confirm =
299	if ( C4::Context->preference("CircConfirmItemParts") ) {	299	C4::Context->preference("CircConfirmItemParts")
300	if ( $item->materials && !$query->param('multiple_confirm') ) {	300	&& $item->materials
301	$needs_confirm = 1;	301	&& !$query->param('multiple_confirm');
302	}
303	}
304		302
305	# do the return	303	# do the return
306	( $returned, $messages, $issue, $borrower ) =	304	( $returned, $messages, $issue, $borrower ) =
307	AddReturn( $barcode, $userenv_branch, $exemptfine, $return_date )	305	AddReturn( $barcode, $userenv_branch, $exemptfine, $return_date )
308	unless $needs_confirm;	306	unless $needs_confirm;
309		307
310	if ($returned) {	308	if ($returned) {
311	my $time_now = dt_from_string()->truncate( to => 'minute');	309	my $time_now = dt_from_string()->truncate( to => 'minute');

Lines 18-24 Link Here

(-)a/t/db_dependent/Circulation.t (-33 / +5 lines)
18	use Modern::Perl;	18	use Modern::Perl;
19	use utf8;	19	use utf8;
20		20
21	use Test::More tests => 51;	21	use Test::More tests => 49;
22	use Test::Exception;	22	use Test::Exception;
23	use Test::MockModule;	23	use Test::MockModule;
24	use Test::Deep qw( cmp_deeply );	24	use Test::Deep qw( cmp_deeply );
Lines 3549-3556 subtest 'CanBookBeIssued & CircConfirmItemParts' => sub { Link Here
3549		3549
3550	t::lib::Mocks::mock_preference('CircConfirmItemParts', 1);	3550	t::lib::Mocks::mock_preference('CircConfirmItemParts', 1);
3551		3551
3552	my $library =
3553	$builder->build_object( { class => 'Koha::Libraries' } )->store;
3554	my $patron = $builder->build_object(	3552	my $patron = $builder->build_object(
3555	{	3553	{
3556	class => 'Koha::Patrons',	3554	class => 'Koha::Patrons',
Lines 3558-3597 subtest 'CanBookBeIssued & CircConfirmItemParts' => sub { Link Here
3558	}	3556	}
3559	)->store;	3557	)->store;
3560		3558
3561	my $itemtype = $builder->build_object(	3559	my $item = $builder->build_sample_item(
3562	{
3563	class => 'Koha::ItemTypes',
3564	value => {
3565	notforloan => 0,
3566	rentalcharge => 0,
3567	rentalcharge_daily => 0
3568	}
3569	}
3570	);
3571
3572	my $biblioitem = $builder->build( { source => 'Biblioitem' } );
3573	my $item = $builder->build_object(
3574	{	3560	{
3575	class => 'Koha::Items',	3561	materials => 'includes DVD',
3576	value => {
3577	homebranch => $library->id,
3578	holdingbranch => $library->id,
3579	notforloan => 0,
3580	itemlost => 0,
3581	withdrawn => 0,
3582	itype => $itemtype->id,
3583	biblionumber => $biblioitem->{biblionumber},
3584	biblioitemnumber => $biblioitem->{biblioitemnumber},
3585	materials => 'includes DVD',
3586	}
3587	}	3562	}
3588	)->store;	3563	)->store;
3589		3564
3590	my ( $issuingimpossible, $needsconfirmation );	3565	my $dt_due = dt_from_string->add( days => 3 );
3591	my $dt_from = dt_from_string();
3592	my $dt_due = $dt_from->clone->add( days => 3 );
3593		3566
3594	( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef );	3567	my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->barcode, $dt_due, undef, undef, undef );
3595	is_deeply( $needsconfirmation, { additional_materials => 'includes DVD' }, 'Item needs confirmation of additional parts' );	3568	is_deeply( $needsconfirmation, { additional_materials => 'includes DVD' }, 'Item needs confirmation of additional parts' );
3596	};	3569	};
3597		3570
3598	-