[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 800d0ec7f6b31edf315754eb0d35706c9cd0cd53
Evergreen Git
git at git.evergreen-ils.org
Thu Jun 13 17:56:42 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_2 has been updated
via 800d0ec7f6b31edf315754eb0d35706c9cd0cd53 (commit)
via 7bbb835d8f9ec50bae11626a6d805ed302869196 (commit)
via 8dcc163c03c2ee3023aad6e383e90652d6a5d7e8 (commit)
from 569cf2b6030bb77b59c731881c34bb490c553ab8 (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 800d0ec7f6b31edf315754eb0d35706c9cd0cd53
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 f50ff9c3ca..85d06ad918 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 ('1166', :eg_version); -- remingtron/gmcharlt/berick
+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 7bbb835d8f9ec50bae11626a6d805ed302869196
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 904cc83cec..399b4d1186 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19468,3 +19468,5 @@ VALUES (
'cwst', 'label')
);
+INSERT INTO config.workstation_setting_type (name,label,grp,datatype)
+VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
commit 8dcc163c03c2ee3023aad6e383e90652d6a5d7e8
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 52c2965b01..69d04396c8 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 14b84c0641..495c85b245 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 | 2 ++
.../src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql | 8 ++++++++
Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 | 2 +-
Open-ILS/web/js/ui/default/staff/circ/patron/bills.js | 11 ++++++++++-
5 files changed, 22 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