added ITEM_ON_HOLDS_SHELF to checkout, and CIRC_CLAIMS_RETURNED to renew

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6005 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 187aff4..f51993d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -406,8 +406,8 @@ circ.checkout.prototype = {
                                                7003 /* COPY_CIRC_NOT_ALLOWED */,
                                                7004 /* COPY_NOT_AVAILABLE */, 
                                                7006 /* COPY_IS_REFERENCE */, 
-                                               7007 /* COPY_NEEDED_FOR_HOLD */, 
                                                7010 /* COPY_ALERT_MESSAGE */,
+                                               7016 /* ITEM_ON_HOLDS_SHELF */,
                                                7013 /* PATRON_EXCEEDS_FINES */,
                                        ],
                                        'text' : {
@@ -534,10 +534,6 @@ circ.checkout.prototype = {
                                                        msg += test_permit[i].desc + '\n';
                                                        found_handled = true;
                                                break;
-                                               case 7007 /* COPY_NEEDED_FOR_HOLD */ :
-                                                       msg += test_permit[i].desc + '\n';
-                                                       found_handled = true;
-                                               break;
                                                case 7009 /* CIRC_CLAIMS_RETURNED */ :
                                                        msg += test_permit[i].desc + '\n';
                                                        obj.error.yns_alert(msg,'Check Out Failed','OK',null,null,'Check here to confirm this message');
@@ -547,6 +543,10 @@ circ.checkout.prototype = {
                                                        msg += test_permit[i].desc + '\n' + 'Alert Message = ' + test_permit[i].payload + '\n';
                                                        found_handled = true;
                                                break;
+                                               case 7016 /* ITEM_ON_HOLDS_SHELF */ :
+                                                       msg += test_permit[i].desc + '\n';
+                                                       found_handled = true;
+                                               break;
                                                case 1202 /* ITEM_NOT_CATALOGED */ :
                                                        found_handled = true;
                                                break;

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index ecbed15..b1d1d1a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1222,6 +1222,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id ) {
                                        7006 /* COPY_IS_REFERENCE */,
                                        7007 /* COPY_NEEDED_FOR_HOLD */,
                                        7008 /* MAX_RENEWALS_REACHED */, 
+                                       7009 /* CIRC_CLAIMS_RETURNED */, 
                                        7010 /* COPY_ALERT_MESSAGE */,
                                        7013 /* PATRON_EXCEEDS_FINES */,
                                ],
@@ -1237,6 +1238,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id ) {
                                        '7006' : function(r) { return 'Barcode: ' + barcode; },
                                        '7007' : function(r) { return 'Barcode: ' + barcode; },
                                        '7008' : function(r) { return 'Barcode: ' + barcode; },
+                                       '7009' : function(r) { return 'Barcode: ' + barcode; },
                                        '7010' : function(r) {
                                                return 'Barcode: ' + barcode + ' Message: ' + r.payload;
                                        },
@@ -1258,6 +1260,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id ) {
                                case 7006 /* COPY_IS_REFERENCE */ : break;
                                case 7007 /* COPY_NEEDED_FOR_HOLD */ : break;
                                case 7008 /* MAX_RENEWALS_REACHED */ : break; 
+                               case 7009 /* CIRC_CLAIMS_RETURNED */ : break; 
                                case 7010 /* COPY_ALERT_MESSAGE */ : break;
                                case 7013 /* PATRON_EXCEEDS_FINES */ : break;
                                default: