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

(-)a/circ/circulation.pl (-1 / +4 lines)
Lines 148-156 my $force_allow_issue = $query->param('forceallow') || 0; Link Here
148
if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
148
if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
149
    $force_allow_issue = 0;
149
    $force_allow_issue = 0;
150
}
150
}
151
152
my $onsite_checkout = $query->param('onsite_checkout');
151
my $onsite_checkout = $query->param('onsite_checkout');
153
152
153
if (C4::Context->preference("OnSiteCheckoutAutoCheck") && $onsite_checkout eq "on") {
154
    $template->param(onsite_checkout => $onsite_checkout);
155
}
156
154
my @failedrenews = $query->multi_param('failedrenew');    # expected to be itemnumbers
157
my @failedrenews = $query->multi_param('failedrenew');    # expected to be itemnumbers
155
our %renew_failed = ();
158
our %renew_failed = ();
156
for (@failedrenews) { $renew_failed{$_} = 1; }
159
for (@failedrenews) { $renew_failed{$_} = 1; }
(-)a/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
4
    $dbh->do(qq{
5
        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
6
        ('OnSiteCheckoutAutoCheck','0','','onsite Checkout by default if last checkout was an onsite checkout box','YesNo')
7
    });
8
}
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 243-248 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
243
('RecordedBooksLibraryID','','','Library ID for RecordedBooks integration','Integer'),
243
('RecordedBooksLibraryID','','','Library ID for RecordedBooks integration','Integer'),
244
('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
244
('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
245
('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
245
('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
246
('OnSiteCheckoutAutoCheck','0','','onsite Checkout by default if last checkout was an onsite checkout box','YesNo'),
246
('INTRAdidyoumean','',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
247
('INTRAdidyoumean','',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
247
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
248
('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
248
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
249
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
Lines 160-165 Circulation: Link Here
160
160
161
    Checkout Policy:
161
    Checkout Policy:
162
        -
162
        -
163
            - pref: OnSiteCheckoutAutoCheck
164
              choices:
165
                  yes: Enable
166
                  no: Don't enable
167
            - onsite checkout by default if last checkout was an onsite one
168
        -
163
            - pref: AutoReturnCheckedOutItems
169
            - pref: AutoReturnCheckedOutItems
164
              choices:
170
              choices:
165
                  yes: Don't
171
                  yes: Don't
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +4 lines)
Lines 600-606 Link Here
600
                                                                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
600
                                                                    <input type="hidden" name="onsite_checkout" checked="checked" value="1" />
601
                                                                </div>
601
                                                                </div>
602
                                                            [% ELSE %]
602
                                                            [% ELSE %]
603
                                                                [% IF Koha.Preference('OnSiteCheckoutAutoCheck') && onsite_checkout == "on" %]
604
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" checked="checked" /> <label for="onsite_checkout">On-site checkout</label>
605
                                                                [% ELSE %]
603
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" /> <label for="onsite_checkout">On-site checkout</label>
606
                                                                <input type="checkbox" id="onsite_checkout" name="onsite_checkout" class="circ_setting" /> <label for="onsite_checkout">On-site checkout</label>
607
                                                                [% END %]
604
                                                            [% END %]
608
                                                            [% END %]
605
                                                        </div>
609
                                                        </div>
606
                                                    [% END %]
610
                                                    [% END %]
607
- 

Return to bug 23686