From 6e13f25e33ed6636a7afa4ef212bf2de9ddcb8ab Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 28 Oct 2008 21:36:09 +0000 Subject: [PATCH] Handle the rental/deposit events during checkout. This doesn't yet update the patron sidebar or an already loaded billing interface git-svn-id: svn://svn.open-ils.org/ILS/trunk@10943 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/circ/checkout.js | 13 ++++++++++--- .../xul/staff_client/server/locale/en-US/circ.properties | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js index 19aacdb84f..fb4f91cbca 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkout.js +++ b/Open-ILS/xul/staff_client/server/circ/checkout.js @@ -561,6 +561,8 @@ circ.checkout.prototype = { 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */, 1213 /* PATRON_BARRED */, 1215 /* CIRC_EXCEEDS_COPY_RANGE */, + 1232 /* ITEM_DEPOSIT_REQUIRED */, + 1233 /* ITEM_RENTAL_FEE_REQUIRED */, 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */, 7003 /* COPY_CIRC_NOT_ALLOWED */, 7004 /* COPY_NOT_AVAILABLE */, @@ -570,11 +572,14 @@ circ.checkout.prototype = { 7013 /* PATRON_EXCEEDS_FINES */ ], 'text' : { + '1232' : function(r) { + return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_deposit_required.warning'); + }, + '1233' : function(r) { + return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_rental_fee_required.warning'); + }, '7004' : function(r) { - //return obj.data.hash.ccs[ r.payload ].name(); return r.payload.status().name(); - //return r.payload.name(); - //return r.payload; }, '7010' : function(r) { return r.payload; @@ -713,6 +718,8 @@ circ.checkout.prototype = { document.getElementById('circStrings').getString('staff.circ.confirm.msg') ); break; + case 1232 /* ITEM_DEPOSIT_REQUIRED */ : + case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ : case 7013 /* PATRON_EXCEEDS_FINES */ : found_handled = true; break; 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 fcdd2beee7..ea1839827e 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties @@ -42,6 +42,8 @@ staff.circ.checkout.non_cataloged.pending=Non-cataloged checkout pending... staff.circ.checkout.barcode.pending=%1$s checkout pending... staff.circ.checkout.barcode.failed.alert=Check Out Failed %1$s staff.circ.checkout.override.confirm=Override Checkout Failure? +staff.circ.checkout.override.item_deposit_required.warning=A billing for an Item Deposit will be added to the patron's account if this action is overrided. +staff.circ.checkout.override.item_rental_fee_required.warning=A billing for an Item Rental Fee will be added to the patron's account if this action is overrided. staff.circ.checkout.not_cataloged.confirm=Mis-scan or non-cataloged item. Checkout as a pre-cataloged item? staff.circ.pre_cataloged=Pre-cataloged staff.circ.non_cataloged=Non-cataloged -- 2.11.0