Bugzilla – Attachment 13364 Details for
Bug 8735
Expire holds waiting only on days the library is open
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[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.54 KB, created by
Kyle M Hall (khall)
on 2012-11-09 17:26:20 UTC
(
hide
)
Description:
Bug 8735 - Expire holds waiting only on days the library is open
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2012-11-09 17:26:20 UTC
Size:
5.54 KB
patch
obsolete
>From ed9c534568aa3f2f8607ef5a9c55e51ff02c643d 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 >Content-Type: text/plain; charset="utf-8" > >--- > C4/Reserves.pm | 23 ++++++++++++++++--- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 8 +++++++ > .../en/modules/admin/preferences/circulation.pref | 6 +++++ > 4 files changed, 34 insertions(+), 4 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 1dc6f72..1042d82 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -887,17 +887,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 a4e4102..7aa3cc2 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -386,3 +386,4 @@ INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy > INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'); > INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer'); >+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 3ee79b3..e52ccc2 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -5769,6 +5769,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > >+<<<<<<< HEAD > $DBversion = '3.09.00.044'; > if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower"); >@@ -6038,6 +6039,13 @@ 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); >+} >+ >+$DBversion ="3.09.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); > } > >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 c583bbe..eae95ee 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 >@@ -424,6 +424,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
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 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