#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
# We're going to authenticate a self-check user. we'll add a flag to borrowers 'selfcheck'
#
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use Digest::MD5 qw(md5_base64);
use C4::Auth qw(get_template_and_user checkpw);
use C4::Members;
use C4::Biblio;
use C4::Items;
+use Koha::Acquisition::Currencies;
+use Koha::Patron::Images;
+use Koha::Patron::Messages;
my $query = new CGI;
if (C4::Context->preference('AutoSelfCheckAllowed'))
{
- my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
- my $AutoSelfCheckPass = C4::Context->preference('AutoSelfCheckPass');
- $query->param(-name=>'userid',-values=>[$AutoSelfCheckID]);
- $query->param(-name=>'password',-values=>[$AutoSelfCheckPass]);
+ my $AutoSelfCheckID = C4::Context->preference('AutoSelfCheckID');
+ my $AutoSelfCheckPass = C4::Context->preference('AutoSelfCheckPass');
+ $query->param(-name=>'userid',-values=>[$AutoSelfCheckID]);
+ $query->param(-name=>'password',-values=>[$AutoSelfCheckPass]);
$query->param(-name=>'koha_login_context',-values=>['sco']);
}
+$query->param(-name=>'sco_user_login',-values=>[1]);
my ($template, $loggedinuser, $cookie) = get_template_and_user({
- template_name => "sco/sco-main.tmpl",
+ template_name => "sco/sco-main.tt",
authnotrequired => 0,
- flagsrequired => { circulate => "circulate_remaining_permissions" },
+ flagsrequired => { circulate => "self_checkout" },
query => $query,
type => "opac",
debug => 1,
});
+
if (C4::Context->preference('SelfCheckoutByLogin'))
{
$template->param(authbylogin => 1);
my $issuerid = $loggedinuser;
-my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $timedout) = (
+my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed) = (
$query->param("op") || '',
$query->param("patronid") || '',
$query->param("patronlogin")|| '',
$query->param("patronpw") || '',
$query->param("barcode") || '',
$query->param("confirmed") || '',
- $query->param("timedout") || '', #not actually using this...
);
my $issuenoconfirm = 1; #don't need to confirm on issue.
}
my $borrower = GetMemberDetails(undef,$patronid);
+my $currencySymbol = "";
+if ( my $active_currency = Koha::Acquisition::Currencies->get_active ) {
+ $currencySymbol = $active_currency->symbol;
+}
my $branch = $issuer->{branchcode};
my $confirm_required = 0;
hide_main => 1,
);
if ($issue_error eq 'DEBT') {
- $template->param(amount => $impossible->{DEBT});
+ $template->param(amount => $currencySymbol.$impossible->{DEBT});
}
#warn "issue_error: " . $issue_error ;
if ( $issue_error eq "NO_MORE_RENEWALS" ) {
"circ_error_$issue_error" => 1,
hide_main => 1,
);
+ if ($issue_error eq 'DEBT') {
+ $template->param(amount => $currencySymbol.$needconfirm->{DEBT});
+ }
} else {
if ( $confirmed || $issuenoconfirm ) { # we'll want to call getpatroninfo again to get updated issues.
# warn "issuing book?";
C4::Context->preference("AllowItemsOnHoldCheckout")
);
$it->{'norenew'} = 1 if $renewokay->{'NO_MORE_RENEWALS'};
+ $it->{date_due} = $it->{date_due_sql};
push @issues, $it;
}
patronlogin => $patronlogin,
patronpw => $patronpw,
noitemlinks => 1 ,
+ borrowernumber => $borrower->{'borrowernumber'},
+ );
+
+ my $patron_messages = Koha::Patron::Messages->search(
+ {
+ borrowernumber => $borrower->{'borrowernumber'},
+ message_type => 'B',
+ }
+ );
+ $template->param(
+ patron_messages => $patron_messages,
+ opacnote => $borrower->{opacnote},
);
+
my $inputfocus = ($return_only == 1) ? 'returnbook' :
($confirm_required == 1) ? 'confirm' : 'barcode' ;
$template->param(
inputfocus => $inputfocus,
- nofines => 1,
- "dateformat_" . C4::Context->preference('dateformat') => 1,
+ nofines => 1,
+
);
if (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) {
- my ($image, $dberror) = GetPatronImage($borrower->{cardnumber});
- if ($image) {
- $template->param(
- display_patron_image => 1,
- cardnumber => $borrower->{cardnumber},
- );
- }
+ my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
+ $template->param(
+ display_patron_image => 1,
+ cardnumber => $borrower->{cardnumber},
+ ) if $patron_image;
}
} else {
$template->param(
);
}
-output_html_with_http_headers $query, $cookie, $template->output;
+$template->param(
+ SCOUserJS => C4::Context->preference('SCOUserJS'),
+ SCOUserCSS => C4::Context->preference('SCOUserCSS'),
+);
+
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
projects / srvgit / blobdiff