[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 836960e863327e6b038ff52db536e6b66322c3f9

[Evergreen Git]

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_0 has been updated
       via  836960e863327e6b038ff52db536e6b66322c3f9 (commit)
      from  9fd00201ba32b0193ba2d6aa89c6284c6dbef98e (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 836960e863327e6b038ff52db536e6b66322c3f9
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Mar 29 11:46:03 2018 -0400

    LP#1740535: retrieve list of billing types
    
    This patch changes how the web staff client retrieves the list
    of billing types available for use by the Bill Patron modal. PCRUD
    permissions on config.billing_type don't quite match how the
    the set of billing types available to a staff user used to work
    in the XUL staff client, so this patch uses the
    open-ils.circ.billing_type.ranged.retrieve.all method instead.
    
    To test
    -------
    [1] Log in as a Circulators staff user (assuming stock data
        and permissions).
    [2] Try the Bill Patron dialog in the web staff client; note that
        no billing types are accessible.
    [3] Apply the patch and repeat step #2. This time, it should
        include the miscellaneous billing type.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 352cd74..a9f7962 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
@@ -68,14 +68,16 @@ function($uibModal , $q , egCore) {
             return $q.when(egCore.env.cbt.list);
         }
 
-        return egCore.pcrud.search('cbt', 
-            {   // first 100 are reserved for system-generated bills
-                id : {'>' : 100}, 
-                owner : egCore.org.ancestors(
-                    egCore.auth.user().ws_ou(), true)
-            }, 
-            {}, {atomic : true}
+        return egCore.net.request(
+            'open-ils.circ',
+            'open-ils.circ.billing_type.ranged.retrieve.all',
+            egCore.auth.token(),
+            egCore.auth.user().ws_ou()
         ).then(function(list) {
+            list = list.filter(function(item) {
+                // first 100 are reserved for system-generated bills
+                return item.id() > 100;
+            });
             egCore.env.absorbList(list, 'cbt');
             return list;
         });

-----------------------------------------------------------------------

Summary of changes:
 .../js/ui/default/staff/circ/services/billing.js   |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS