use C4::Items;
use Koha::DateUtils qw( dt_from_string );
use Koha::Acquisition::Currencies;
+use Koha::Items;
use Koha::Patrons;
use Koha::Patron::Images;
use Koha::Patron::Messages;
$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.tt",
- authnotrequired => 0,
- flagsrequired => { circulate => "self_checkout" },
- query => $query,
- type => "opac",
- debug => 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,
+ }
+);
# Get the self checkout timeout preference, or use 120 seconds as a default
my $selfchecktimeout = 120000;
}
my $issuerid = $loggedinuser;
-my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed) = (
+my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = (
$query->param("op") || '',
$query->param("patronid") || '',
$query->param("patronlogin")|| '',
$query->param("patronpw") || '',
$query->param("barcode") || '',
$query->param("confirmed") || '',
+ $query->param("newissues") || '',
);
+my @newissueslist = split /,/, $newissues;
my $issuenoconfirm = 1; #don't need to confirm on issue.
my $issuer = Koha::Patrons->find( $issuerid )->unblessed;
-my $item = GetItem(undef,$barcode);
+my $item = Koha::Items->find({ barcode => $barcode });
if (C4::Context->preference('SelfCheckoutByLogin') && !$patronid) {
my $dbh = C4::Context->dbh;
my $resval;
$borrower = $patron->unblessed if $patron;
}
-my $currencySymbol = "";
-if ( my $active_currency = Koha::Acquisition::Currencies->get_active ) {
- $currencySymbol = $active_currency->symbol;
-}
-
my $branch = $issuer->{branchcode};
my $confirm_required = 0;
my $return_only = 0;
#warn "issuer cardnumber: " . $issuer->{cardnumber};
#warn "patron cardnumber: " . $borrower->{cardnumber};
if ($op eq "logout") {
+ $template->param( loggedout => 1 );
$query->param( patronid => undef, patronlogin => undef, patronpw => undef );
}
elsif ( $op eq "returnbook" && $allowselfcheckreturns ) {
my ($doreturn) = AddReturn( $barcode, $branch );
+ $template->param( returned => $doreturn );
}
-elsif ( $patron and $op eq "checkout" ) {
+elsif ( $patron && ( $op eq 'checkout' || $op eq 'renew' ) ) {
my $impossible = {};
my $needconfirm = {};
( $impossible, $needconfirm ) = CanBookBeIssued(
if (scalar keys %$impossible) {
my $issue_error = (keys %$impossible)[0]; # FIXME This is wrong, we assume only one error and keys are not ordered
+ my $title = ( $item ) ? $item->biblio->title : '';
$template->param(
impossible => $issue_error,
"circ_error_$issue_error" => 1,
- title => $item->{title},
+ title => $title,
hide_main => 1,
);
if ($issue_error eq 'DEBT') {
- $template->param(amount => $currencySymbol.$impossible->{DEBT});
+ $template->param(DEBT => $impossible->{DEBT});
}
#warn "issue_error: " . $issue_error ;
if ( $issue_error eq "NO_MORE_RENEWALS" ) {
barcode => $barcode,
);
}
- } elsif ( $needconfirm->{RENEW_ISSUE} ) {
+ } elsif ( $needconfirm->{RENEW_ISSUE} || $op eq 'renew' ) {
if ($confirmed) {
#warn "renewing";
- AddRenewal( $borrower->{borrowernumber}, $item->{itemnumber} );
+ AddRenewal( $borrower->{borrowernumber}, $item->itemnumber );
+ push @newissueslist, $barcode;
+ $template->param( renewed => 1 );
} else {
#warn "renew confirmation";
$template->param(
hide_main => 1,
);
if ($issue_error eq 'DEBT') {
- $template->param(amount => $currencySymbol.$needconfirm->{DEBT});
+ $template->param(DEBT => $needconfirm->{DEBT});
}
} else {
if ( $confirmed || $issuenoconfirm ) { # we'll want to call getpatroninfo again to get updated issues.
}
)->count;
}
+
AddIssue( $borrower, $barcode );
+ $template->param( issued => 1 );
+ push @newissueslist, $barcode;
if ( $hold_existed ) {
my $dtf = Koha::Database->new->schema->storage->datetime_parser;
{
borrowernumber => $borrower->{borrowernumber},
accounttype => 'Res',
- description => 'Reserve Charge - ' . $item->biblio->title,
+ description => $item->biblio->title,
date => $dtf->format_date(dt_from_string)
}
)->count,
$confirm_required = 1;
#warn "issue confirmation";
$template->param(
- confirm => "Issuing title: " . $item->{title},
+ confirm => "Issuing title: " . $item->biblio->title,
barcode => $barcode,
hide_main => 1,
inputfocus => 'confirm',
# warn "issuer's branchcode: " . $issuer->{branchcode};
# warn "user's branchcode: " . $borrower->{branchcode};
my $borrowername = sprintf "%s %s", ($borrower->{firstname} || ''), ($borrower->{surname} || '');
- my @issues;
- my ($issueslist) = GetPendingIssues( $borrower->{'borrowernumber'} );
- foreach my $it (@$issueslist) {
+ my $pending_checkouts = $patron->pending_checkouts;
+ my @checkouts;
+ while ( my $c = $pending_checkouts->next ) {
+ my $checkout = $c->unblessed_all_relateds;
my ($can_be_renewed, $renew_error) = CanBookBeRenewed(
$borrower->{borrowernumber},
- $it->{itemnumber},
+ $checkout->{itemnumber},
);
- $it->{can_be_renewed} = $can_be_renewed;
- $it->{renew_error} = $renew_error;
- $it->{date_due} = $it->{date_due_sql};
- push @issues, $it;
+ $checkout->{can_be_renewed} = $can_be_renewed; # In the future this will be $checkout->can_be_renewed
+ $checkout->{renew_error} = $renew_error;
+ $checkout->{overdue} = $c->is_overdue;
+ push @checkouts, $checkout;
+ }
+
+ my $show_priority;
+ for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
+ m/priority/ and $show_priority = 1;
}
+ my $account = $patron->account;
+ my $total = $account->balance;
+ my $accountlines = $account->lines;
+
+ my $holds = $patron->holds;
+
$template->param(
validuser => 1,
borrowername => $borrowername,
- issues_count => scalar(@issues),
- ISSUES => \@issues,
+ issues_count => scalar(@checkouts),
+ ISSUES => \@checkouts,
+ HOLDS => $holds,
+ newissues => join(',',@newissueslist),
patronid => $patronid,
patronlogin => $patronlogin,
patronpw => $patronpw,
noitemlinks => 1 ,
borrowernumber => $borrower->{'borrowernumber'},
+ SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
+ AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
+ howpriority => $show_priority,
+ ACCOUNT_LINES => $accountlines,
+ total => $total,
);
my $patron_messages = Koha::Patron::Messages->search(