@@ -, +, @@
- Add missing filters
- Use dt_from_string instead of DateTime->now in sco-main.pl
---
.../opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc | 4 ++--
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 +++---
opac/sco/sco-main.pl | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc
@@ -4,7 +4,7 @@
-
+
- Help
@@ -28,7 +28,7 @@
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -483,7 +483,7 @@
[% END # / IF validuser %]
[% END # / UNLESS ( hide_main %]
-
[% checkinmessage %]
+
[% checkinmessage | html %]
[% IF ( Koha.Preference('SCOMainUserBlock' ) ) %]
[% Koha.Preference('SCOMainUserBlock' ) | $raw %]
[% END %]
@@ -587,8 +587,8 @@
[% IF Koha.Preference('SelfCheckReceiptPrompt') %]
var confirmStart = Date.now();
if(confirm(_("Would you like to print a receipt?"))){
- if ( (Date.now() - confirmStart) < [% SelfCheckTimeout %] ) {
- window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&print=qslip");
+ if ( (Date.now() - confirmStart) < [% SelfCheckTimeout | html %] ) {
+ window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | uri %]&print=qslip");
}
else {
alert(_("Timeout while waiting for print confirmation"));
--- a/opac/sco/sco-main.pl
+++ a/opac/sco/sco-main.pl
@@ -132,7 +132,7 @@ my $daysmode = Koha::CirculationRules->get_effective_daysmode(
}
);
my $calendar = Koha::Calendar->new( branchcode => $userenv_branch, days_mode => $daysmode );
-my $today = DateTime->now( time_zone => C4::Context->tz());
+my $today = dt_from_string;
my $patronid = $jwt ? Koha::Token->new->decode_jwt({ token => $jwt }) : undef;
unless ( $patronid ) {
--