View | Details | Raw Unified | Return to bug 22322
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco-self.inc (-2 / +2 lines)
Lines 4-10 Link Here
4
    <div class="navbar navbar-inverse navbar-static-top navbar-black">
4
    <div class="navbar navbar-inverse navbar-static-top navbar-black">
5
        <div class="navbar-inner navbar-black">
5
        <div class="navbar-inner navbar-black">
6
            <div class="container-fluid navbar-black">
6
            <div class="container-fluid navbar-black">
7
                <a class="brand" href="/cgi-bin/koha/sco/sco-main.pl"><img src="[% interface %]/[% theme %]/images/koha-logo-navbar.png" alt=""></a>
7
                <a class="brand" href="/cgi-bin/koha/sco/sco-main.pl"><img src="[% interface | html %]/[% theme | html %]/images/koha-logo-navbar.png" alt=""></a>
8
                <div id="checkouthelp">
8
                <div id="checkouthelp">
9
                    <ul class="nav pull-right">
9
                    <ul class="nav pull-right">
10
                        <li><a href="/cgi-bin/koha/sco/help.pl"><i class="icon help"></i> Help</a></li>
10
                        <li><a href="/cgi-bin/koha/sco/help.pl"><i class="icon help"></i> Help</a></li>
Lines 28-34 Link Here
28
        <div class="container-fluid">
28
        <div class="container-fluid">
29
            <div class="row-fluid">
29
            <div class="row-fluid">
30
                <div id="opacheader">
30
                <div id="opacheader">
31
                   [% opacheader %]
31
                   [% opacheader | html %]
32
                </div>
32
                </div>
33
            </div>
33
            </div>
34
        </div>
34
        </div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-4 / +4 lines)
Lines 525-538 Link Here
525
                                        [% FOREACH INPUT IN INPUTS %]
525
                                        [% FOREACH INPUT IN INPUTS %]
526
                                        <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]">
526
                                        <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]">
527
                                        [% END %]
527
                                        [% END %]
528
                                        <input type="hidden" name="op" value="checkin" />
528
                                        <input type="hidden" name="op" value="cud-checkin" />
529
                                    </fieldset>
529
                                    </fieldset>
530
                                </form>
530
                                </form>
531
                            </div> <!-- / .sco_entry -->
531
                            </div> <!-- / .sco_entry -->
532
                        </div> <!-- / .row -->
532
                        </div> <!-- / .row -->
533
                        [% END # / IF validuser %]
533
                        [% END # / IF validuser %]
534
                    [% END # / UNLESS ( hide_main %]
534
                    [% END # / UNLESS ( hide_main %]
535
                    <b>[% checkinmessage %]</b>
535
                    <b>[% checkinmessage | html %]</b>
536
                    [% IF ( SCOMainUserBlock ) %]
536
                    [% IF ( SCOMainUserBlock ) %]
537
                        <div id="scomainuserblock">
537
                        <div id="scomainuserblock">
538
                            [% PROCESS koha_news_block news => SCOMainUserBlock %]
538
                            [% PROCESS koha_news_block news => SCOMainUserBlock %]
Lines 670-677 Link Here
670
                [% IF Koha.Preference('SelfCheckReceiptPrompt') %]
670
                [% IF Koha.Preference('SelfCheckReceiptPrompt') %]
671
                var confirmStart = Date.now();
671
                var confirmStart = Date.now();
672
                if(confirm(_("Would you like to print a receipt?"))){
672
                if(confirm(_("Would you like to print a receipt?"))){
673
                    if ( (Date.now() - confirmStart) < [% SelfCheckTimeout %] ) {
673
                    if ( (Date.now() - confirmStart) < [% SelfCheckTimeout | html %] ) {
674
                        window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber %]&amp;print=qslip");
674
                        window.open("/cgi-bin/koha/sco/printslip.pl?borrowernumber=[% borrowernumber | uri %]&amp;print=qslip");
675
                    }
675
                    }
676
                    else {
676
                    else {
677
                        alert(_("Timeout while waiting for print confirmation"));
677
                        alert(_("Timeout while waiting for print confirmation"));
(-)a/opac/sco/sco-main.pl (-2 / +1 lines)
Lines 127-133 my $daysmode = Koha::CirculationRules->get_effective_daysmode( Link Here
127
    }
127
    }
128
);
128
);
129
my $calendar    = Koha::Calendar->new( branchcode => $userenv_branch, days_mode => $daysmode );
129
my $calendar    = Koha::Calendar->new( branchcode => $userenv_branch, days_mode => $daysmode );
130
my $today       = DateTime->now( time_zone => C4::Context->tz());
130
my $today       = dt_from_string;
131
131
132
my $patronid = $jwt ? Koha::Token->new->decode_jwt({ token => $jwt }) : undef;
132
my $patronid = $jwt ? Koha::Token->new->decode_jwt({ token => $jwt }) : undef;
133
unless ( $patronid ) {
133
unless ( $patronid ) {
134
- 

Return to bug 22322