[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. d36620734f4f1ab10b70f48d4beef34fad18d36b
Evergreen Git
git at git.evergreen-ils.org
Thu Jun 13 17:56:47 EDT 2019
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, rel_3_1 has been updated
via d36620734f4f1ab10b70f48d4beef34fad18d36b (commit)
via 7f7c1291edb75c8e596eacf1c35eb5c46c684f21 (commit)
via 10eea7f19e457cc9e35ea2b0bc1db58944209d5a (commit)
from cf5c12e442e043cc2d25c8d6345917e00e348e91 (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 d36620734f4f1ab10b70f48d4beef34fad18d36b
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Thu Jun 13 13:57:14 2019 -0700
LP1759343: Stamping upgrade: annotate payment setting
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 5327949f13..668e4a0163 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1157', :eg_version); -- berick/sandbergja/Dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1167', :eg_version); -- JBoyer/terran/sandbergja
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql b/Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
similarity index 72%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
rename to Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
index ed749c986c..67897181b4 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1167', :eg_version);
INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
commit 7f7c1291edb75c8e596eacf1c35eb5c46c684f21
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Thu Jun 13 11:33:20 2019 -0700
LP1759343 (follow-up): Add bill annotation setting to seed data
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
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 a3d2412de2..f1b05e9ac7 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -18348,3 +18348,25 @@ VALUES (
oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
);
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'catalog.record.holds.prefetch', 'cat', 'bool',
+ oils_i18n_gettext(
+ 'catalog.record.holds.prefetch',
+ 'Pre-Fetch Record Holds',
+ 'cwst', 'label'
+ )
+);
+
+INSERT INTO config.workstation_setting_type
+ (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.circ.patron.group_members', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.circ.patron.group_members',
+ 'Grid Config: circ.patron.group_members',
+ 'cwst', 'label')
+);
+
+INSERT INTO config.workstation_setting_type (name,label,grp,datatype)
+VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
commit 10eea7f19e457cc9e35ea2b0bc1db58944209d5a
Author: Jason Boyer <jboyer at library.in.gov>
Date: Fri Jan 18 12:38:22 2019 -0500
LP1759343: Bills Annotation Persistance
Make the Annotate option on the patron Bills page
persistant and a workstation setting.
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
new file mode 100644
index 0000000000..ed749c986c
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
+
+COMMIT;
+
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
index 16c29fe1e3..13a92304b6 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -81,7 +81,7 @@
<div class="form-group">
<label for="annotate-payment" class="control-label col-md-5">[% l('Annotate') %]</label>
<div class="col-md-1">
- <input id="annotate-payment" type="checkbox" ng-model="annotate_payment"/>
+ <input id="annotate-payment" type="checkbox" ng-model="annotate_payment" ng-change="onAnnotatePaymentChanged()"/>
</div>
<div class="col-md-6">
<button
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index b644718915..295ad84457 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -194,12 +194,17 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
$scope.amount_verified = false;
$scope.disable_auto_print = false;
- // check receipt_on_pay setting default persisted
+ // Load persistant settings
egCore.hatch.getItem('circ.bills.receiptonpay')
.then(function(rcptOnPay){
if (rcptOnPay) $scope.receipt_on_pay.isChecked = rcptOnPay;
});
+ egCore.hatch.getItem('circ.bills.annotatepayment')
+ .then(function(annoPay){
+ if (annoPay) $scope.annotate_payment = annoPay;
+ });
+
// pre-define list-returning funcs in case we access them
// before the grid instantiates
$scope.gridControls = {
@@ -406,6 +411,10 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
egCore.hatch.setItem('circ.bills.receiptonpay', $scope.receipt_on_pay.isChecked);
}
+ $scope.onAnnotatePaymentChanged = function(){
+ egCore.hatch.setItem('circ.bills.annotatepayment', $scope.annotate_payment);
+ }
+
function printReceipt(type, payment_ids, payments_made, note) {
var payment_blobs = [];
var cusr = patronSvc.current;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 22 ++++++++++++++++++++++
.../upgrade/1167.data.annotate_payment_setting.sql | 8 ++++++++
.../src/templates/staff/circ/patron/t_bills.tt2 | 2 +-
.../web/js/ui/default/staff/circ/patron/bills.js | 11 ++++++++++-
5 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list