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

(-)a/C4/UsageStats.pm (-1 / +1 lines)
Lines 198-204 sub BuildReport { Link Here
198
        UpdateTotalIssuesOnCirc
198
        UpdateTotalIssuesOnCirc
199
        UseTablesortForCirc
199
        UseTablesortForCirc
200
        WaitingNotifyAtCheckin
200
        WaitingNotifyAtCheckin
201
        AllowSelfCheckReturns
201
        SCOAllowCheckin
202
        AutoSelfCheckAllowed
202
        AutoSelfCheckAllowed
203
        FRBRizeEditions
203
        FRBRizeEditions
204
        OPACFRBRizeEditions
204
        OPACFRBRizeEditions
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-4 / +4 lines)
Lines 86-92 Link Here
86
                                Please see a member of the library staff.
86
                                Please see a member of the library staff.
87
                            </p>
87
                            </p>
88
88
89
                            [% IF ( returnitem && Koha.Preference('AllowSelfCheckReturns') ) %]
89
                            [% IF ( returnitem && Koha.Preference('SCOAllowCheckin') ) %]
90
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
90
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
91
                                    <input type="hidden" name="op" value="returnbook" />
91
                                    <input type="hidden" name="op" value="returnbook" />
92
                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
92
                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
Lines 113-119 Link Here
113
                                <p>This item is already checked out to you.</p>
113
                                <p>This item is already checked out to you.</p>
114
                            [% END %]
114
                            [% END %]
115
115
116
                            [% IF ( renew && Koha.Preference('AllowSelfCheckReturns') ) %]
116
                            [% IF ( renew && Koha.Preference('SCOAllowCheckin') ) %]
117
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
117
                                <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
118
                                    <input type="hidden" name="op" value="returnbook" />
118
                                    <input type="hidden" name="op" value="returnbook" />
119
                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
119
                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
Lines 226-232 Link Here
226
                            <div id="newcheckout" class="sco_entry">
226
                            <div id="newcheckout" class="sco_entry">
227
                                <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid | html %]');">
227
                                <form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit="return checkout_confirm('[% patronid | html %]');">
228
                                    <fieldset>
228
                                    <fieldset>
229
                                        <legend>Check out[% IF ( Koha.Preference('AllowSelfCheckReturns') ) %], return[% END %] or renew an item: </legend>
229
                                        <legend>Check out[% IF ( Koha.Preference('SCOAllowCheckin') ) %], return[% END %] or renew an item: </legend>
230
                                        <div class="input-append">
230
                                        <div class="input-append">
231
                                            <label for="barcode">Scan a new item or enter its barcode:</label>
231
                                            <label for="barcode">Scan a new item or enter its barcode:</label>
232
                                            <input id="barcode" name="barcode" size="20" type="text" class="focus" autocomplete="off" />
232
                                            <input id="barcode" name="barcode" size="20" type="text" class="focus" autocomplete="off" />
Lines 331-337 Link Here
331
                                                                        [% ELSE %]
331
                                                                        [% ELSE %]
332
                                                                            <span>No renewals allowed</span>
332
                                                                            <span>No renewals allowed</span>
333
                                                                        [% END %]
333
                                                                        [% END %]
334
                                                                        [% IF Koha.Preference('AllowSelfCheckReturns') %]
334
                                                                        [% IF Koha.Preference('SCOAllowCheckin') %]
335
                                                                            <input type="submit" value="Check in item" name="confirm" class="btn return" />
335
                                                                            <input type="submit" value="Check in item" name="confirm" class="btn return" />
336
                                                                            <input type="hidden" name="op" value="returnbook" />
336
                                                                            <input type="hidden" name="op" value="returnbook" />
337
                                                                            <input type="hidden" name="confirmed" value=""  />
337
                                                                            <input type="hidden" name="confirmed" value=""  />
(-)a/opac/sco/sco-main.pl (-3 / +3 lines)
Lines 93-102 if (C4::Context->preference('SelfCheckTimeout')) { Link Here
93
}
93
}
94
$template->param( SelfCheckTimeout => $selfchecktimeout );
94
$template->param( SelfCheckTimeout => $selfchecktimeout );
95
95
96
# Checks policy laid out by AllowSelfCheckReturns, defaults to 'on' if preference is undefined
96
# Checks policy laid out by SCOAllowCheckin, defaults to 'on' if preference is undefined
97
my $allowselfcheckreturns = 1;
97
my $allowselfcheckreturns = 1;
98
if (defined C4::Context->preference('AllowSelfCheckReturns')) {
98
if (defined C4::Context->preference('SCOAllowCheckin')) {
99
    $allowselfcheckreturns = C4::Context->preference('AllowSelfCheckReturns');
99
    $allowselfcheckreturns = C4::Context->preference('SCOAllowCheckin');
100
}
100
}
101
101
102
my $issuerid = $loggedinuser;
102
my $issuerid = $loggedinuser;
(-)a/t/db_dependent/UsageStats.t (-2 / +1 lines)
Lines 459-465 sub mocking_systempreferences_to_a_set_value { Link Here
459
        UpdateTotalIssuesOnCirc
459
        UpdateTotalIssuesOnCirc
460
        UseTablesortForCirc
460
        UseTablesortForCirc
461
        WaitingNotifyAtCheckin
461
        WaitingNotifyAtCheckin
462
        AllowSelfCheckReturns
462
        SCOAllowCheckin
463
        AutoSelfCheckAllowed
463
        AutoSelfCheckAllowed
464
        FRBRizeEditions
464
        FRBRizeEditions
465
        OPACFRBRizeEditions
465
        OPACFRBRizeEditions
466
- 

Return to bug 25147