From cf483fd3758b2402d15245fe8b975cb9ee277e04 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Thu, 13 Dec 2018 20:01:24 -0300 Subject: [PATCH] Bug 19458: (follow-up) Self-check module highlighting Signed-off-by: Josef Moravec Signed-off-by: Alex Arnaud Signed-off-by: Nick Clemens --- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 13 ++++++++++--- opac/sco/sco-main.pl | 6 +++--- 2 files changed, 13 insertions(+), 6 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 bfa3aecca3..e004afd2b6 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 @@ -84,6 +84,7 @@ + [% END %] @@ -92,6 +93,7 @@ + @@ -109,6 +111,7 @@ + [% END %] @@ -119,6 +122,7 @@ + [% ELSE %] @@ -127,6 +131,7 @@ + [% END %] @@ -134,6 +139,7 @@
+
@@ -239,14 +245,14 @@ [% ISSUE.issuedate | html %] - [% IF ( newissues.match(ISSUE.barcode)) %] - NEW - [% END %] [% UNLESS ( noitemlinks ) %] [% ISSUE.title | html %] [% ELSE %] [% ISSUE.title | html %] [% END %] + [% IF ( newissues.match(ISSUE.barcode)) %] + NEW + [% END %] [% ISSUE.author | html %] ([% ISSUE.barcode | html %]) @@ -260,6 +266,7 @@
+ [% IF ISSUE.can_be_renewed %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 49018da307..841b59bb3f 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -176,6 +176,7 @@ elsif ( $patron and $op eq "checkout" ) { if ($confirmed) { #warn "renewing"; AddRenewal( $borrower->{borrowernumber}, $item->{itemnumber} ); + push @newissueslist, $barcode; } else { #warn "renew confirmation"; $template->param( @@ -215,10 +216,10 @@ 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( @@ -248,7 +249,6 @@ 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} || ''); -- 2.39.5