[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 5dcdb4a2540bfc3c97ef7dcc535ac7069f76d6f8
Evergreen Git
git at git.evergreen-ils.org
Tue Jun 18 11:23:28 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_3 has been updated
via 5dcdb4a2540bfc3c97ef7dcc535ac7069f76d6f8 (commit)
from 70ab7d828bc23138a595e68d770b722141d38b7c (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 5dcdb4a2540bfc3c97ef7dcc535ac7069f76d6f8
Author: Mike Risher <mrisher at catalyte.io>
Date: Mon Jun 10 11:11:38 2019 -0700
lp1770217 Items Out count shouldn't increment on renew
Determine if this item is currently out to the patron and is being
checked out again. If so, be sure not to increment "Items Out" count.
Signed-off-by: Mike Risher <mrisher at catalyte.io>
Changes to be committed:
modified: web/js/ui/default/staff/circ/patron/checkout.js
modified: web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
index ba7c5453bb..f3df2d8ace 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
@@ -201,7 +201,7 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
// Avoid updating checkout counts when a checkout turns
// into a renewal via auto_renew.
- if (!co_resp.auto_renew && !params.noncat) {
+ if (!co_resp.auto_renew && !params.noncat && !options.sameCopyCheckout) {
patronSvc.patron_stats.checkouts.out++;
patronSvc.patron_stats.checkouts.total_out++;
}
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 3e5c57d441..6c2d30d50e 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1106,6 +1106,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
function(args) {
if (sameUser) {
params.void_overdues = args.forgive_fines;
+ options.sameCopyCheckout = true;
return service.renew(params, options);
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js | 2 +-
Open-ILS/web/js/ui/default/staff/circ/services/circ.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list