[open-ils-commits] [GIT] Evergreen ILS branch master updated. 66a470a28d133da13a60de76a56008aa1252adec
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 23 17:04:12 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 66a470a28d133da13a60de76a56008aa1252adec (commit)
via 2b914a999a4393d71bad38f4fcbf1b0a496cf6b2 (commit)
from a7a2c7037c1bc3c22b309b57963a4abe7c6d2ee0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 66a470a28d133da13a60de76a56008aa1252adec
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri Mar 23 17:03:47 2012 -0400
Stamped upgrade for 'allow fines during closings'
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e826a06..02d4aa8 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0691', :eg_version); -- senator/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0692', :eg_version); -- miker/berick
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql b/Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
similarity index 89%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
rename to Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
index e3989cd..e55ee2f 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
@@ -1,3 +1,6 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0693', :eg_version);
INSERT INTO config.org_unit_setting_type
(name, label, description, grp, datatype)
@@ -19,3 +22,4 @@ INSERT INTO config.org_unit_setting_type
'bool'
);
+COMMIT;
commit 2b914a999a4393d71bad38f4fcbf1b0a496cf6b2
Author: Mike Rylander <mrylander at gmail.com>
Date: Fri Mar 23 12:23:59 2012 -0400
Allow fines to accrue during closings
Evergreen skips fines during scheduled closings. With this commit, a new
Org Unit Setting labeled 'Charge fines on overdue circulations when closed'
is available to force fines to accrue during closures. Logic repiars and
out-of-scope (strict) variable repairs from Bill Erickson.
This work is sponsored by the NC Cardinal consortium in North Carolina.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index f6a4515..cc61ba4 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -14,6 +14,9 @@ use DateTime::Format::ISO8601;
use OpenILS::Utils::Penalty;
use POSIX qw(ceil);
use OpenILS::Application::Circ::CircCommon;
+use OpenILS::Application::AppUtils;
+my $U = "OpenILS::Application::AppUtils";
+
sub isTrue {
my $v = shift;
@@ -901,6 +904,10 @@ sub generate_fines {
my $recurring_fine = int($c->$recurring_fine_method * 100);
my $max_fine = int($c->max_fine * 100);
+ my $skip_closed_check = $U->ou_ancestor_setting_value(
+ $c->$circ_lib_method->to_fieldmapper->id, 'circ.fines.charge_when_closed');
+ $skip_closed_check = $U->is_true($skip_closed_check);
+
my ($latest_billing_ts, $latest_amount) = ('',0);
for (my $bill = 1; $bill <= $pending_fine_count; $bill++) {
@@ -921,22 +928,24 @@ sub generate_fines {
$current_bill_count--;
}
- my $dow = $billing_ts->day_of_week_0();
- my $dow_open = "dow_${dow}_open";
- my $dow_close = "dow_${dow}_close";
+ my $timestamptz = $billing_ts->strftime('%FT%T%z');
+ if (!$skip_closed_check) {
+ my $dow = $billing_ts->day_of_week_0();
+ my $dow_open = "dow_${dow}_open";
+ my $dow_close = "dow_${dow}_close";
- if (my $h = $hoo{$c->$circ_lib_method}) {
- next if ( $h->$dow_open eq '00:00:00' and $h->$dow_close eq '00:00:00');
+ if (my $h = $hoo{$c->$circ_lib_method}) {
+ next if ( $h->$dow_open eq '00:00:00' and $h->$dow_close eq '00:00:00');
+ }
+
+ my @cl = actor::org_unit::closed_date->search_where(
+ { close_start => { '<=' => $timestamptz },
+ close_end => { '>=' => $timestamptz },
+ org_unit => $c->$circ_lib_method }
+ );
+ next if (@cl);
}
- my $timestamptz = $billing_ts->strftime('%FT%T%z');
- my @cl = actor::org_unit::closed_date->search_where(
- { close_start => { '<=' => $timestamptz },
- close_end => { '>=' => $timestamptz },
- org_unit => $c->$circ_lib_method }
- );
- next if (@cl);
-
$current_fine_total += $recurring_fine;
$latest_amount += $recurring_fine;
$latest_billing_ts = $timestamptz;
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index bc3321f..aa98c2e 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -11409,6 +11409,26 @@ SELECT SETVAL('config.usr_activity_type_id_seq'::TEXT, 1000);
INSERT INTO config.org_unit_setting_type
(name, label, description, grp, datatype)
VALUES (
+ 'circ.fines.charge_when_closed',
+ oils_i18n_gettext(
+ 'circ.fines.charge_when_closed',
+ 'Charge fines on overdue circulations when closed',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'circ.fines.charge_when_closed',
+ 'Normally, fines are not charged when a library is closed. When set to True, fines will be charged during scheduled closings and normal weekly closed days.',
+ 'coust',
+ 'description'
+ ),
+ 'circ',
+ 'bool'
+ );
+
+INSERT INTO config.org_unit_setting_type
+ (name, label, description, grp, datatype)
+ VALUES (
'circ.patron.usr_activity_retrieve.max',
oils_i18n_gettext(
'circ.patron.usr_activity_retrieve.max',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
new file mode 100644
index 0000000..e3989cd
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
@@ -0,0 +1,21 @@
+
+INSERT INTO config.org_unit_setting_type
+ (name, label, description, grp, datatype)
+ VALUES (
+ 'circ.fines.charge_when_closed',
+ oils_i18n_gettext(
+ 'circ.fines.charge_when_closed',
+ 'Charge fines on overdue circulations when closed',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'circ.fines.charge_when_closed',
+ 'Normally, fines are not charged when a library is closed. When set to True, fines will be charged during scheduled closings and normal weekly closed days.',
+ 'coust',
+ 'description'
+ ),
+ 'circ',
+ 'bool'
+ );
+
-----------------------------------------------------------------------
Summary of changes:
.../Application/Storage/Publisher/action.pm | 35 ++++++++++++-------
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 20 +++++++++++
.../sql/Pg/upgrade/0692.data.fine-when-closed.sql | 25 ++++++++++++++
4 files changed, 68 insertions(+), 14 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list