From 1797a6b1c7e90ab24f16b3f7b4d57ff8c42b4b9b Mon Sep 17 00:00:00 2001 From: Johanna Raisa Date: Wed, 10 Jul 2019 13:42:25 +0300 Subject: [PATCH 1/2] Bug 22322: Self check-in without log in One should be able to return loans via SCO without login required. This patch adds check in box where patrons can check in their loans with barcode. To test: 1. Set "SelfCheckoutByLogin" as "cardnumber". 2. Find patron with loan or add one. 3. Go to /cgi-bin/koha/sco/sco-main.pl 4. Return loan by passing items barcode => confirm loans is returned succesfully Sponsored-by: Koha-Suomi Oy Signed-off-by: Lucy Vaux-Harvey --- .../en/includes/masthead-sco-self.inc | 35 ++++++ .../bootstrap/en/modules/sco/help.tt | 2 +- .../bootstrap/en/modules/sco/sco-main.tt | 106 ++++++++++++++---- opac/sco/sco-main.pl | 83 ++++++++++++-- 4 files changed, 197 insertions(+), 29 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc new file mode 100644 index 0000000000..c6be929d7e --- /dev/null +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc @@ -0,0 +1,35 @@ +[% USE Koha %] +[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] + + + + + [% IF ( opacheader ) %] +
+
+
+ [% opacheader %] +
+
+
+ [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt index 6cac354725..af5ef17328 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt @@ -32,7 +32,7 @@ [% Asset.js('js/i18n.js') | $raw %] - [% INCLUDE 'masthead-sco.inc' %] +[% INCLUDE 'masthead-sco-self.inc' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 5f8e8eee3e..278ef8c232 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -45,7 +45,7 @@ [% INCLUDE 'masthead-sco.inc' %] -
+
[% IF ( display_patron_image ) %] @@ -443,32 +443,48 @@
[% ELSE # IF validuser %] -
+
+
+

Check out

[% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] - Log in to your account - - - - -
- -
- [% ELSE %] -
-
- +
+
+
+
+ +
+
+
- + +
+
+
-
- +
+
+
+
+ +
-
+
+ [% ELSE %] +
+
+ +
+
+ +
+
+ +
+
[% END %] - [% FOREACH INPUT IN INPUTS %] [% END %] @@ -476,8 +492,40 @@
+
+
+
+
+
+

Check in

+
+
+
+
+ +
+
+ [% IF ( checkinmessage ) %] + + [% ELSE %] + + [% END %] +
+
+ +
+
+ [% FOREACH INPUT IN INPUTS %] + + [% END %] + +
+
+
+
[% END # / IF validuser %] [% END # / UNLESS ( hide_main %] + [% checkinmessage %] [% IF ( SCOMainUserBlock ) %]
[% PROCESS koha_news_block news => SCOMainUserBlock %] @@ -486,7 +534,7 @@
-
+
[% INCLUDE 'opac-bottom.inc' %] @@ -555,7 +603,7 @@ $(document).ready(function() { dofocus(); - [% IF ( patronid ) %]sco_init();[% END %] + [% IF ( patronid || uibarcode ) %]sco_init();[% END %] var dTables = $("#loanTable, #holdst, #finestable"); dTables.each(function(){ @@ -589,6 +637,7 @@ dataTables.DataTable().responsive.recalc(); } ); + $("#logout_form").on("click", function(e){ e.preventDefault(e); clearTimeout(mainTimeout); @@ -606,7 +655,22 @@ [% ELSE %] location.href = '/cgi-bin/koha/sco/sco-main.pl?op=logout'; [% END %] + return true; + }); + $("#logout_form_vara").on("click", function() { + clearTimeout(mainTimeout); + [% IF Koha.Preference('SelfCheckReceiptPrompt') %] + var confirmStart = Date.now(); + if(confirm(_("Would you like to print a receipt?"))){ + if ( (Date.now() - confirmStart) < [% SelfCheckTimeout %] ) { + window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip"); + } + else { + alert(_("Timeout while waiting for print confirmation")); + } + } + [% END %] return true; }); diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 45d46b7d47..77e3a7ccda 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -33,10 +33,12 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth qw( in_iprange get_template_and_user checkpw ); -use C4::Circulation qw( barcodedecode AddReturn CanBookBeIssued AddIssue CanBookBeRenewed AddRenewal ); -use C4::Reserves; +use C4::Circulation qw( barcodedecode AddReturn CanBookBeIssued AddIssue CanBookBeRenewed AddRenewal updateWrongTransfer ); +use C4::Reserves qw( ModReserveAffect ); use C4::Output qw( output_html_with_http_headers ); use C4::Members; +use C4::Biblio qw( GetBiblioData ); +use C4::Items qw( ModItemTransfer ); use Koha::DateUtils qw( dt_from_string ); use Koha::Acquisition::Currencies; use Koha::Items; @@ -45,6 +47,7 @@ use Koha::Patron::Images; use Koha::Patron::Messages; use Koha::Plugins; use Koha::Token; +use Koha::Calendar; my $query = CGI->new; @@ -73,9 +76,11 @@ $query->param(-name=>'sco_user_login',-values=>[1]); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { template_name => "sco/sco-main.tt", + authnotrequired => 0, flagsrequired => { self_check => "self_checkout_module" }, query => $query, type => "opac", + debug => 1, } ); @@ -93,7 +98,7 @@ if (defined C4::Context->preference('SCOAllowCheckin')) { } my $issuerid = $loggedinuser; -my ( $op, $patronlogin, $patronpw, $barcode, $confirmed, $newissues, $load_checkouts ) = ( +my ( $op, $patronlogin, $patronpw, $barcode, $confirmed, $newissues, $load_checkouts, $uibarcode, $checkinmessage ) = ( $query->param("op") || '', $query->param("patronlogin") || '', $query->param("patronpw") || '', @@ -101,6 +106,8 @@ my ( $op, $patronlogin, $patronpw, $barcode, $confirmed, $newissues, $load_check $query->param("confirmed") || '', $query->param("newissues") || '', $query->param("load_checkouts") || '', + $query->param("uibarcode") || '', + $query->param("checkinmessage") || undef, ); my $jwt = $query->cookie('JWT'); @@ -116,6 +123,18 @@ my @newissueslist = split /,/, $newissues; my $issuenoconfirm = 1; #don't need to confirm on issue. my $issuer = Koha::Patrons->find( $issuerid )->unblessed; +my $checkinitem; +my $checkinbranchcode; +my $userenv = C4::Context->userenv; +my $userenv_branch = $userenv->{'branch'} // ''; +my $daysmode = Koha::CirculationRules->get_effective_daysmode( + { + branchcode => $userenv_branch, + } +); +my $calendar = Koha::Calendar->new( branchcode => $userenv_branch, days_mode => $daysmode ); +my $today = DateTime->now( time_zone => C4::Context->tz()); + my $patronid = $jwt ? Koha::Token->new->decode_jwt({ token => $jwt }) : undef; unless ( $patronid ) { if ( C4::Context->preference('SelfCheckoutByLogin') ) { @@ -140,7 +159,7 @@ my $branch = $issuer->{branchcode}; my $confirm_required = 0; my $return_only = 0; -if ( $patron && $op eq "returnbook" && $allowselfcheckreturns ) { +if ( ( $op eq "checkin" && $uibarcode ) || $patron && $op eq "returnbook" && $allowselfcheckreturns ) { my $success = 1; @@ -153,16 +172,66 @@ if ( $patron && $op eq "returnbook" && $allowselfcheckreturns ) { } } - if ($success) { + if ($success && ( $op ne "checkin" && !$uibarcode )) { # Patron cannot checkin an item they don't own $success = 0 unless $patron->checkouts->find( { itemnumber => $item->itemnumber } ); } - if ( $success ) { - ($success) = AddReturn( $barcode, $branch ) + $uibarcode =~ s/^\s+|\s+$//g; + $checkinitem = Koha::Items->find({ barcode => $uibarcode }); + if( !$checkinitem ){ + $checkinmessage = "Item not found."; + } + my $tobranch = $checkinitem->homebranch; + + my ($return_success,$messages,$issueinformation,$borrower) = AddReturn($uibarcode,$branch,undef,$today) unless !$success; + + my $needstransfer = $messages->{'NeedsTransfer'}; + if($messages->{'ResFound'}) { + my $reserve = $messages->{'ResFound'}; + my $reserve_id = $reserve->{'reserve_id'}; + my $resborrower = $reserve->{'borrowernumber'}; + my $diffBranchReturned = $reserve->{'branchcode'}; + my $itemnumber = $checkinitem->itemnumber; + my $diffBranchSend = ($branch ne $diffBranchReturned) ? $diffBranchReturned : undef; + if($diffBranchSend) { + ModReserveAffect( $itemnumber, $resborrower, $diffBranchSend, $reserve_id); + ModItemTransfer($itemnumber,$branch,$diffBranchReturned, 'ResFound'); + } + else { + my $settransit = C4::Context->preference('RequireSCCheckInBeforeNotifyingPickups') ? 1 : 0; + ModReserveAffect( $itemnumber, $resborrower, $settransit, $reserve_id); + } + $borrower = Koha::Patrons->find({ cardnumber => $patronid }); + } + else { + if($needstransfer) { + ModItemTransfer($checkinitem->itemnumber, $branch, $tobranch, 'NeedsTransfer'); + } + } + + if($messages->{'WrongTransfer'}) { + updateWrongTransfer($checkinitem->itemnumber,$tobranch,$branch); + } + + my $biblio = Koha::Biblios->find({ biblionumber => $checkinitem->biblionumber }); + if ( $biblio && ( $success || $return_success )) { + $checkinmessage = "Returned ".$biblio->title; + } + + if ( $issuer ) { + $checkinbranchcode = $issuer->{branchcode}; + #home branch of item + if ($checkinbranchcode) { + my $checkinlibrary = Koha::Libraries->find( $checkinbranchcode ); + $checkinmessage.=", ".$checkinlibrary->branchname; + } } + $template->param(checkinmessage => $checkinmessage || undef); + $template->param(SelfCheckTimeout => 10000); #don't show returns long + $template->param(uibarcode => $uibarcode); $template->param( returned => $success ); } elsif ( $patron && ( $op eq 'checkout' ) ) { -- 2.34.1