From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 6 Mar 2009 22:10:14 +0000 (+0000)
Subject: show checkin time in charge patron for damaged item prompt
X-Git-Tag: sprint4-merge-nov22~10569
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=538c68f5d3b88cc141ca772e0d45248143b90b2a;p=working%2FEvergreen.git

show checkin time in charge patron for damaged item prompt

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

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 406c7e1ab2..48a7597b85 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -308,8 +308,9 @@ cat.util.mark_item_damaged = function(copy_ids) {
 						if (typeof robj.ilsevent != 'undefined') {
                             switch(robj.textcode) {
                                 case 'DAMAGE_CHARGE' :
-                                    JSAN.use('patron.util'); JSAN.use('util.money');
-                                    var patron_obj = patron.util.retrieve_fleshed_au_via_id( ses(), robj.payload.usr );
+                                    JSAN.use('util.money');
+                                    var circ_obj = robj.payload.circ;
+                                    var patron_obj = circ_obj.usr();
                                     var patron_name = ( patron_obj.prefix() ? patron_obj.prefix() + ' ' : '') +
                                         patron_obj.family_name() + ', ' +
                                         patron_obj.first_given_name() + ' ' +
@@ -318,7 +319,11 @@ cat.util.mark_item_damaged = function(copy_ids) {
                                         + ' : ' + patron_obj.card().barcode()
 
                                     var r1 = error.yns_alert(
-                                        $("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.charge_patron_prompt.message', [ copies[i].barcode(), patron_name, util.money.sanitize(robj.payload.charge) ]),
+                                        $("catStrings").getFormattedString('staff.cat.util.mark_item_damaged.charge_patron_prompt.message', [ 
+                                            copies[i].barcode(), 
+                                            patron_name, 
+                                            circ_obj.checkin_time().substr(0,10), // FIXME: need to replace with something better
+                                            util.money.sanitize(robj.payload.charge) ]),
                                         $("catStrings").getString('staff.cat.util.mark_item_damaged.charge_patron_prompt.title'),
                                         $("catStrings").getString('staff.cat.util.mark_item_damaged.charge_patron_prompt.ok_label'),
                                         $("catStrings").getString('staff.cat.util.mark_item_damaged.charge_patron_prompt.cancel_label'), null,
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index ff0e306206..bd43c5f701 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -339,7 +339,7 @@ staff.cat.util.mark_item_damaged.md_title=Mark Damaged
 staff.cat.util.mark_item_damaged.md_ok_label=OK
 staff.cat.util.mark_item_damaged.md_cancel_label=Cancel
 staff.cat.util.mark_item_damaged.md_confirm_action=Check here to confirm this action
-staff.cat.util.mark_item_damaged.charge_patron_prompt.message=Item %1$s will be marked damaged.  Charge patron (%2$s) $%3$s for the damage?
+staff.cat.util.mark_item_damaged.charge_patron_prompt.message=Item %1$s will be marked damaged.  Was returned on %3$s by %2$s.  Charge this patron $%4$s for the damage?
 staff.cat.util.mark_item_damaged.charge_patron_prompt.title=Charge Patron For Damaged Item?
 staff.cat.util.mark_item_damaged.charge_patron_prompt.ok_label=OK
 staff.cat.util.mark_item_damaged.charge_patron_prompt.cancel_label=Cancel