handle renewals for deposits (albeit ungracefully)

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

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 28562b3..a530406 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2315,7 +2315,9 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                                case 1213 /* PATRON_BARRED */ : break;
                                                case 1215 /* CIRC_EXCEEDS_COPY_RANGE */ : break;
                                                case 1224 /* PATRON_ACCOUNT_EXPIRED */ : break;
+                        case 1232 /* ITEM_DEPOSIT_REQUIRED */ : break;
                         case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ : break;
+                                           case 1234 /* ITEM_DEPOSIT_PAID */ : break;
                                                case 1500 /* ACTION_CIRCULATION_NOT_FOUND */ : break;
                                                case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ : break;
                                                case 7003 /* COPY_CIRC_NOT_ALLOWED */ : break;
@@ -2350,7 +2352,9 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                        1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
                                        1213 /* PATRON_BARRED */,
                                        1215 /* CIRC_EXCEEDS_COPY_RANGE */,
+                    1232 /* ITEM_DEPOSIT_REQUIRED */,
                     1233 /* ITEM_RENTAL_FEE_REQUIRED */,
+                                       1234 /* ITEM_DEPOSIT_PAID */,
                                        7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
                                        7003 /* COPY_CIRC_NOT_ALLOWED */,
                                        7004 /* COPY_NOT_AVAILABLE */,
@@ -2365,9 +2369,15 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                        '1212' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '1213' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '1215' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
+                    '1232' : function(r) {
+                        return document.getElementById('circStrings').getFormattedString('staff.circ.renew.override.item_deposit_required.warning.barcode', [barcode]);
+                    },
                     '1233' : function(r) {
-                        return document.getElementById('circStrings').getString('staff.circ.renew.override.item_rental_fee_required.warning.barcode', [barcode]);
+                        return document.getElementById('circStrings').getFormattedString('staff.circ.renew.override.item_rental_fee_required.warning.barcode', [barcode]);
                     },
+                                       '1234' : function(r) {
+                                               return document.getElementById('circStrings').getFormattedString('staff.circ.utils.checkin.override.item_deposit_paid.warning');
+                                       },
                                        '7002' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '7003' : function(r) { return document.getElementById('circStrings').getFormattedString('staff.circ.renew.barcode', [barcode]); },
                                        '7004' : function(r) {

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index c3a8dd7..b9c5caa 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -321,7 +321,8 @@ staff.circ.checkin.renew_failed.override=Override Renew Failure?
 staff.circ.renew.barcode=Barcode: %1$s
 staff.circ.renew.barcode.status=Barcode: %1$s Status: %2$s
 staff.circ.renew.barcode.msg=Barcode: %1$s Message: %2$s
-staff.circ.circ.override.item_rental_fee_required.warning.barcode=For item with barcode %1$s, a billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
+staff.circ.renew.override.item_deposit_required.warning.barcode=For item with barcode %1$s, a billing for an Item Deposit will be added to the patron's account if this action is overrided.
+staff.circ.renew.override.item_rental_fee_required.warning.barcode=For item with barcode %1$s, a billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
 staff.circ.holds.activate.prompt=Are you sure you would like to activate hold %1$s?
 staff.circ.holds.activate.prompt.plural=Are you sure you would like to activate holds %1$s?
 staff.circ.holds.suspend.prompt=Are you sure you would like to suspend hold %1$s?