From 36e0766cebf594c3bbde2f56a25ff95157206f32 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Thu, 13 Dec 2018 01:51:38 -0300 Subject: [PATCH] Bug 19458: Self-check module highlighting In SCO Module there is no difference on how new checkouts and renewals are shown from previous ones. This commit is done to address that issue. How to test: 1. Go to /cgi-bin/koha/sco/sco-main.pl and login. 2. Checkout a new item. 3. In checkout's table new checkouts should be easily identifiable. Signed-off-by: Josef Moravec Signed-off-by: Alex Arnaud --- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++++ opac/sco/sco-main.pl | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) 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 fb6ce8c..21724e3 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 @@ -195,6 +195,7 @@ + @@ -238,6 +239,9 @@ [% ISSUE.issuedate | html %] + [% IF ( newissues.match(ISSUE.barcode)) %] + NEW + [% END %] [% UNLESS ( noitemlinks ) %] [% ISSUE.title | html %] [% ELSE %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 9fcf729..49018da 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -93,15 +93,16 @@ if (defined C4::Context->preference('AllowSelfCheckReturns')) { } 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); @@ -215,7 +216,9 @@ elsif ( $patron and $op eq "checkout" ) { )->count; } AddIssue( $borrower, $barcode ); - + push @newissueslist, $barcode; + print 'Issues \n'; + print join(',', @newissueslist); if ( $hold_existed ) { my $dtf = Koha::Database->new->schema->storage->datetime_parser; $template->param( @@ -245,6 +248,7 @@ elsif ( $patron and $op eq "checkout" ) { } # $op if ($borrower) { + print 'borrower \n'; # warn "issuer's branchcode: " . $issuer->{branchcode}; # warn "user's branchcode: " . $borrower->{branchcode}; my $borrowername = sprintf "%s %s", ($borrower->{firstname} || ''), ($borrower->{surname} || ''); @@ -267,6 +271,7 @@ if ($borrower) { borrowername => $borrowername, issues_count => scalar(@checkouts), ISSUES => \@checkouts, + newissues => join(',',@newissueslist), patronid => $patronid, patronlogin => $patronlogin, patronpw => $patronpw, -- 2.7.4