Attachment #69167 for bug #15492

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




        }
    }

    # If the user logged in is the SCI user and they try to go out of the SCI module,
    # log the user out removing the CGISESSID cookie
    if ( $in->{type} eq 'opac' and $in->{template_name} !~ m|sci/| ) {
        if ( $user && C4::Context->preference('AutoSelfCheckID') && $user eq C4::Context->preference('AutoSelfCheckID') ) {
            $template = C4::Templates::gettemplate( 'opac-auth.tt', 'opac', $in->{query} );
            my $cookie = $in->{query}->cookie(
                -name     => 'CGISESSID',
                -value    => '',
                -expires  => '',
                -HttpOnly => 1,
            );

            $template->param(
                loginprompt => 1,
                script_name => get_script_name(),
            );
            print $in->{query}->header(
                {   type              => 'text/html',
                    charset           => 'utf-8',
                    cookie            => $cookie,
                    'X-Frame-Options' => 'SAMEORIGIN'
                }
              ),
            $template->output;
            safe_exit;
        }
    }

    my $borrowernumber;
    if ($user) {


    );

    $template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );
    $template->param( SCI_login => 1 ) if ( $query->param('sci_user_login') );
    $template->param( OpacPublic => C4::Context->preference("OpacPublic") );
    $template->param( loginprompt => 1 ) unless $info{'nopermission'};





.table .nosort.sorting {
    padding-right: 19px;
    background: #EEEEEE none;
}

#sci_logout {
    color: #E8583C;
}

#sci_checkin_button, #sci_refresh_button, #sci_append_button {
    margin-bottom: 10px;
}

#sci_refresh_button {
    color: rgb(51, 51, 51);
}

Lines 31-36 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (+4 lines)
31	<p>Sorry, the system doesn't think you have permission to access this page. </p>	31	<p>Sorry, the system doesn't think you have permission to access this page. </p>
32	[% IF SCO_login %]	32	[% IF SCO_login %]
33	<p><a href="/cgi-bin/koha/sco/sco-main.pl?logout.x=1">Log out and try again with a different user.</a></p>	33	<p><a href="/cgi-bin/koha/sco/sco-main.pl?logout.x=1">Log out and try again with a different user.</a></p>
		34	[% ELSIF SCI_login %]
		35	<p><a href="/cgi-bin/koha/sci/sci-main.pl?logout.x=1">Log out and try again with a different user.</a></p>
34	[% END %]	36	[% END %]
35	</div>	37	</div>
36	[% END %]	38	[% END %]
Lines 158-163 Link Here
158		160
159	[% IF SCO_login %]	161	[% IF SCO_login %]
160	<form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post">	162	<form action="/cgi-bin/koha/sco/sco-main.pl" name="auth" id="auth" method="post">
		163	[% ELSIF SCI_login %]
		164	<form action="/cgi-bin/koha/sci/sci-main.pl" name="auth" id="auth" method="post">
161	[% ELSE %]	165	[% ELSE %]
162	<form action="[% script_name %]" name="auth" id="auth" method="post">	166	<form action="[% script_name %]" name="auth" id="auth" method="post">
163	[% END %]	167	[% END %]




[%# Includes %]
[% USE Koha %]
[% USE KohaDates %]
[%# Helper template functions %]
[% BLOCK error_message %]
    [% IF messages.BadBarcode %]
        <span>(Barcode not found on the database)</span>
    [% ELSIF messages.DataCorrupted %]
        <span>(Data corruption detected. Contact your librarian)</span>
    [% ELSIF messages.Wrongbranch %]
        <span>(The item cannot be returned at this library)</span>
    [% ELSIF messages.withdrawn %]
        <span>(Item is withdrawn and check-in blocked by policy. Contact your librarian)</span>
    [% ELSIF messages.NotIssued %]
        <span>(The book is not currently on loan. Contact your librarian)</span>
    [% END %]
[% END %]

[% INCLUDE 'doc-head-open.inc' %]

<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self check-in</title>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->

[% IF ( Koha.Preference('OpacFavicon') ) %]
<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') %]" type="image/x-icon" />
[% ELSE %]
<link rel="shortcut icon" href="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" />
[% END %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" />
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style type="text/css">[% Koha.Preference('OPACUserCSS') %]</style>[% END %]
[% IF ( Koha.Preference('SCOUserCSS') ) %]<style type="text/css">[% Koha.Preference('SCOUserCSS') %]</style>[% END %]
<!--[if lt IE 9]>
    <script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
<![endif]-->
<script type="text/javascript">
    function _(s) { return s } // dummy function for gettext
</script>
<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>
</head>
<body id="sci_main" class="sci" onload="dofocus();" onunload="mungeHistory();">

[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
<div id="wrap">
    <div class="navbar navbar-inverse navbar-static-top">
        <div class="navbar-inner">
            <div class="container-fluid">
                <a class="brand" href="/cgi-bin/koha/sci/sci-main.pl"><img src="[% interface %]/[% theme %]/images/koha-logo-navbar.png" alt=""></a>
                <div id="checkouthelp">
                    <ul class="nav pull-right">
                        <li><a href="/cgi-bin/koha/sci/sci-main.pl" class="helpModal-trigger" role="button" data-toggle="modal"><i class="icon help"></i> Help</a></li>
                        <li><a id="sci_logout" href="/cgi-bin/koha/sci/sci-main.pl?logout.x=1" class="logout">Logout</a></li>
                    </ul>
                </div>

                [% IF Koha.Preference( 'opaclanguagesdisplay' ) %]
                    <div id="members">
                        <ul class="nav pull-right">
                            [% INCLUDE 'masthead-langmenu.inc' %]
                        </ul>
                    </div>
                [% END %]

            </div> <!-- /.container-fluid -->
        </div> <!-- /.navbar-inner -->
    </div> <!-- /.navbar -->

[% IF Koha.Preference( 'opacheader' ) %]
    <div class="container-fluid">
        <div class="row-fluid">
            <div id="opacheader">
                [% Koha.Preference( 'opacheader' ) %]
            </div>
        </div>
    </div>
[% END %]

    <div class="main">
        <div class="container-fluid">
            <div class="row-fluid">
                <div id="masthead">
                    <h1>[% LibraryName %] Self check-in</h1>
                [% IF ( nopermission ) %]
                    [%# This is what is displayed if user doesn't have permission %]
                    <div class="alert">
                        <h3>Access denied</h3>
                        <p>Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.</p>
                    </div>
                [% ELSIF ( different_ip ) %]
                    [%# This is what is displayed if user doesn't have permission %]
                    <div class="alert">
                        <h3>Session lost</h3>
                        <p>You are accessing self check-in from a different IP address! Please log in again.</p>
                    </div>
                [% ELSIF ( checkins ) %]
                    [%# We have results from a check-in attempt %]
                    <div id="checkins" class="sci_results_list">
                        [% IF ( success && success.size > 0 || errors && errors.size > 0 ) %]
                            <h3>Results</h3>
                                <table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer" style="font-size: initial;">
                                  <thead>
                                    <th>Barcode</th>
                                    <th>Status</th>
                                  </thead>
                                  <tbody>
                                [% FOREACH success_line IN success %]
                                    <tr><td>[% success_line.barcode %]</td><td>Checked in</td></tr>
                                [% END %]
                                [% FOREACH error IN errors %]
                                    <tr>
                                      <td>[% error.barcode %]</td>
                                      <td>Not checked in [% PROCESS error_message messages=error.messages %]</td>
                                    </tr>
                                [% END %]
                                  </tbody>
                                </table>
                                <div>
                                    <form method="post" action="#" id="finish_form">
                                        <button type="submit" class="btn"><i class="icon finish"></i> Finish</button>
                                    </form>
                                </div>
                        [% ELSE %]
                            <div class="alert">
                                <p>Your request included no check-ins.</p>
                            </div>
                        [% END %]
                    </div>
                [% ELSE %]
                    [%# Prompt for barcodes %]
                    <div id="new_checkins" class="sci_entry">
                        <form id="scan_form" name="scan_form"
                              method="post" action="/cgi-bin/koha/sci/sci-main.pl">
                            <fieldset>
                                <div>
                                  <label for="barcode_input">Scan the item or enter its barcode:</label>
                                  <input id="barcode_input" name="barcode_input" size="20" type="text" class="focus" autocomplete="off" />
                                  <button id="sci_append_button" type="submit" class="btn btn-default btn-sm">
                                    <i class="fa fa-plus" aria-hidden="true"></i> <span>Add</span>
                                  </button>
                                </div>
                                <div class="sci_input_append">
                                    <table id="sci_barcodes_table" class="table table-bordered table-striped dataTable no-footer" style="display: none; font-size: initial;">
                                      <thead>
                                        <th class="barcodes_column">Barcode</th>
                                      </thead>
                                      <tbody>
                                      </tbody>
                                    </table>
                                </div>
                                <input type="hidden" name="op" value="check_in" />
                                <div id="button_bar">
                                <button id="sci_checkin_button" type="submit" class="btn btn-default btn-sm" style="display: none;">
                                    <i class="fa fa-check-square-o" aria-hidden="true"></i><span> Check in</span>
                                </button>
                                <a href="/cgi-bin/koha/sci/sci-main.pl" class="btn btn-default btn-sm" role="button" style="display: none;" id="sci_refresh_button">
                                    <i class="fa fa-refresh" aria-hidden="true"></i> <span>Reset</span>
                                </a>
                                </div>
                            </fieldset>
                        </form>
                    </div> <!-- / #new_checkins -->
                [% END %]
                </div> <!-- / #masthead -->
            </div> <!-- / .row-fluid -->
        </div> <!-- / .container-fluid -->

        [% IF ( Koha.Preference('SCOMainUserBlock' ) ) %]
            <div id="scomainuserblock">[% Koha.Preference('SCOMainUserBlock' ) %]</div>
        [% END %]
    </div> <!-- / .main -->

    <div id="helpModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="helpModalLabel" aria-hidden="true">

      <div class="modal-header">
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
        <h3 id="helpModalLabel">Self check-in help</h3>
      </div>

      <div class="modal-body">
        <ul>
          <li>Scan each item or enter its barcode. A list with the entered barcodes will be displayed.</li>
          <li>Click the 'Check in' button to confirm.</li>
          <li>The operation results will be displayed for each entered barcode.</li>
          <li>The 'Finish' button is presented to start over.</li>
          <li>At any step, clicking the 'Refresh' button will erase the scanned barcodes and start over.</li>
        </ul>
      </div>
    </div> <!-- /#helpModal -->
</body>

[% INCLUDE 'opac-bottom.inc' %]
[% BLOCK jsinclude %]
    [% INCLUDE 'datatables.inc' %]
    <script type="text/javascript">

        function mungeHistory() {
            // prevent back button from allowing form resubmission
            if (history && history.pushState) {
                history.replaceState(null, document.title, window.location.href);
            }
        }

        function dofocus() {
            $(".focus:last").select();
        }

        var barcodes = [];

        $(document).ready(function() {
            // Barcodes scanning table initially hidden
            $("#sci_barcodes_table").hide();
            // Control de 'append' button behaviour
            $("#sci_append_button").on('click',function( e ){
                // Make sure the form is not submitted by the button
                e.preventDefault();
                var barcode = $('#barcode_input').val();
                //var result  = validate_barcode( barcode );
                $('#sci_barcodes_table tbody').append(
                        '<tr stype="font-size: initial;"><td>' +
                            barcode +
                            '<input type="hidden" name="barcode" value="' + barcode + '" />' +
                        '</td></tr>' );
                // Make sure the table is now displayed
                $("#sci_barcodes_table").show();
                $('#sci_checkin_button').show();
                $('#sci_refresh_button').show();
                barcodes.push(barcode);
                // clean the input, reset the focus
                $('#barcode_input').val('');
                dofocus();
            });

            $(".helpModal-trigger").on("click",function(e){
                e.preventDefault();
                $("#helpModal").modal("show");
            });

            // set focus at the beginning
            dofocus();
        });
    </script>

    [% IF ( Koha.Preference('SCOUserJS') ) %]<script type="text/javascript">[% Koha.Preference('SCOUserJS') %]</script>[% END %]
[% END %]




#!/usr/bin/perl

# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI qw ( -utf8 );

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

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

my $cgi = new CGI;

# 404 if feature is disabled
unless ( C4::Context->preference('SelfCheckInModule') ) {
    print $cgi->redirect("/cgi-bin/koha/errors/404.pl");
    exit;
}

# Let Auth know this is a SCI context
$cgi->param( -name => 'sci_user_login', -values => [1] );

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "sci/sci-main.tt",
        authnotrequired => 0,
        flagsrequired   => { circulate => "self_checkout" },
        query           => $cgi,
        type            => "opac"
    }
);

my $op = $cgi->param('op') // '';

if ( $op eq 'check_in' ) {
    ## Get the barcodes, perform some basic validation
    # Remove empty ones
    my @barcodes = grep { $_ ne '' } $cgi->multi_param('barcode');

    # Remove duplicates
    @barcodes = uniq @barcodes;

    # Read the library we are logged in from userenv
    my $library = C4::Context->userenv->{'branch'};
    my @success;
    my @errors;

    # Return items
    foreach my $barcode (@barcodes) {
        try {
            my ( $success, $messages, $checkout, $patron ) =
              AddReturn( $barcode, $library );
            if ($success) {
                push @success,
                  {
                    barcode  => $barcode,
                    messages => $messages,
                    checkout => $checkout,
                    patron   => $patron
                  };
            }
            else {
                push @errors,
                  {
                    barcode  => $barcode,
                    messages => $messages,
                    checkout => $checkout,
                    patron   => $patron
                  };
            }
        }
        catch {
            push @errors, { barcode => $barcode, messages => 'unknown_error' };
        };
    }
    $template->param( success => \@success, errors => \@errors, checkins => 1 );
}

output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };

Return to bug 15492

Lines 207-212 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (+29 lines)
207	}	207	}
208	}	208	}
209		209
		210	# If the user logged in is the SCI user and they try to go out of the SCI module,
		211	# log the user out removing the CGISESSID cookie
		212	if ( $in->{type} eq 'opac' and $in->{template_name} !~ m\|sci/\| ) {
		213	if ( $user && C4::Context->preference('AutoSelfCheckID') && $user eq C4::Context->preference('AutoSelfCheckID') ) {
		214	$template = C4::Templates::gettemplate( 'opac-auth.tt', 'opac', $in->{query} );
		215	my $cookie = $in->{query}->cookie(
		216	-name => 'CGISESSID',
		217	-value => '',
		218	-expires => '',
		219	-HttpOnly => 1,
		220	);
		221
		222	$template->param(
		223	loginprompt => 1,
		224	script_name => get_script_name(),
		225	);
		226	print $in->{query}->header(
		227	{ type => 'text/html',
		228	charset => 'utf-8',
		229	cookie => $cookie,
		230	'X-Frame-Options' => 'SAMEORIGIN'
		231	}
		232	),
		233	$template->output;
		234	safe_exit;
		235	}
		236	}
		237
210	my $borrowernumber;	238	my $borrowernumber;
211	if ($user) {	239	if ($user) {
212		240
Lines 1266-1271 sub checkauth { Link Here
1266	);	1294	);
1267		1295
1268	$template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );	1296	$template->param( SCO_login => 1 ) if ( $query->param('sco_user_login') );
		1297	$template->param( SCI_login => 1 ) if ( $query->param('sci_user_login') );
1269	$template->param( OpacPublic => C4::Context->preference("OpacPublic") );	1298	$template->param( OpacPublic => C4::Context->preference("OpacPublic") );
1270	$template->param( loginprompt => 1 ) unless $info{'nopermission'};	1299	$template->param( loginprompt => 1 ) unless $info{'nopermission'};
1271		1300

Lines 193-196 i.help { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css (+12 lines)
193	.table .nosort.sorting {	193	.table .nosort.sorting {
194	padding-right: 19px;	194	padding-right: 19px;
195	background: #EEEEEE none;	195	background: #EEEEEE none;
		196	}
		197
		198	#sci_logout {
		199	color: #E8583C;
		200	}
		201
		202	#sci_checkin_button, #sci_refresh_button, #sci_append_button {
		203	margin-bottom: 10px;
		204	}
		205
		206	#sci_refresh_button {
		207	color: rgb(51, 51, 51);
196	}	208	}

Line 0 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt (+248 lines)
		1	[%# Includes %]
		2	[% USE Koha %]
		3	[% USE KohaDates %]
		4	[%# Helper template functions %]
		5	[% BLOCK error_message %]
		6	[% IF messages.BadBarcode %]
		7	<span>(Barcode not found on the database)</span>
		8	[% ELSIF messages.DataCorrupted %]
		9	<span>(Data corruption detected. Contact your librarian)</span>
		10	[% ELSIF messages.Wrongbranch %]
		11	<span>(The item cannot be returned at this library)</span>
		12	[% ELSIF messages.withdrawn %]
		13	<span>(Item is withdrawn and check-in blocked by policy. Contact your librarian)</span>
		14	[% ELSIF messages.NotIssued %]
		15	<span>(The book is not currently on loan. Contact your librarian)</span>
		16	[% END %]
		17	[% END %]
		18
		19	[% INCLUDE 'doc-head-open.inc' %]
		20
		21	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] &rsaquo; Self check-in</title>
		22
		23	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
		24	<meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats -->
		25
		26	[% IF ( Koha.Preference('OpacFavicon') ) %]
		27	<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') %]" type="image/x-icon" />
		28	[% ELSE %]
		29	<link rel="shortcut icon" href="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" />
		30	[% END %]
		31	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min.css" />
		32	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui.css" />
		33	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min.css" />
		34	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco.css" />
		35	[% IF ( Koha.Preference('OPACUserCSS') ) %]<style type="text/css">[% Koha.Preference('OPACUserCSS') %]</style>[% END %]
		36	[% IF ( Koha.Preference('SCOUserCSS') ) %]<style type="text/css">[% Koha.Preference('SCOUserCSS') %]</style>[% END %]
		37	<!--[if lt IE 9]>
		38	<script src="[% interface %]/[% theme %]/lib/respond.min.js"></script>
		39	<![endif]-->
		40	<script type="text/javascript">
		41	function _(s) { return s } // dummy function for gettext
		42	</script>
		43	<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min.js"></script>
		44	</head>
		45	<body id="sci_main" class="sci" onload="dofocus();" onunload="mungeHistory();">
		46
		47	[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
		48	<div id="wrap">
		49	<div class="navbar navbar-inverse navbar-static-top">
		50	<div class="navbar-inner">
		51	<div class="container-fluid">
		52	<a class="brand" href="/cgi-bin/koha/sci/sci-main.pl"><img src="[% interface %]/[% theme %]/images/koha-logo-navbar.png" alt=""></a>
		53	<div id="checkouthelp">
		54	<ul class="nav pull-right">
		55	<li><a href="/cgi-bin/koha/sci/sci-main.pl" class="helpModal-trigger" role="button" data-toggle="modal"><i class="icon help"></i> Help</a></li>
		56	<li><a id="sci_logout" href="/cgi-bin/koha/sci/sci-main.pl?logout.x=1" class="logout">Logout</a></li>
		57	</ul>
		58	</div>
		59
		60	[% IF Koha.Preference( 'opaclanguagesdisplay' ) %]
		61	<div id="members">
		62	<ul class="nav pull-right">
		63	[% INCLUDE 'masthead-langmenu.inc' %]
		64	</ul>
65	</div>
66	[% END %]
67
68	</div> <!-- /.container-fluid -->
69	</div> <!-- /.navbar-inner -->
70	</div> <!-- /.navbar -->
71
72	[% IF Koha.Preference( 'opacheader' ) %]
73	<div class="container-fluid">
74	<div class="row-fluid">
75	<div id="opacheader">
76	[% Koha.Preference( 'opacheader' ) %]
77	</div>
78	</div>
79	</div>
80	[% END %]
81
82	<div class="main">
83	<div class="container-fluid">
84	<div class="row-fluid">
85	<div id="masthead">
86	<h1>[% LibraryName %] Self check-in</h1>
87	[% IF ( nopermission ) %]
88	[%# This is what is displayed if user doesn't have permission %]
89	<div class="alert">
90	<h3>Access denied</h3>
91	<p>Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.</p>
92	</div>
93	[% ELSIF ( different_ip ) %]
94	[%# This is what is displayed if user doesn't have permission %]
95	<div class="alert">
96	<h3>Session lost</h3>
97	<p>You are accessing self check-in from a different IP address! Please log in again.</p>
98	</div>
99	[% ELSIF ( checkins ) %]
100	[%# We have results from a check-in attempt %]
101	<div id="checkins" class="sci_results_list">
102	[% IF ( success && success.size > 0 \|\| errors && errors.size > 0 ) %]
103	<h3>Results</h3>
104	<table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer" style="font-size: initial;">
105	<thead>
106	<th>Barcode</th>
107	<th>Status</th>
108	</thead>
109	<tbody>
110	[% FOREACH success_line IN success %]
111	<tr><td>[% success_line.barcode %]</td><td>Checked in</td></tr>
112	[% END %]
113	[% FOREACH error IN errors %]
114	<tr>
115	<td>[% error.barcode %]</td>
116	<td>Not checked in [% PROCESS error_message messages=error.messages %]</td>
117	</tr>
118	[% END %]
119	</tbody>
120	</table>
121	<div>
122	<form method="post" action="#" id="finish_form">
123	<button type="submit" class="btn"><i class="icon finish"></i> Finish</button>
124	</form>
125	</div>
126	[% ELSE %]
127	<div class="alert">
128	<p>Your request included no check-ins.</p>
129	</div>
130	[% END %]
131	</div>
132	[% ELSE %]
133	[%# Prompt for barcodes %]
134	<div id="new_checkins" class="sci_entry">
135	<form id="scan_form" name="scan_form"
136	method="post" action="/cgi-bin/koha/sci/sci-main.pl">
137	<fieldset>
138	<div>
139	<label for="barcode_input">Scan the item or enter its barcode:</label>
140	<input id="barcode_input" name="barcode_input" size="20" type="text" class="focus" autocomplete="off" />
141	<button id="sci_append_button" type="submit" class="btn btn-default btn-sm">
142	<i class="fa fa-plus" aria-hidden="true"></i> <span>Add</span>
143	</button>
144	</div>
145	<div class="sci_input_append">
146	<table id="sci_barcodes_table" class="table table-bordered table-striped dataTable no-footer" style="display: none; font-size: initial;">
147	<thead>
148	<th class="barcodes_column">Barcode</th>
149	</thead>
150	<tbody>
151	</tbody>
152	</table>
153	</div>
154	<input type="hidden" name="op" value="check_in" />
155	<div id="button_bar">
156	<button id="sci_checkin_button" type="submit" class="btn btn-default btn-sm" style="display: none;">
157	<i class="fa fa-check-square-o" aria-hidden="true"></i><span> Check in</span>
158	</button>
159	<a href="/cgi-bin/koha/sci/sci-main.pl" class="btn btn-default btn-sm" role="button" style="display: none;" id="sci_refresh_button">
160	<i class="fa fa-refresh" aria-hidden="true"></i> <span>Reset</span>
161	</a>
162	</div>
163	</fieldset>
164	</form>
165	</div> <!-- / #new_checkins -->
166	[% END %]
167	</div> <!-- / #masthead -->
168	</div> <!-- / .row-fluid -->
169	</div> <!-- / .container-fluid -->
170
171	[% IF ( Koha.Preference('SCOMainUserBlock' ) ) %]
172	<div id="scomainuserblock">[% Koha.Preference('SCOMainUserBlock' ) %]</div>
173	[% END %]
174	</div> <!-- / .main -->
175
176	<div id="helpModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="helpModalLabel" aria-hidden="true">
177
178	<div class="modal-header">
179	<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
180	<h3 id="helpModalLabel">Self check-in help</h3>
181	</div>
182
183	<div class="modal-body">
184	<ul>
185	<li>Scan each item or enter its barcode. A list with the entered barcodes will be displayed.</li>
186	<li>Click the 'Check in' button to confirm.</li>
187	<li>The operation results will be displayed for each entered barcode.</li>
188	<li>The 'Finish' button is presented to start over.</li>
189	<li>At any step, clicking the 'Refresh' button will erase the scanned barcodes and start over.</li>
190	</ul>
191	</div>
192	</div> <!-- /#helpModal -->
193	</body>
194
195	[% INCLUDE 'opac-bottom.inc' %]
196	[% BLOCK jsinclude %]
197	[% INCLUDE 'datatables.inc' %]
198	<script type="text/javascript">
199
200	function mungeHistory() {
201	// prevent back button from allowing form resubmission
202	if (history && history.pushState) {
203	history.replaceState(null, document.title, window.location.href);
204	}
205	}
206
207	function dofocus() {
208	$(".focus:last").select();
209	}
210
211	var barcodes = [];
212
213	$(document).ready(function() {
214	// Barcodes scanning table initially hidden
215	$("#sci_barcodes_table").hide();
216	// Control de 'append' button behaviour
217	$("#sci_append_button").on('click',function( e ){
218	// Make sure the form is not submitted by the button
219	e.preventDefault();
220	var barcode = $('#barcode_input').val();
221	//var result = validate_barcode( barcode );
222	$('#sci_barcodes_table tbody').append(
223	'<tr stype="font-size: initial;"><td>' +
224	barcode +
225	'<input type="hidden" name="barcode" value="' + barcode + '" />' +
226	'</td></tr>' );
227	// Make sure the table is now displayed
228	$("#sci_barcodes_table").show();
229	$('#sci_checkin_button').show();
230	$('#sci_refresh_button').show();
231	barcodes.push(barcode);
232	// clean the input, reset the focus
233	$('#barcode_input').val('');
234	dofocus();
235	});
236
237	$(".helpModal-trigger").on("click",function(e){
238	e.preventDefault();
239	$("#helpModal").modal("show");
240	});
241
242	// set focus at the beginning
243	dofocus();
244	});
245	</script>
246
247	[% IF ( Koha.Preference('SCOUserJS') ) %]<script type="text/javascript">[% Koha.Preference('SCOUserJS') %]</script>[% END %]
248	[% END %]

Line 0 Link Here

(-)a/opac/sci/sci-main.pl (-1 / +96 lines)
0	-	1	#!/usr/bin/perl
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it
		6	# under the terms of the GNU General Public License as published by
		7	# the Free Software Foundation; either version 3 of the License, or
		8	# (at your option) any later version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but
		11	# WITHOUT ANY WARRANTY; without even the implied warranty of
		12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		13	# GNU General Public License for more details.
		14	#
		15	# You should have received a copy of the GNU General Public License
		16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		17
		18	use Modern::Perl;
		19
		20	use CGI qw ( -utf8 );
		21
		22	use C4::Auth qw(get_template_and_user checkpw);
		23	use C4::Circulation;
		24	use C4::Output;
		25
		26	use List::MoreUtils qw( uniq );
		27	use Try::Tiny;
		28
		29	my $cgi = new CGI;
		30
		31	# 404 if feature is disabled
		32	unless ( C4::Context->preference('SelfCheckInModule') ) {
		33	print $cgi->redirect("/cgi-bin/koha/errors/404.pl");
		34	exit;
		35	}
		36
		37	# Let Auth know this is a SCI context
		38	$cgi->param( -name => 'sci_user_login', -values => [1] );
		39
		40	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		41	{
		42	template_name => "sci/sci-main.tt",
		43	authnotrequired => 0,
		44	flagsrequired => { circulate => "self_checkout" },
		45	query => $cgi,
		46	type => "opac"
		47	}
		48	);
		49
		50	my $op = $cgi->param('op') // '';
		51
		52	if ( $op eq 'check_in' ) {
		53	## Get the barcodes, perform some basic validation
		54	# Remove empty ones
		55	my @barcodes = grep { $_ ne '' } $cgi->multi_param('barcode');
		56
		57	# Remove duplicates
		58	@barcodes = uniq @barcodes;
		59
		60	# Read the library we are logged in from userenv
		61	my $library = C4::Context->userenv->{'branch'};
		62	my @success;
		63	my @errors;
		64
		65	# Return items
66	foreach my $barcode (@barcodes) {
67	try {
68	my ( $success, $messages, $checkout, $patron ) =
69	AddReturn( $barcode, $library );
70	if ($success) {
71	push @success,
72	{
73	barcode => $barcode,
74	messages => $messages,
75	checkout => $checkout,
76	patron => $patron
77	};
78	}
79	else {
80	push @errors,
81	{
82	barcode => $barcode,
83	messages => $messages,
84	checkout => $checkout,
85	patron => $patron
86	};
87	}
88	}
89	catch {
90	push @errors, { barcode => $barcode, messages => 'unknown_error' };
91	};
92	}
93	$template->param( success => \@success, errors => \@errors, checkins => 1 );
94	}
95
96	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };