Attachment 28618 Details for Bug 10554 – Bug 10554 - Add more options to 'AllowSelfCheckReturns' syspref

[patch] Bug 10554 - Add more options to 'AllowSelfCheckReturns' syspref

Bug-10554---Add-more-options-to-AllowSelfCheckRetu.patch (text/plain), 9.11 KB, created by Jonathan Druart on 2014-06-02 14:53:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-06-02 14:53:05 UTC

Size: 9.11 KB

patch

obsolete

>From 50320cb9e1f602c2993e8d808c3e1517eab9c9ef Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Tue, 9 Jul 2013 13:48:08 +1200
>Subject: [PATCH] Bug 10554 - Add more options to 'AllowSelfCheckReturns'
> syspref
>
>This patch modifies the options of AllowSelfCheckReturns syspref
>
>from a 2 option selection
> - 'allow patrons', dont allow patrons'
>
>to a 3 option selection
> - 'allow all patrons', 'allow non-blocked patrons' , allow no patrons'
>
>currently, a problem with the syspref behavior in Koha is that enabling the 'AllowSelfCheckReturns' syspref does *not* allow patrons with a 'block' to return items via the SCO. (this is apparently by design, and not a bug)
>
>however, some libraries do want to allow patrons to return items via the SCO even if they have a 'block'
>
>this patch adds this additional behavior, by adding a new option to the syspref, but also retaining the existing syspref behavior
>
>after the patch, there are 2 allow options
> - 'Allow all' allows all patrons to return items (including blocked patrons)
> - 'Allow non-blocked' allows only non-blocked patrons to return items
>     (note: this is the current 'allow' behavior)
>
>the patch correctly 'upgrades' existing 'allow' selection to the new 'Allow non-blocked' value. so, any existing 'allow' selection works as before
>
>----------
>
>to test these 3 syspref options...
>
>1/
>- set syspref to 'dont allow'
>- issue an item to a patron
>- attempt to return item via SCO,  return should FAIL
>
>2/
>- set syspref to 'allow all'
>- issue an item to a patron
>- attempt to return item via SCO, return should SUCCEED
>
>3/
>- set syspref to 'allow nonblocked'
>- issue an item to a patron
>- attempt to return item via SCO, return should SUCCEED
>
>- issue an item to a patron, with a returndate of '2001-01-01'
>(important: this will create an overdue item, that will put a 'block' on this patron's account)
>- attempt to return item via SCO, return should FAIL
>
>Signed-off-by: Mason James <mtj@kohaaloha.com>
>
>Signed-off-by: Pierre Lorgue <pierre.lorgue@ens-cachan.fr>
>---
> installer/data/mysql/sysprefs.sql                  |  4 +++-
> installer/data/mysql/updatedatabase.pl             | 25 ++++++++++++++++++++++
> .../en/modules/admin/preferences/circulation.pref  |  5 +++--
> .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |  6 ++----
> opac/sco/sco-main.pl                               |  5 +++--
> 5 files changed, 36 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index aff00ab..04f4181 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -29,7 +29,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('AllowPurchaseSuggestionBranchChoice','0','1','Allow user to choose branch when making a purchase suggestion','YesNo'),
> ('AllowRenewalLimitOverride','0',NULL,'if ON, allows renewal limits to be overridden on the circulation screen','YesNo'),
> ('AllowReturnToBranch','anywhere','anywhere|homebranch|holdingbranch|homeorholdingbranch','Where an item may be returned','Choice'),
>-('AllowSelfCheckReturns','0','','If enabled, patrons may return items through the Web-based Self Checkout','YesNo'),
>+('AllowSelfCheckReturns','none','If enabled, patrons may return items through the Web-based Self Checkout','all|nonblocked|none','Choice');
> ('AllowTooManyOverride','1','','If on, allow staff to override and check out items when the patron has reached the maximum number of allowed checkouts','YesNo'),
> ('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z',NULL,'Alphabet than can be expanded into browse links, e.g. on Home > Patrons','free'),
> ('AlternateHoldingsField','',NULL,'The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).','free'),
>@@ -445,3 +445,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
> ('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
> ;
>+
>+installer/data/mysql/sysprefs.sql
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 01472d7..086ad78 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8551,6 +8551,31 @@ if (CheckVersion($DBversion)) {
>     SetVersion($DBversion);
> }
> 
>+$DBversion = "3.15.00.XXX";
>+if ( CheckVersion($DBversion) ) {
>+
>+    #get current value
>+    my $sth = $dbh->prepare("SELECT * from systempreferences where variable = 'AllowSelfCheckReturns'");
>+    $sth->execute;
>+    my $row = $sth->fetchrow_hashref;
>+    my $val = $row->{value};
>+    my $newval;
>+
>+    if ($val =~ /1/ ) {
>+        $newval =  'nonblocked';
>+    } else {
>+        $newval =  'none';
>+    }
>+
>+    # update syspref
>+    my $sth_update = $dbh->prepare("UPDATE systempreferences
>+     SET value=?, options='all|nonblocked|none', type='Choice' WHERE variable='AllowSelfCheckReturns'");
>+    $sth_update->execute($newval);
>+
>+    print "Upgrade to $DBversion done (added 'nonblocked' to AllowSelfCheckReturns syspref)\n";
>+    SetVersion ($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>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 81065f9..1a8ce7c 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
>@@ -593,8 +593,9 @@ Circulation:
>         -
>             - pref: AllowSelfCheckReturns
>               choices:
>-                  yes: Allow
>-                  no: "Don't allow"
>+                  all: "Allow all"
>+                  nonblocked: "Allow non-blocked"
>+                  none: "Don't allow"
>             - patrons to return items through web-based self checkout system. 
>         -
>             - "Include the following HTML in the Help page of the web-based self checkout system:"
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>index e117f25..1c75007 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>@@ -153,8 +153,7 @@ $(document).ready(function() {
>    [% END %]
>    Please see a member of the library staff.
> </p>
>-[% IF ( returnitem ) %]
>-[% IF ( AllowSelfCheckReturns ) %]
>+[% IF  (AllowSelfCheckReturns == 'nonblocked' and returnitem ) or AllowSelfCheckReturns  == 'all' %]
> <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
>     <input type="hidden" name="op" value="returnbook" />
>     <input type="hidden" name="patronid" value="[% patronid %]" />
>@@ -162,7 +161,6 @@ $(document).ready(function() {
>     <input type="submit" name="returnbook" value="Return this item" class="return" />
> </form>
> [% END %]
>-[% END %]
> <form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" class="inline" method="post">
>     <input type="hidden" name="op" value="" />
>     <input type="hidden" name="patronid" value="[% patronid %]" />
>@@ -175,7 +173,7 @@ $(document).ready(function() {
> <p>[% IF ( confirm_renew_issue ) %]This item is already checked out to you.[% END %]</p>
> 
> [% IF ( renew ) %]
>-[% IF ( AllowSelfCheckReturns ) %]
>+[% IF  (AllowSelfCheckReturns == 'nonblocked' or AllowSelfCheckReturns  == 'all') %]
>     <form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" class="inline" method="post">
>         <input type="hidden" name="op" value="returnbook" />
>         <input type="hidden" name="patronid" value="[% patronid %]" />
>diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
>index 14f74b5..75620ee 100755
>--- a/opac/sco/sco-main.pl
>+++ b/opac/sco/sco-main.pl
>@@ -83,7 +83,7 @@ if (C4::Context->preference('SelfCheckTimeout')) {
> $template->param(SelfCheckTimeout => $selfchecktimeout);
> 
> # Checks policy laid out by AllowSelfCheckReturns, defaults to 'on' if preference is undefined
>-my $allowselfcheckreturns = 1;
>+my $allowselfcheckreturns = 'nonblocked';
> if (defined C4::Context->preference('AllowSelfCheckReturns')) {
>     $allowselfcheckreturns = C4::Context->preference('AllowSelfCheckReturns');
> }
>@@ -124,7 +124,7 @@ my $return_only = 0;
> if ($op eq "logout") {
>     $query->param( patronid => undef, patronlogin => undef, patronpw => undef );
> }
>-elsif ( $op eq "returnbook" && $allowselfcheckreturns ) {
>+elsif ( $op eq "returnbook" && $allowselfcheckreturns =~ /nonblocked|all/) {
>     my ($doreturn) = AddReturn( $barcode, $branch );
>     #warn "returnbook: " . $doreturn;
>     $borrower = GetMemberDetails(undef,$patronid);
>@@ -156,6 +156,7 @@ elsif ( $op eq "checkout" ) {
>             "circ_error_$issue_error" => 1,
>             title                     => $item->{title},
>             hide_main                 => 1,
>+            barcode                   => $barcode,
>         );
>         if ($issue_error eq 'DEBT') {
>             $template->param(amount => $currencySymbol.$impossible->{DEBT});
>-- 
>2.0.0.rc2

Actions: View | Diff | Splinter Review

Attachments on bug 10554: 19495 | 21109 | 21221 | 28618 | 42267 | 42272