Attachment #110334 for bug #25261

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

Lines 14-19 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (+2 lines)
14	<span>(Item is withdrawn and check-in blocked by policy, please see library staff for assistance)</span>	14	<span>(Item is withdrawn and check-in blocked by policy, please see library staff for assistance)</span>
15	[% ELSIF messages.NotIssued %]	15	[% ELSIF messages.NotIssued %]
16	<span>(The book is not currently on loan, please see library staff for assistance)</span>	16	<span>(The book is not currently on loan, please see library staff for assistance)</span>
		17	[% ELSIF messages.additional_materials %]
		18	<span>(The item cannot be returned at a self service terminal, please see library staff for assistance)</span>
17	[% ELSE %]	19	[% ELSE %]
18	<span>(There was a problem returning this item, please see library staff for assistance)</span>	20	<span>(There was a problem returning this item, please see library staff for assistance)</span>
19	[% END %]	21	[% END %]




use C4::Auth qw(get_template_and_user checkpw);
use C4::Circulation;
use C4::Output;
use Koha::Items;

use List::MoreUtils qw( uniq );
use Try::Tiny;

    # Return items
    foreach my $barcode (@barcodes) {
        try {
            my ( $success, $messages, $checkout, $patron );
            my $item = Koha::Items->find( { barcode => $barcode } );
            my $human_required = 0;
            if (   C4::Context->preference("CircConfirmItemParts")
                && defined($item)
                && $item->materials )
            {
                $human_required                   = 1;
                $success                          = 0;
                $messages->{additional_materials} = 1;
            }

            ( $success, $messages, $checkout, $patron ) =
              AddReturn( $barcode, $library ) unless $human_required;
            if ($success) {
                push @success,
                  {
- 

Return to bug 25261

Lines 22-27 use CGI qw ( -utf8 ); Link Here

(-)a/opac/sci/sci-main.pl (-3 / +15 lines)
22	use C4::Auth qw(get_template_and_user checkpw);	22	use C4::Auth qw(get_template_and_user checkpw);
23	use C4::Circulation;	23	use C4::Circulation;
24	use C4::Output;	24	use C4::Output;
		25	use Koha::Items;
25		26
26	use List::MoreUtils qw( uniq );	27	use List::MoreUtils qw( uniq );
27	use Try::Tiny;	28	use Try::Tiny;
Lines 64-71 if ( $op eq 'check_in' ) { Link Here
64	# Return items	65	# Return items
65	foreach my $barcode (@barcodes) {	66	foreach my $barcode (@barcodes) {
66	try {	67	try {
67	my ( $success, $messages, $checkout, $patron ) =	68	my ( $success, $messages, $checkout, $patron );
68	AddReturn( $barcode, $library );	69	my $item = Koha::Items->find( { barcode => $barcode } );
		70	my $human_required = 0;
		71	if ( C4::Context->preference("CircConfirmItemParts")
		72	&& defined($item)
		73	&& $item->materials )
		74	{
		75	$human_required = 1;
		76	$success = 0;
		77	$messages->{additional_materials} = 1;
		78	}
		79
		80	( $success, $messages, $checkout, $patron ) =
		81	AddReturn( $barcode, $library ) unless $human_required;
69	if ($success) {	82	if ($success) {
70	push @success,	83	push @success,
71	{	84	{
72	-