From a113966819d5623c029c7e5e58a9bbb3bc99248a Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 27 Jan 2017 03:37:31 +0000 Subject: [PATCH] Bug 12691: Use Koha.Preference in Self-Checkout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For calls to SCOUserJS, SCOUserCSS, OPACUserCSS, AllowSelfCheckReturns, OpacFavicon, ShowPatronImageInWebBasedSelfCheck, SelfCheckoutByLogin Sponsored-by: Catalyst IT Signed-off-by: Katrin Fischer Signed-off-by: Marc Véron Signed-off-by: Nick Clemens Bug 12691: [FOLLOW-UP] Follow-up patch This patch fixes merge conflicts and fixes the problems in Comment 7 QA tools complain about missing bracket, will be fixed in next followup Signed-off-by: Marc Véron Signed-off-by: Nick Clemens Bug 12691: [FOLLOW-UP] Missing bracket Patch adds bracket to template file (Comment 16) Signed-off-by: Marc Véron Signed-off-by: Nick Clemens Bug 12691: [FOLLOW-UP] Fixing some logic Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Patches have been squashed for readability and 1 removal occurrence of display_patron_image has been reintroduced. --- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 20 ++++++++++---------- opac/sco/sco-main.pl | 15 +-------------- 2 files changed, 11 insertions(+), 24 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 f7fae7bb54..7357d896cc 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 @@ -5,12 +5,12 @@ [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout - + -[% IF ( OPACUserCSS ) %][% END %] -[% IF ( SCOUserCSS ) %][% END %] +[% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] +[% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] @@ -76,7 +76,7 @@ Please see a member of the library staff.

- [% IF ( returnitem && AllowSelfCheckReturns ) %] + [% IF ( returnitem && Koha.Preference('AllowSelfCheckReturns') ) %]
@@ -100,7 +100,7 @@

This item is already checked out to you.

[% END %] - [% IF ( renew && AllowSelfCheckReturns ) %] + [% IF ( renew && Koha.Preference('AllowSelfCheckReturns') ) %] @@ -184,7 +184,7 @@
- Check out[% IF ( AllowSelfCheckReturns ) %], return[% END %] or renew an item: + Check out[% IF ( Koha.Preference('AllowSelfCheckReturns') ) %], return[% END %] or renew an item:
@@ -269,7 +269,7 @@ [% ELSE %] No renewals allowed [% END %] - [% IF AllowSelfCheckReturns %] + [% IF Koha.Preference('AllowSelfCheckReturns') %] @@ -294,7 +294,7 @@
- [% IF ( authbylogin ) %] + [% IF ( Koha.Preference('SelfCheckoutByLogin') ) %] Log in to your account @@ -309,7 +309,7 @@
- [% END # / IF authbylogin %] + [% END %] [% FOREACH INPUT IN INPUTS %] @@ -418,5 +418,5 @@ //]]> - [% IF ( SCOUserJS ) %][% END %] + [% IF ( Koha.Preference('SCOUserJS') ) %][% END %] [% END %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 4020e2713c..d6e4176170 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -76,25 +76,18 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({ debug => 1, }); -if (C4::Context->preference('SelfCheckoutByLogin')) -{ - $template->param(authbylogin => 1); -} - # Get the self checkout timeout preference, or use 120 seconds as a default my $selfchecktimeout = 120000; if (C4::Context->preference('SelfCheckTimeout')) { $selfchecktimeout = C4::Context->preference('SelfCheckTimeout') * 1000; } -$template->param(SelfCheckTimeout => $selfchecktimeout); +$template->param( SelfCheckTimeout => $selfchecktimeout ); # Checks policy laid out by AllowSelfCheckReturns, defaults to 'on' if preference is undefined my $allowselfcheckreturns = 1; if (defined C4::Context->preference('AllowSelfCheckReturns')) { $allowselfcheckreturns = C4::Context->preference('AllowSelfCheckReturns'); } -$template->param(AllowSelfCheckReturns => $allowselfcheckreturns); - my $issuerid = $loggedinuser; my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed) = ( @@ -304,7 +297,6 @@ if ($borrower) { my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); $template->param( display_patron_image => 1, - cardnumber => $borrower->{cardnumber}, csrf_token => Koha::Token->new->generate_csrf( { session_id => scalar $query->cookie('CGISESSID') . $borrower->{cardnumber}, id => $borrower->{userid}} ), ) if $patron_image; } @@ -315,9 +307,4 @@ if ($borrower) { ); } -$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 }; -- 2.11.0