[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 35571869d4f2453fa6a141c06c69bbd4df383ba1
Evergreen Git
git at git.evergreen-ils.org
Fri Dec 14 11:32:19 EST 2018
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 35571869d4f2453fa6a141c06c69bbd4df383ba1 (commit)
via cbea851f800647f224f1064333a1ff105d733d4b (commit)
via c4d3ebaea6a4e3e8231eed7f31dfa6b4feb05633 (commit)
from c5ba6208a1d1960df1ba9c48de7d49a314262aa6 (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 35571869d4f2453fa6a141c06c69bbd4df383ba1
Author: Jason Stephenson <jason at sigio.com>
Date: Fri Dec 14 11:31:45 2018 -0500
Add Release Notes for Lp 1662535 & Lp 1743783
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/docs/RELEASE_NOTES_NEXT/Circulation/patron_bill_fixes.adoc b/docs/RELEASE_NOTES_NEXT/Circulation/patron_bill_fixes.adoc
new file mode 100644
index 0000000..79848e4
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Circulation/patron_bill_fixes.adoc
@@ -0,0 +1,24 @@
+Add Missing Patron Bill Grid Columns
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Adding missing columns to the patron bills grid, including:
+- Call Number
+- Owning Library
+- Shelving Location
+- Last Billing Note
+- Last Billing Timestamp
+- Last Payment Timestamp
+- Last payment Note
+- Last Payment Type
+
+Corrected the path for Bill Type.
+
+Changed column name for Location to 'Billing Location' and the former
+Billing Location to 'Grocery Billing Location' for clarity
+
+Fix Bill Full Detail Display
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Fleshes out retrieved data to be able to display the billing location
+for both circulation and grocery bills on the full details page as
+well as the owning library for circulation bills.
+
+
commit cbea851f800647f224f1064333a1ff105d733d4b
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date: Wed Dec 12 17:57:19 2018 -0500
LP#1743783 Web Client Bill Full Detail Display Issues
Fleshes out retrieved data to be able to display the billing
location for both circulation and grocery bills on the full
details page as well as the owning library for circulation bills.
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: John Amundson <jamundson at cwmars.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 0be1f7d..1ea6fd1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-md-2 strong-text">[% l('Billing Location') %]</div>
- <div class="col-md-2">{{xact.billing_location().shortname()}}</div>
+ <div class="col-md-2">{{xact.grocery().billing_location().shortname()||xact.circulation().circ_lib().shortname()}}</div>
<div class="col-md-2 strong-text">[% l('Total Billed') %]</div>
<div class="col-md-2">{{xact.summary().total_owed() | currency}}</div>
<div class="col-md-2 strong-text">[% l('Title') %]</div>
@@ -103,6 +103,12 @@
{{total_circs}}
</div>
</div>
+ <div class="row">
+ <div class="col-md-2 strong-text">[% l('Owning Library') %]</div>
+ <div class="col-md-2">
+ {{xact.circulation().target_copy().call_number().owning_lib().shortname()}}
+ </div>
+ </div>
</div>
<hr/>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
index 8c1c406..048e9d7 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
@@ -14,13 +14,14 @@ function($uibModal , $q , egCore) {
// fetch a fleshed money.billable_xact
service.fetchXact = function(xact_id) {
return egCore.pcrud.retrieve('mbt', xact_id, {
- flesh : 5,
+ flesh : 6,
flesh_fields : {
mbt : ['summary','circulation','grocery','reservation'],
- circ: ['target_copy'],
+ circ: ['target_copy', 'circ_lib'],
acp : ['call_number','location','status','age_protect'],
- acn : ['record'],
- bre : ['simple_record']
+ acn : ['record','owning_lib'],
+ bre : ['simple_record'],
+ mg : ['billing_location']
},
select : {bre : ['id']}}, // avoid MARC
{authoritative : true}
commit c4d3ebaea6a4e3e8231eed7f31dfa6b4feb05633
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date: Wed Dec 12 21:56:55 2018 -0500
LP#1662535 Patron Bill Grid Columns
1) Adding missing columns, including:
- Call Number
- Owning Library
- Shelving Location
- Last Billing Note
- Last Billing Timestamp
- Last Payment Timestamp
- Last payment Note
- Last Payment Type
2) Corrected path for Type
3) Changed column name for Location to 'Billing Location'
and the former Billing Location to 'Grocery Billing Location' for clarity
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: John Amundson <jamundson at cwmars.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index a29aa3d..d622db6 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -55,7 +55,19 @@
<eg-grid-field label="[% l('Start') %]" path='xact_start' datatype="timestamp"></eg-grid-field>
<eg-grid-field label="[% l('Total Billed') %]" path='summary.total_owed'></eg-grid-field>
<eg-grid-field label="[% l('Total Paid') %]" path='summary.total_paid'></eg-grid-field>
- <eg-grid-field label="[% l('Type') %]" path='xact_type'></eg-grid-field>
+ <eg-grid-field label="[% l('Type') %]" path='summary.xact_type'></eg-grid-field>
+
+ <eg-grid-field path="circulation.target_copy.call_number.label"
+ label="[% l('Call Number') %]" name="call_number">
+ </eg-grid-field>
+
+ <eg-grid-field path="circulation.target_copy.call_number.owning_lib.shortname"
+ label="[% l('Owning Library') %]" name="owning_lib">
+ </eg-grid-field>
+
+ <eg-grid-field path="circulation.target_copy.location.name"
+ label="[% l('Shelving Location') %]" name="location">
+ </eg-grid-field>
<!-- receipt data -->
<eg-grid-field path='summary.last_billing_type' required></eg-grid-field>
@@ -88,7 +100,7 @@
label="[% l('Circulation Library') %]" name="circ_lib" hidden>
</eg-grid-field>
- <eg-grid-field label="[% l('Location') %]" name="xact_location">
+ <eg-grid-field label="[% l('Billing Location') %]" name="xact_location">
{{item['grocery.billing_location.shortname']||item['circulation.circ_lib.shortname']}}
</eg-grid-field>
@@ -98,7 +110,7 @@
<!-- import all circ fields, hidden by default -->
<eg-grid-field path='grocery.*' hidden> </eg-grid-field>
- <eg-grid-field label="[% l('Billing Location') %]"
+ <eg-grid-field label="[% l('Grocery Billing Location') %]"
path='grocery.billing_location.shortname' required hidden> </eg-grid-field>
<eg-grid-field path='circulation.circ_lib' required hidden></eg-grid-field>
<eg-grid-field path='circulation.duration' required hidden></eg-grid-field>
@@ -110,6 +122,10 @@
path='circulation.circ_lib.shortname' required hidden> </eg-grid-field>
<eg-grid-field path='circulation.target_copy.*' hidden> </eg-grid-field>
-
+ <eg-grid-field path='circulation.target_copy.call_number.*' hidden required></eg-grid-field>
+ <eg-grid-field path='circulation.target_copy.call_number.owning_lib.*' hidden required></eg-grid-field>
+ <eg-grid-field path='circulation.target_copy.location.*' hidden required></eg-grid-field>
+ <eg-grid-field path='summary.*' hidden required></eg-grid-field>
+
</eg-grid>
-----------------------------------------------------------------------
Summary of changes:
.../templates/staff/circ/patron/t_bills_list.tt2 | 24 ++++++++++++++++---
.../templates/staff/circ/patron/t_xact_details.tt2 | 8 +++++-
.../js/ui/default/staff/circ/services/billing.js | 9 ++++---
.../Circulation/patron_bill_fixes.adoc | 24 ++++++++++++++++++++
4 files changed, 56 insertions(+), 9 deletions(-)
create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/patron_bill_fixes.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list