Attachment 15096 Details for Bug 8735 – Bug 8735 - Expire holds waiting only on days the library is open

[patch] Bug 8735 - Expire holds waiting only on days the library is open

Bug-8735---Expire-holds-waiting-only-on-days-the-l.patch (text/plain), 5.98 KB, created by Kyle M Hall (khall) on 2013-02-06 13:55:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2013-02-06 13:55:51 UTC

Size: 5.98 KB

patch

obsolete

>From f1b5279e0dec7474df7ccc7b04dcc7e4cb497572 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 6 Sep 2012 11:15:21 -0400
>Subject: [PATCH] Bug 8735 - Expire holds waiting only on days the library is open
>
>---
> C4/Reserves.pm                                     |   24 ++++++++++++++++---
> installer/data/mysql/sysprefs.sql                  |    4 +++
> installer/data/mysql/updatedatabase.pl             |    9 ++++++-
> .../en/modules/admin/preferences/circulation.pref  |    6 +++++
> 4 files changed, 38 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index a380bf0..3d26cd9 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -36,6 +36,7 @@ use C4::Members qw();
> use C4::Letters;
> use C4::Branch qw( GetBranchDetail );
> use C4::Dates qw( format_date_in_iso );
>+use C4::Calendar;
> 
> use Koha::DateUtils;
> 
>@@ -887,17 +888,32 @@ sub CancelExpiredReserves {
>     if ( C4::Context->preference("ExpireReservesMaxPickUpDelay") ) {
>         my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
>         my $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
>+        my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
>+
>+        my $today = C4::Dates->new();
> 
>         my $query = "SELECT * FROM reserves WHERE TO_DAYS( NOW() ) - TO_DAYS( waitingdate ) > ? AND found = 'W' AND priority = 0";
>         $sth = $dbh->prepare( $query );
>         $sth->execute( $max_pickup_delay );
> 
>-        while (my $res = $sth->fetchrow_hashref ) {
>-            if ( $charge ) {
>-                manualinvoice($res->{'borrowernumber'}, $res->{'itemnumber'}, 'Hold waiting too long', 'F', $charge);
>+        while ( my $res = $sth->fetchrow_hashref ) {
>+            my $do_cancel = 1;
>+            unless ( $cancel_on_holidays ) {
>+                my $calendar = C4::Calendar->new( branchcode => $res->{'branchcode'} );
>+                my $is_holiday = $calendar->isHoliday( split( '/', $today->output('metric') ) );
>+
>+                if ( $is_holiday ) {
>+                    $do_cancel = 0;
>+                }
>             }
> 
>-            CancelReserve( $res->{'biblionumber'}, '', $res->{'borrowernumber'} );
>+            if ( $do_cancel ) {
>+                if ( $charge ) {
>+                    manualinvoice($res->{'borrowernumber'}, $res->{'itemnumber'}, 'Hold waiting too long', 'F', $charge);
>+                }
>+
>+                CancelReserve( $res->{'biblionumber'}, '', $res->{'borrowernumber'} );
>+            }
>         }
>     }
> 
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index d5d15d7..a3d7be5 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -406,3 +406,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('NotesBlacklist','','List of notes fields that should not appear in the title notes/description separator of details',NULL,'free');
> INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
> INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');
>+INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReviews','0','Display book review snippets from IDreamBooks.com','','YesNo');
>+INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReadometer','0','Display Readometer from IDreamBooks.com','','YesNo');
>+INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksResults','0','Display IDreamBooks.com rating in search results','','YesNo');
>+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesOnHolidays', '1', NULL, 'If false, reserves at a library will not be canceled on days the library is not open.', 'YesNo');
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 77265f4..6bbe803 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -6038,7 +6038,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
>     $sth->execute( $new_syspref_value );
> 
>     print "Upgrade to $DBversion done (Bug 8832, Set the syspref gist with the existing values)\n";
>-    SetVersion ($DBversion);
>+   SetVersion ($DBversion);
> }
> 
> $DBversion = "3.09.00.064";
>@@ -6339,6 +6339,13 @@ if ( CheckVersion($DBversion) ) {
>    SetVersion ($DBversion);
> }
> 
>+$DBversion ="3.11.00.XXX";
>+if(C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>+    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesOnHolidays', '1', NULL, 'If false, reserves at a library will not be canceled on days the library is not open.', 'YesNo')");
>+    print "Upgrade to $DBversion done (Add syspref ExpireReservesOnHolidays\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 645b19b..bb6cb10 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
>@@ -430,6 +430,12 @@ Circulation:
>                   no: "Don't allow"
>             - holds to be suspended from the OPAC.
>         -
>+            - pref: ExpireReservesOnHolidays
>+              choices:
>+                  yes: Allow
>+                  no: "Don't allow"
>+            - expired holds to be canceled on days the library is closed..
>+        -
>             - pref: decreaseLoanHighHolds
>               choices:
>                   yes: Enable
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 8735: 12019 | 12020 | 13364 | 13365 | 15074 | 15075 | 15096 | 15097 | 15098 | 16508 | 17625 | 17892 | 17893 | 24598 | 24599 | 24898 | 24899 | 27268 | 28660 | 28661 | 28662 | 28663 | 30395 | 30396 | 30397 | 30398 | 30399 | 30400 | 30401 | 30402