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

(-)a/C4/Items.pm (-2 / +2 lines)
Lines 1301-1307 sub GetItemsInfo { Link Here
1301
           home.opac_info as home_branch_opac_info
1301
           home.opac_info as home_branch_opac_info
1302
    ";
1302
    ";
1303
    $query .= ", issues.onsite_checkout"
1303
    $query .= ", issues.onsite_checkout"
1304
        if C4::Context->preference("On-site checkouts");
1304
        if C4::Context->preference("OnSiteCheckouts");
1305
    $query .= "
1305
    $query .= "
1306
     FROM items
1306
     FROM items
1307
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
1307
     LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode
Lines 1311-1317 sub GetItemsInfo { Link Here
1311
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
1311
     LEFT JOIN itemtypes   ON   itemtypes.itemtype         = "
1312
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
1312
     . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype');
1313
    $query .= " LEFT JOIN issues ON issues.itemnumber = items.itemnumber"
1313
    $query .= " LEFT JOIN issues ON issues.itemnumber = items.itemnumber"
1314
        if C4::Context->preference("On-site checkouts");
1314
        if C4::Context->preference("OnSiteCheckouts");
1315
    $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname, items.enumchron, LPAD( items.copynumber, 8, '0' ), items.dateaccessioned DESC" ;
1315
    $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname, items.enumchron, LPAD( items.copynumber, 8, '0' ), items.dateaccessioned DESC" ;
1316
    my $sth = $dbh->prepare($query);
1316
    my $sth = $dbh->prepare($query);
1317
    $sth->execute($biblionumber);
1317
    $sth->execute($biblionumber);
(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 322-328 if ($barcode) { Link Here
322
        }
322
        }
323
    }
323
    }
324
324
325
    unless( $query->param('onsite_checkout') and C4::Context->preference("On-site checkouts Force") ) {
325
    unless( $query->param('onsite_checkout') and C4::Context->preference("OnSiteCheckoutsForce") ) {
326
        delete $question->{'DEBT'} if ($debt_confirmed);
326
        delete $question->{'DEBT'} if ($debt_confirmed);
327
        foreach my $impossible ( keys %$error ) {
327
        foreach my $impossible ( keys %$error ) {
328
            $template->param(
328
            $template->param(
(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 147-154 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
147
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
147
('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'),
148
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
148
('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'),
149
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
149
('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
150
('On-site checkouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
150
('OnSiteCheckouts','0','','Enable/Disable the on-site checkouts feature','YesNo'),
151
('On-site checkouts Force','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
151
('OnSiteCheckoutsForce','0','','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','YesNo'),
152
('InProcessingToShelvingCart','0','','If set, when any item with a location code of PROC is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
152
('InProcessingToShelvingCart','0','','If set, when any item with a location code of PROC is \'checked in\', it\'s location code will be changed to CART.','YesNo'),
153
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
153
('INTRAdidyoumean',NULL,NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
154
('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'),
154
('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'),
(-)a/installer/data/mysql/updatedatabase.pl (-3 / +3 lines)
Lines 8957-8968 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
8957
    $dbh->do(q{
8957
    $dbh->do(q{
8958
        INSERT IGNORE INTO systempreferences
8958
        INSERT IGNORE INTO systempreferences
8959
            (variable,value,explanation,options,type)
8959
            (variable,value,explanation,options,type)
8960
            VALUES('On-site checkouts','0','Enable/Disable the on-site checkouts feature','','YesNo');
8960
            VALUES('OnSiteCheckouts','0','Enable/Disable the on-site checkouts feature','','YesNo');
8961
    });
8961
    });
8962
    $dbh->do(q{
8962
    $dbh->do(q{
8963
        INSERT IGNORE INTO systempreferences
8963
        INSERT IGNORE INTO systempreferences
8964
            (variable,value,explanation,options,type)
8964
            (variable,value,explanation,options,type)
8965
            VALUES('On-site checkouts Force','0','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','','YesNo');
8965
            VALUES('OnSiteCheckoutsForce','0','Enable/Disable the on-site for all cases (Even if a user is debarred, etc.)','','YesNo');
8966
    });
8966
    });
8967
    $dbh->do(q{
8967
    $dbh->do(q{
8968
        ALTER TABLE issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
8968
        ALTER TABLE issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
Lines 8970-8976 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
8970
    $dbh->do(q{
8970
    $dbh->do(q{
8971
        ALTER TABLE old_issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
8971
        ALTER TABLE old_issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate;
8972
    });
8972
    });
8973
    print "Upgrade to $DBversion done (Bug 10860: Add new system preference On-site checkouts + fields [old_]issues.onsite_checkout)\n";
8973
    print "Upgrade to $DBversion done (Bug 10860: Add new system preference OnSiteCheckouts + fields [old_]issues.onsite_checkout)\n";
8974
    SetVersion($DBversion);
8974
    SetVersion($DBversion);
8975
}
8975
}
8976
8976
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-2 / +2 lines)
Lines 384-396 Circulation: Link Here
384
            - "it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
384
            - "it will be updated to the right-hand value. E.g. '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
385
            - Each pair of values should be on a separate line.
385
            - Each pair of values should be on a separate line.
386
        -
386
        -
387
            - pref: On-site checkouts
387
            - pref: OnSiteCheckouts
388
              choices:
388
              choices:
389
                  yes: Enable
389
                  yes: Enable
390
                  no: Disable
390
                  no: Disable
391
            - the on-site checkouts feature.
391
            - the on-site checkouts feature.
392
        -
392
        -
393
            - pref: On-site checkouts Force
393
            - pref: OnSiteCheckoutsForce
394
              choices:
394
              choices:
395
                  yes: Enable
395
                  yes: Enable
396
                  no: Disable
396
                  no: Disable
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 533-539 No patron matched <span class="ex">[% message %]</span> Link Here
533
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
533
          <button class="btn btn-small action" id="cleardate" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" >Clear</button>
534
</div>[% END %]
534
</div>[% END %]
535
535
536
      [% IF Koha.Preference('On-site checkouts') %]
536
      [% IF Koha.Preference('OnSiteCheckouts') %]
537
        <div class="onsite_checkout-select">
537
        <div class="onsite_checkout-select">
538
          [% IF noissues %]
538
          [% IF noissues %]
539
            <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label>
539
            <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-2 / +1 lines)
Lines 56-62 Link Here
56
56
57
57
58
<div id="tabs" class="toptabs">
58
<div id="tabs" class="toptabs">
59
  [% IF Koha.Preference('On-site checkouts') %]
59
  [% IF Koha.Preference('OnSiteCheckouts') %]
60
  <ul>
60
  <ul>
61
    <li><a href="#readingrec" id="tab_all">All</a></li>
61
    <li><a href="#readingrec" id="tab_all">All</a></li>
62
    <li><a href="#readingrec" id="tab_checkout">Checkouts</a></li>
62
    <li><a href="#readingrec" id="tab_checkout">Checkouts</a></li>
63
- 

Return to bug 10860