[open-ils-commits] [GIT] Evergreen ILS branch master updated. 961264549feb4d9fb1cda571f465147c1eae715b

[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, master has been updated
       via  961264549feb4d9fb1cda571f465147c1eae715b (commit)
       via  773c20d2fd96c54d6555f91cf64e5cedc7d22b35 (commit)
      from  72e78393c1f92281302b3fdaa169960a97e98903 (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 961264549feb4d9fb1cda571f465147c1eae715b
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Sat Feb 15 12:56:58 2014 -0500

    LP#638509: Handle COPY_STATUS_LOST and COPY_STATUS_LONG_OVERDUE in renewal.
    
    Modify Open-ILS/xul/staff_client/server/circ/util.js so that the
    above events are available for override.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index aa497d4..96eee5b 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -3693,7 +3693,9 @@ circ.util.renew_via_barcode = function ( params, async ) {
                         case 7008 /* MAX_RENEWALS_REACHED */ : break;
                         case 7009 /* CIRC_CLAIMS_RETURNED */ : break;
                         case 7010 /* COPY_ALERT_MESSAGE */ : break;
+                        case 7011 /* COPY_STATUS_LOST */ : break;
                         case 7013 /* PATRON_EXCEEDS_FINES */ : break;
+                        case 7025 /* COPY_STATUS_LONG_OVERDUE */ : break;
                         case 11106 /* TOTAL_HOLD_COPY_RATIO_EXCEEDED */ : break;
                         case 11107 /* AVAIL_HOLD_COPY_RATIO_EXCEEDED */ : break;
                         default:
@@ -3774,7 +3776,9 @@ circ.util.renew_via_barcode = function ( params, async ) {
                     7008 /* MAX_RENEWALS_REACHED */,
                     7009 /* CIRC_CLAIMS_RETURNED */,
                     7010 /* COPY_ALERT_MESSAGE */,
+                    7011 /* COPY_STATUS_LOST */,
                     7013 /* PATRON_EXCEEDS_FINES */,
+                    7025 /* COPY_STATUS_LONG_OVERDUE */,
                     11106 /* TOTAL_HOLD_COPY_RATIO_EXCEEDED */,
                     11107 /* AVAIL_HOLD_COPY_RATIO_EXCEEDED */
                 ],
@@ -3804,7 +3808,13 @@ circ.util.renew_via_barcode = function ( params, async ) {
                     '7010' : function(r) {
                         return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.msg', [params.barcode, r.payload]);
                     },
-                    '7013' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [params.barcode]); }
+                    '7011' : function(r) {
+                        return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [params.barcode, typeof r.payload.status() == 'object' ? r.payload.status().name() : obj.data.hash.ccs[ r.payload.status() ].name()]);
+                    },
+                    '7013' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [params.barcode]); },
+                    '7025' : function(r) {
+                        return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode.status', [params.barcode, typeof r.payload.status() == 'object' ? r.payload.status().name() : obj.data.hash.ccs[ r.payload.status() ].name()]);
+                    }
                 }
             }
         );

commit 773c20d2fd96c54d6555f91cf64e5cedc7d22b35
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Sun Feb 2 15:59:34 2014 -0500

    LP#638509: Remove the stop_fines checks from do_renew's circulation search.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index 70c4a64..b3281c9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -3800,18 +3800,13 @@ sub do_renew {
     my $self = shift;
     $self->log_me("do_renew()");
 
-    # Make sure there is an open circ to renew that is not
-    # marked as LOST, CLAIMSRETURNED, or LONGOVERDUE
+    # Make sure there is an open circ to renew
     my $usrid = $self->patron->id if $self->patron;
     my $circ = $self->editor->search_action_circulation({
         target_copy => $self->copy->id,
         xact_finish => undef,
         checkin_time => undef,
-        ($usrid ? (usr => $usrid) : ()),
-        '-or' => [
-            {stop_fines => undef},
-            {stop_fines => OILS_STOP_FINES_MAX_FINES}
-        ]
+        ($usrid ? (usr => $usrid) : ())
     })->[0];
 
     return $self->bail_on_events($self->editor->event) unless $circ;

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

Summary of changes:
 .../lib/OpenILS/Application/Circ/Circulate.pm      |    9 ++-------
 Open-ILS/xul/staff_client/server/circ/util.js      |   12 +++++++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS