From cd082782d1b42765d2ef1094a7e52f792ae75980 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Sun, 11 Jun 2017 09:10:17 +0000 Subject: [PATCH] Bug 17171: Add a syspref to allow currently issued items to be issued to a new patron without staff confirmation Some libraries don't want to force the librarians to manually confirm each checkout when the item is checked out to another. Instead, they would prefer to be alerted after the fact. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Enable the new syspref AutoReturnCheckedOutItems 4) Check an item out to a patron 5) Check the same item out to another patron 6) Note you are not prompted to confirm the checkout, but are instead alerted that is had been checked out to another patron! Signed-off-by: Christopher Brannon Signed-off-by: BWS Sandboxes Signed-off-by: Katrin Fischer Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- C4/Circulation.pm | 4 ++ .../data/mysql/atomicupdate/bug_17171.perl | 10 +++ installer/data/mysql/sysprefs.sql | 1 + .../admin/preferences/circulation.pref | 6 ++ .../prog/en/modules/circ/circulation.tt | 4 ++ t/db_dependent/Circulation.t | 62 ++++++++++++++++++- 6 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_17171.perl diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 765f621410..832fc52916 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -886,11 +886,15 @@ sub CanBookBeIssued { $issuingimpossible{RETURN_IMPOSSIBLE} = 1; $issuingimpossible{branch_to_return} = $message; } else { + if ( C4::Context->preference('AutoReturnCheckedOutItems') ) { + $alerts{RETURNED_FROM_ANOTHER} = { patron => $patron }; + } else { $needsconfirmation{ISSUED_TO_ANOTHER} = 1; $needsconfirmation{issued_firstname} = $patron->firstname; $needsconfirmation{issued_surname} = $patron->surname; $needsconfirmation{issued_cardnumber} = $patron->cardnumber; $needsconfirmation{issued_borrowernumber} = $patron->borrowernumber; + } } } diff --git a/installer/data/mysql/atomicupdate/bug_17171.perl b/installer/data/mysql/atomicupdate/bug_17171.perl new file mode 100644 index 0000000000..c1a6fe3cf2 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_17171.perl @@ -0,0 +1,10 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES + ('AutoReturnCheckedOutItems', '0', '', 'If disabled, librarian must confirm return of checked out item when checking out to another.', 'YesNo'); + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17171 - Add a syspref to allow currently issued items to be issued to a new patron without staff confirmation)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 0b4a2e9396..91fee6f7ed 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -72,6 +72,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('autoMemberNum','0','','If ON, patron number is auto-calculated','YesNo'), ('AutoRemoveOverduesRestrictions','0',NULL,'Defines whether an OVERDUES debarment should be lifted automatically if all overdue items are returned by the patron.','YesNo'), ('AutoResumeSuspendedHolds','1',NULL,'Allow suspended holds to be automatically resumed by a set date.','YesNo'), +('AutoReturnCheckedOutItems', '0', '', 'If disabled, librarian must confirm return of checked out item when checking out to another.', 'YesNo'), ('AutoSelfCheckAllowed','0','','For corporate and special libraries which want web-based self-check available from any PC without the need for a manual staff login. Most libraries will want to leave this turned off. If on, requires self-check ID and password to be entered in AutoSelfCheckID and AutoSelfCheckPass sysprefs.','YesNo'), ('AutoSelfCheckID','','','Staff ID with circulation rights to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','free'), ('AutoSelfCheckPass','','','Password to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','free'), 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 05fa080eb8..1228077932 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 @@ -167,6 +167,12 @@ Circulation: - reconcile patron balances automatically on each transaction adding debits or credits. Checkout Policy: + - + - pref: AutoReturnCheckedOutItems + choices: + yes: Don't + no: Do + - require librarians to manually confirm a checkout where the item is already checked out to another patron. - - pref: AllowTooManyOverride choices: 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 309e51f033..3eeee7a034 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -74,6 +74,10 @@
High demand item. Loan period was not shortened due to override. Shortened due date would have been [% alert.HIGHHOLDS.returndate | $KohaDates %] ([% alert.HIGHHOLDS.duration | html %] days).
[% END %] +[% IF alert.RETURNED_FROM_ANOTHER %] +
Item was checked out to [% alert.RETURNED_FROM_ANOTHER.patron.firstname %] [% alert.RETURNED_FROM_ANOTHER.patron.surname %] ([% alert.RETURNED_FROM_ANOTHER.patron.cardnumber %]) and was returned automatically.
+[% END %] + [% IF ( nopermission ) %]
Staff members are not allowed to discharge borrowers, nor borrowers to request a discharge.
[% END %] diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index f3e5b1b94a..436578450e 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -18,7 +18,7 @@ use Modern::Perl; use utf8; -use Test::More tests => 127; +use Test::More tests => 128; use Test::MockModule; use Data::Dumper; @@ -106,6 +106,8 @@ my $borrower = { branchcode => $library2->{branchcode} }; +t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0); + # No userenv, PickupLibrary t::lib::Mocks::mock_preference('IndependentBranches', '0'); t::lib::Mocks::mock_preference('CircControl', 'PickupLibrary'); @@ -1917,6 +1919,64 @@ subtest 'AddReturn + suspension_chargeperiod' => sub { ); }; +subtest 'CanBookBeIssued + AutoReturnCheckedOutItems' => sub { + plan tests => 2; + + my $library = $builder->build( { source => 'Branch' } ); + my $patron1 = $builder->build_object( + { + class => 'Koha::Patrons', + value => { + branchcode => $library->{branchcode}, + firstname => "Happy", + surname => "Gilmore", + } + } + ); + my $patron2 = $builder->build_object( + { + class => 'Koha::Patrons', + value => { + branchcode => $library->{branchcode}, + firstname => "Billy", + surname => "Madison", + } + } + ); + + C4::Context->_new_userenv('xxx'); + C4::Context->set_userenv(0,0,0,'firstname','surname', $library->{branchcode}, 'Random Library', '', '', ''); + + my $biblioitem = $builder->build( { source => 'Biblioitem' } ); + my $biblionumber = $biblioitem->{biblionumber}; + my $item = $builder->build( + { source => 'Item', + value => { + homebranch => $library->{branchcode}, + holdingbranch => $library->{branchcode}, + notforloan => 0, + itemlost => 0, + withdrawn => 0, + biblionumber => $biblionumber, + } + } + ); + + my ( $error, $question, $alerts ); + my $issue = AddIssue( $patron1->unblessed, $item->{barcode} ); + + t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0); + ( $error, $question, $alerts ) = CanBookBeIssued( $patron2, $item->{barcode} ); + is( $question->{ISSUED_TO_ANOTHER}, 1, 'ISSUED_TO_ANOTHER question flag should be set if AutoReturnCheckedOutItems is disabled and item is checked out to another' ); + + t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 1); + ( $error, $question, $alerts ) = CanBookBeIssued( $patron2, $item->{barcode} ); + is( $alerts->{RETURNED_FROM_ANOTHER}->{patron}->borrowernumber, $patron1->borrowernumber, 'RETURNED_FROM_ANOTHER alert flag should be set if AutoReturnCheckedOutItems is enabled and item is checked out to another' ); + + t::lib::Mocks::mock_preference('AutoReturnCheckedOutItems', 0); +}; + + subtest 'AddReturn | is_overdue' => sub { plan tests => 5; -- 2.39.5