Bugzilla – Attachment 32214 Details for
Bug 10860
On-site checkouts (was In-House Use)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10860: wording: "in-house use" => "on-site checkout"
Bug-10860-wording-in-house-use--on-site-checkout.patch (text/plain), 29.11 KB, created by
Jonathan Druart
on 2014-10-10 21:04:02 UTC
(
hide
)
Description:
Bug 10860: wording: "in-house use" => "on-site checkout"
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-10-10 21:04:02 UTC
Size:
29.11 KB
patch
obsolete
>From a2b1564e96449a7f4a311b2b55b283ebc86059ac Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Wed, 17 Sep 2014 11:00:28 +0200 >Subject: [PATCH] Bug 10860: wording: "in-house use" => "on-site checkout" > >--- > C4/Circulation.pm | 10 ++++---- > C4/Items.pm | 6 ++--- > C4/Stats.pm | 2 +- > circ/circulation.pl | 10 ++++---- > installer/data/mysql/kohastructure.sql | 4 ++-- > installer/data/mysql/sysprefs.sql | 4 ++-- > installer/data/mysql/updatedatabase.pl | 10 ++++---- > .../intranet-tmpl/prog/en/css/staff-global.css | 8 +++---- > .../intranet-tmpl/prog/en/includes/strings.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 24 +++++++++---------- > .../intranet-tmpl/prog/en/js/pages/circulation.js | 6 ++--- > .../en/modules/admin/preferences/circulation.pref | 8 +++---- > .../prog/en/modules/catalogue/detail.tt | 4 ++-- > .../prog/en/modules/circ/circulation.tt | 27 +++++++++++----------- > .../prog/en/modules/members/readingrec.tt | 25 ++++++++++---------- > .../opac-tmpl/prog/en/includes/item-status.inc | 2 +- > .../prog/en/modules/opac-readingrecord.tt | 10 ++++---- > svc/checkouts | 4 ++-- > 18 files changed, 82 insertions(+), 84 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 5668622..f57bbe2 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1184,11 +1184,11 @@ AddIssue does the following things : > > sub AddIssue { > my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_; >- my $inhouse_use = $params->{inhouse_use}; >+ my $onsite_checkout = $params->{onsite_checkout}; > my $auto_renew = $params->{auto_renew}; > my $dbh = C4::Context->dbh; > my $barcodecheck=CheckValidBarcode($barcode); >- $inhouse_use = ( $inhouse_use ? 1 : 0 ); >+ $onsite_checkout = ( $onsite_checkout ? 1 : 0 ); > > if ($datedue && ref $datedue ne 'DateTime') { > $datedue = dt_from_string($datedue); >@@ -1263,7 +1263,7 @@ sub AddIssue { > my $sth = > $dbh->prepare( > "INSERT INTO issues >- (borrowernumber, itemnumber,issuedate, date_due, branchcode, inhouse_use, auto_renew) >+ (borrowernumber, itemnumber,issuedate, date_due, branchcode, onsite_checkout, auto_renew) > VALUES (?,?,?,?,?,?,?)" > ); > unless ($datedue) { >@@ -1279,7 +1279,7 @@ sub AddIssue { > $issuedate->strftime('%Y-%m-%d %H:%M:00'), # issuedate > $datedue->strftime('%Y-%m-%d %H:%M:00'), # date_due > C4::Context->userenv->{'branch'}, # branchcode >- $inhouse_use, >+ $onsite_checkout, > $auto_renew ? 1 : 0 # automatic renewal > ); > if ( C4::Context->preference('ReturnToShelvingCart') ) { ## ReturnToShelvingCart is on, anything issued should be taken off the cart. >@@ -1321,7 +1321,7 @@ sub AddIssue { > # Record the fact that this book was issued. > &UpdateStats({ > branch => C4::Context->userenv->{'branch'}, >- type => ( $inhouse_use ? 'inhouse_use' : 'issue' ), >+ type => ( $onsite_checkout ? 'onsite_checkout' : 'issue' ), > amount => $charge, > other => ($sipmode ? "SIP-$sipmode" : ''), > itemnumber => $item->{'itemnumber'}, >diff --git a/C4/Items.pm b/C4/Items.pm >index c52b892..5d2d398 100644 >--- a/C4/Items.pm >+++ b/C4/Items.pm >@@ -1285,8 +1285,8 @@ sub GetItemsInfo { > holding.opac_info as holding_branch_opac_info, > home.opac_info as home_branch_opac_info > "; >- $query .= ", issues.inhouse_use" >- if C4::Context->preference("In-House Use"); >+ $query .= ", issues.onsite_checkout" >+ if C4::Context->preference("On-site checkouts"); > $query .= " > FROM items > LEFT JOIN branches AS holding ON items.holdingbranch = holding.branchcode >@@ -1296,7 +1296,7 @@ sub GetItemsInfo { > LEFT JOIN itemtypes ON itemtypes.itemtype = " > . (C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype'); > $query .= " LEFT JOIN issues ON issues.itemnumber = items.itemnumber" >- if C4::Context->preference("In-House Use"); >+ if C4::Context->preference("On-site checkouts"); > $query .= " WHERE items.biblionumber = ? ORDER BY home.branchname, items.enumchron, LPAD( items.copynumber, 8, '0' ), items.dateaccessioned DESC" ; > my $sth = $dbh->prepare($query); > $sth->execute($biblionumber); >diff --git a/C4/Stats.pm b/C4/Stats.pm >index 250c48c..0e217fa 100644 >--- a/C4/Stats.pm >+++ b/C4/Stats.pm >@@ -87,7 +87,7 @@ sub UpdateStats { > return () if ! defined $params; > # change these arrays if new types of transaction or new parameters are allowed > my @allowed_keys = qw (type branch amount other itemnumber itemtype borrowernumber accountno ccode); >- my @allowed_circulation_types = qw (renew issue localuse return inhouse_use); >+ my @allowed_circulation_types = qw (renew issue localuse return onsite_checkout); > my @allowed_accounts_types = qw (writeoff payment); > my @circulation_mandatory_keys = qw (type branch borrowernumber itemnumber ccode itemtype); > my @accounts_mandatory_keys = qw (type branch borrowernumber amount); >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 6bd887d..99666cd 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -322,7 +322,7 @@ if ($barcode) { > } > } > >- unless( $query->param('inhouse_use') and C4::Context->preference("In-House Use Force") ) { >+ unless( $query->param('onsite_checkout') and C4::Context->preference("On-site checkouts Force") ) { > delete $question->{'DEBT'} if ($debt_confirmed); > foreach my $impossible ( keys %$error ) { > $template->param( >@@ -347,14 +347,14 @@ if ($barcode) { > getTitleMessageIteminfo => $getmessageiteminfo->{'title'}, > getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'}, > NEEDSCONFIRMATION => 1, >- inhouse_use => $query->param('inhouse_use'), >+ onsite_checkout => $query->param('onsite_checkout'), > ); > $confirm_required = 1; > } > } > unless($confirm_required) { >- my $inhouse_use = $query->param('inhouse_use'); >- AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { inhouse_use => $inhouse_use, auto_renew => $session->param('auto_renew') } ); >+ my $onsite_checkout = $query->param('onsite_checkout'); >+ AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew') } ); > $session->clear('auto_renew'); > $inprocess = 1; > } >@@ -586,8 +586,6 @@ $template->param( > canned_bor_notes_loop => $canned_notes, > debarments => GetDebarments({ borrowernumber => $borrowernumber }), > todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59), >- inhouse_use_feature => C4::Context->preference("In-House Use"), >- inhouse_use_forced => C4::Context->preference("In-House Use Force"), > ); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 5f2fe30..e888e34 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1126,7 +1126,7 @@ CREATE TABLE `issues` ( -- information related to check outs or issues > `auto_renew` BOOLEAN default FALSE, -- automatic renewal > `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched > `issuedate` datetime default NULL, -- date the item was checked out or issued >- `inhouse_use` int(1) NOT NULL default 0, -- in house use flag >+ `onsite_checkout` int(1) NOT NULL default 0, -- on-site checkout flag > KEY `issuesborridx` (`borrowernumber`), > KEY `itemnumber_idx` (`itemnumber`), > KEY `branchcode_idx` (`branchcode`), >@@ -1600,7 +1600,7 @@ CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r > `auto_renew` BOOLEAN default FALSE, -- automatic renewal > `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched > `issuedate` datetime default NULL, -- date the item was checked out or issued >- `inhouse_use` int(1) NOT NULL default 0, -- in house use flag >+ `onsite_checkout` int(1) NOT NULL default 0, -- On-site checkout flag > KEY `old_issuesborridx` (`borrowernumber`), > KEY `old_issuesitemidx` (`itemnumber`), > KEY `branchcode_idx` (`branchcode`), >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 1be2ac0..f7a1eee 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -146,8 +146,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('ImageLimit','5','','Limit images stored in the database by the Patron Card image manager to this number.','Integer'), > ('IncludeSeeFromInSearches','0','','Include see-from references in searches.','YesNo'), > ('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'), >-('In-House use','0','','Enable/Disable the in-house use feature','YesNo'), >-('In-House use Force','0','','Enable/Disable the in-house for all cases (Even if a user is debarred, etc.)','YesNo'), >+('On-site checkouts','0','','Enable/Disable the on-site checkouts feature','YesNo'), >+('On-site checkouts Force','0','','Enable/Disable the on-site checkouts for all cases (Even if a user is debarred, etc.)','YesNo'), > ('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'), > ('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'), > ('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'), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index ff36622..5e13c55 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8789,20 +8789,20 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > $dbh->do(q{ > INSERT IGNORE INTO systempreferences > (variable,value,explanation,options,type) >- VALUES('In-House use','0','Enable/Disable the in-house use feature','','YesNo'); >+ VALUES('On-site checkouts','0','Enable/Disable the on-site checkouts feature','','YesNo'); > }); > $dbh->do(q{ > INSERT IGNORE INTO systempreferences > (variable,value,explanation,options,type) >- VALUES('In-House use Force','0','Enable/Disable the in-house for all cases (Even if a user is debarred, etc.)','','YesNo'); >+ VALUES('On-site checkouts Force','0','Enable/Disable the on-site checkouts for all cases (Even if a user is debarred, etc.)','','YesNo'); > }); > $dbh->do(q{ >- ALTER TABLE issues ADD COLUMN inhouse_use INT(1) NOT NULL DEFAULT 0 AFTER issuedate; >+ ALTER TABLE issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate; > }); > $dbh->do(q{ >- ALTER TABLE old_issues ADD COLUMN inhouse_use INT(1) NOT NULL DEFAULT 0 AFTER issuedate; >+ ALTER TABLE old_issues ADD COLUMN onsite_checkout INT(1) NOT NULL DEFAULT 0 AFTER issuedate; > }); >- print "Upgrade to $DBversion done (Bug 10860: Add new system preference In-House use + fields [old_]issues.inhouse_use)\n"; >+ print "Upgrade to $DBversion done (Bug 10860: Add new system preference On-site checkouts + fields [old_]issues.onsite_checkout)\n"; > SetVersion($DBversion); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 90df94b..ac2f483 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -2714,16 +2714,16 @@ span.browse-button { > color : #FFF; > } > >-.inhouse_use-select { >+.onsite_checkout-select { > font-size : 85%; > font-weight: normal; > padding-top : .3em; > } >-#circ_circulation_issue .inhouse_use-select label, >-.inhouse_use-select label { >+#circ_circulation_issue .onsite_checkout-select label, >+.onsite_checkout-select label { > font-size : inherit; > font-weight: normal; > } >-span.inhouse_use { >+span.onsite_checkout { > color: red; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >index 7df5f20..103ea0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >@@ -26,6 +26,6 @@ > var NOT_TRANSFERRED_YET = _("Item hasn't been transferred yet from %s"); > var NO = _("No"); > var YES = _("Yes"); >- var INHOUSE_USE = _("In-house use"); >+ var ONSITE_CHECKOUT = _("On-site checkout"); > //]]> > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >index 49bab69..f24f943 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js >@@ -192,9 +192,9 @@ $(document).ready(function() { > title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>" > } > >- var inhouse_use = ''; >- if ( oObj.inhouse_use == 1 ) { >- inhouse_use += " <span class='inhouse_use'>("+INHOUSE_USE+")</span>"; >+ var onsite_checkout = ''; >+ if ( oObj.onsite_checkout == 1 ) { >+ onsite_checkout += " <span class='onsite_checkout'>("+ONSITE_CHECKOUT+")</span>"; > } > > title += " " >@@ -207,7 +207,7 @@ $(document).ready(function() { > + "'>" > + oObj.barcode > + "</a>" >- + inhouse_use; >+ + onsite_checkout; > > return title; > } >@@ -237,13 +237,13 @@ $(document).ready(function() { > > content += "<span>"; > >- if ( inhouse_use == 0 ) { >+ if ( oObj.onsite_checkout == 0 ) { > content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>"; > } > >- if ( oObj.can_renew && inhouse_use == 0 ) { >+ if ( oObj.can_renew && oObj.onsite_checkout == 0 ) { > // Do nothing >- } else if ( oObj.inhouse_use == 1 ) { >+ } else if ( oObj.onsite_checkout == 1 ) { > // If the issue is an in-house use, it is not renewable > content += "<span class='renewals-disabled'>" > + NOT_RENEWABLE >@@ -299,7 +299,7 @@ $(document).ready(function() { > + "<input type='checkbox' class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>" > + "</span>"; > >- if ( oObj.renewals_remaining && inhouse_use == 0 ) { >+ if ( oObj.renewals_remaining && oObj.onsite_checkout == 0 ) { > content += "<span class='renewals'>(" > + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) > + ")</span>"; >@@ -430,9 +430,9 @@ $(document).ready(function() { > title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>" > } > >- var inhouse_use = ''; >- if ( oObj.inhouse_use == 1 ) { >- inhouse_use += " <span class='inhouse_use'>("+INHOUSE_USE+")</span>"; >+ var onsite_checkout = ''; >+ if ( oObj.onsite_checkout == 1 ) { >+ onsite_checkout += " <span class='onsite_checkout'>("+ONSITE_CHECKOUT+")</span>"; > } > > title += " " >@@ -445,7 +445,7 @@ $(document).ready(function() { > + "'>" > + oObj.barcode > + "</a>" >- + inhouse_use; >+ + onsite_checkout; > > return title; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js >index e6ac3e8..8ab4d17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js >@@ -46,9 +46,9 @@ $(document).ready(function() { > return false; > }); > >- toggle_inhouse_use(); >- $("#inhouse_use").click(function(){ >- toggle_inhouse_use(); >+ toggle_onsite_checkout(); >+ $("#onsite_checkout").click(function(){ >+ toggle_onsite_checkout(); > }); > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 07c86c5..26994b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -384,17 +384,17 @@ Circulation: > - "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." > - Each pair of values should be on a separate line. > - >- - pref: In-House use >+ - pref: On-site checkouts > choices: > yes: Enable > no: Disable >- - the in-house use feature. >+ - the on-site checkouts feature. > - >- - pref: In-House use Force >+ - pref: On-site checkouts Force > choices: > yes: Enable > no: Disable >- - the in-house for all cases (Even if a user is debarred, etc.). >+ - the on-site checkouts for all cases (Even if a user is debarred, etc.). > Holds Policy: > - > - pref: AllowHoldPolicyOverride >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 68f2bcd..89607ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -586,13 +586,13 @@ function verify_images() { > <td class="status"> > > [% IF ( item.datedue ) %] >- [% IF inhouse_use %] >+ [% IF onsite_checkout %] > <span>Currently in local use > [% ELSE %] > <span class="datedue">Checked out > [% END %] > [% UNLESS ( item.NOTSAMEBRANCH ) %] >- [% IF inhouse_use %] >+ [% IF onsite_checkout %] > by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]"> > [% ELSE %] > to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index e463755..06cdbe6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,4 +1,5 @@ > [% USE Branches %] >+[% USE Koha %] > [% USE KohaDates %] > [% IF ( export_remove_fields OR export_with_csv_profile ) %] > [% SET exports_enabled = 1 %] >@@ -54,9 +55,9 @@ $(document).ready(function() { > [% END %] > }); > >-// In-house use >-function toggle_inhouse_use(){ >- if ( $("#inhouse_use").attr('checked') ) { >+// On-site checkouts >+function toggle_onsite_checkout(){ >+ if ( $("#onsite_checkout").attr('checked') ) { > $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1%]") > $("#duedatespec").datetimepicker('destroy'); > } else { >@@ -300,7 +301,7 @@ function toggle_inhouse_use(){ > [% ELSE %] > <input type="submit" class="approve" value="Yes, check out (Y)" accesskey="y" /> > [% END %] >- <input type="hidden" name="inhouse_use" value="[% inhouse_use %]" /> >+ <input type="hidden" name="onsite_checkout" value="[% onsite_checkout %]" /> > </form> > [% END %] > >@@ -479,7 +480,7 @@ No patron matched <span class="ex">[% message %]</span> > > [% IF ( borrowernumber ) %] > <div class="yui-g"> >-[% IF !noissues || inhouse_use_forced %] >+[% IF !noissues || Koha.Preference('On-site checkouts') %] > [% IF ( flagged ) %] > <div class="yui-u first"> > [% ELSE %] >@@ -527,13 +528,13 @@ No patron matched <span class="ex">[% message %]</span> > <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> > </div>[% END %] > >- [% IF inhouse_use_feature %] >- <div class="inhouse_use-select"> >+ [% IF Koha.Preference('On-site checkouts') %] >+ <div class="onsite_checkout-select"> > [% IF noissues %] >- <input type="checkbox" id="inhouse_use" name="inhouse_use_forced" checked="checked" disabled="disabled" /> <label for="inhouse_use">In-house use</label> >- <input type="hidden" name="inhouse_use" checked="checked" value="1" /> >+ <input type="checkbox" id="onsite_checkout" name="onsite_checkout_forced" checked="checked" disabled="disabled" /> <label for="onsite_checkout">On-site checkout</label> >+ <input type="hidden" name="onsite_checkout" checked="checked" value="1" /> > [% ELSE %] >- <input type="checkbox" id="inhouse_use" name="inhouse_use" /> <label for="inhouse_use">In-house use</label> >+ <input type="checkbox" id="onsite_checkout" name="onsite_checkout" /> <label for="onsite_checkout">On-site checkout</label> > [% END %] > </div> > [% END %] >@@ -553,7 +554,7 @@ No patron matched <span class="ex">[% message %]</span> > [% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %] > > [% IF flagged %] >- [% IF NOT noissues || ( noissues && inhouse_use_forced ) %] >+ [% IF NOT noissues || ( noissues && Koha.Preference('On-site checkouts') ) %] > <div id="circmessages" class="circmessage attention"> > [% ELSE %] > <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4> >@@ -562,8 +563,8 @@ No patron matched <span class="ex">[% message %]</span> > <h3> > [% IF noissues %] > Cannot check out! >- [% IF inhouse_use_forced %] >- <span style="color:red;">Only in-house use is allowed</span> >+ [% IF Koha.Preference('On-site checkouts') %] >+ <span style="color:red;">Only on-site checkouts is allowed</span> > [% END %] > [% ELSE %] > Attention: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index 8cd23ef..08a55ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -17,12 +17,12 @@ > ] > })); > var tabs = $("#tabs").tabs({ >- select: function(e, ui) { >- var id = $(ui.tab).attr("id"); >- if ( id == "tab_checkout" ) { >- table.fnFilter("checkout", 0); >- } else if ( id == "tab_inhouse_use" ) { >- table.fnFilter("inhouse_use", 0); >+ activate: function(e, ui) { >+ var index = $(ui.newTab).index(); >+ if ( index == 1 ) { >+ table.fnFilter("normal_checkout", 0); >+ } else if ( index == 2 ) { >+ table.fnFilter("onsite_checkout", 0); > } else { // all > table.fnFilter('', 0); > } >@@ -56,9 +56,9 @@ > > <div id="tabs" class="toptabs"> > <ul> >- <li><a href="#readingrec" id="tab_all">All</a></li> >- <li><a href="#readingrec" id="tab_checkout">Checkouts</a></li> >- <li><a href="#readingrec" id="tab_inhouse_use">In-house use</a></li> >+ <li><a href="#readingrec">All</a></li> >+ <li><a href="#readingrec">Checkouts</a></li> >+ <li><a href="#readingrec">On-site checkouts</a></li> > </ul> > <div id="readingrec" style="overflow:hidden"> > <table id="table_readingrec"> >@@ -79,10 +79,10 @@ > [% FOREACH issue IN loop_reading %] > [% IF issue.returndate %]<tr>[% ELSE %]<tr class="onissue">[% END %] > <td style="display:none;"> >- [% IF issue.inhouse_use %] >- inhouse_use >+ [% IF issue.onsite_checkout %] >+ onsite_checkout > [% ELSE %] >- checkout >+ normal_checkout > [% END %] > </td> > <td> >@@ -105,7 +105,6 @@ > <td> > <span title="[% issue.issuedate %]">[% issue.issuedate | $KohaDates %]</span></td> > </td> >- <td>[% issue.issuedate | $KohaDates %]</td> > <td>[% issue.issuingbranch %]</td> > <td> > [% IF issue.date_due %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc >index 852a7bc..27684cb 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc >@@ -19,7 +19,7 @@ not use an API to fetch items that populates item.datedue. > [% END %] > [% END %] > [% ELSIF ( item.datedue || issue.date_due ) %] >- [% IF inhouse_use %] >+ [% IF onsite_checkout %] > [% IF ( OPACShowCheckoutName ) %] > Currently in local use by [% item.cardnumber %] [% item.firstname %] [% item.surname %] > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >index 8359b44..480d495 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >@@ -22,8 +22,8 @@ $(document).ready(function(){ > var id = $(ui.tab).attr("id"); > if ( id == "tab_checkout" ) { > table.fnFilter("checkout", 0); >- } else if ( id == "tab_inhouse_use" ) { >- table.fnFilter("inhouse_use", 0); >+ } else if ( id == "tab_onsite_checkout" ) { >+ table.fnFilter("onsite_checkout", 0); > } else { // all > table.fnFilter('', 0); > } >@@ -65,7 +65,7 @@ You have never borrowed anything from this library. > <ul> > <li><a href="#tabs-container" id="tab_all">All</a></li> > <li><a href="#tabs-container" id="tab_checkout">Checkouts</a></li> >- <li><a href="#tabs-container" id="tab_inhouse_use">In-house use</a></li> >+ <li><a href="#tabs-container" id="tab_onsite_checkout">On-site checkouts</a></li> > </ul> > <div id="tabs-container" style="overflow:hidden"> > <table id="readingrec"> >@@ -86,8 +86,8 @@ You have never borrowed anything from this library. > [% FOREACH issue IN READING_RECORD %] > <tr> > <td style="display:none;"> >- [% IF issue.inhouse_use %] >- inhouse_use >+ [% IF issue.onsite_checkout %] >+ onsite_checkout > [% ELSE %] > checkout > [% END %] >diff --git a/svc/checkouts b/svc/checkouts >index dcd82e2..efebb03 100755 >--- a/svc/checkouts >+++ b/svc/checkouts >@@ -62,7 +62,7 @@ my $sql = ' > date_due, > date_due < now() as date_due_overdue, > >- inhouse_use, >+ onsite_checkout, > > biblionumber, > biblio.title, >@@ -152,7 +152,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { > issuedate => $c->{issuedate}, > date_due => $c->{date_due}, > date_due_overdue => $c->{date_due_overdue} ? JSON::true : JSON::false, >- inhouse_use => $c->{inhouse_use}, >+ onsite_checkout => $c->{onsite_checkout}, > renewals_count => $renewals_count, > renewals_allowed => $renewals_allowed, > renewals_remaining => $renewals_remaining, >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10860
:
20959
|
20960
|
20961
|
21195
|
21642
|
22461
|
26089
|
26114
|
26123
|
26185
|
26191
|
26192
|
31388
|
31507
|
31548
|
31664
|
31665
|
32213
|
32214
|
32216
|
32223
|
32579
|
32580
|
32581
|
32954
|
32979
|
32980
|
32981
|
32982
|
32983
|
32984
|
32997
|
32998
|
33031
|
33032
|
33033
|
33034
|
33035
|
33036
|
33037
|
33105
|
33106
|
33107
|
33108
|
33109
|
33110
|
33111
|
33163
|
33165