[open-ils-commits] r12458 - in trunk/Open-ILS/xul/staff_client/server: cat locale/en-US (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-03-06 17:10:14 -0500 (Fri, 06 Mar 2009)
New Revision: 12458

Modified:
   trunk/Open-ILS/xul/staff_client/server/cat/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Log:
show checkin time in charge patron for damaged item prompt

Modified: trunk/Open-ILS/xul/staff_client/server/cat/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/util.js	2009-03-06 21:53:31 UTC (rev 12457)
+++ trunk/Open-ILS/xul/staff_client/server/cat/util.js	2009-03-06 22:10:14 UTC (rev 12458)
@@ -308,8 +308,9 @@
 						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 @@
                                         + ' : ' + 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,

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2009-03-06 21:53:31 UTC (rev 12457)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties	2009-03-06 22:10:14 UTC (rev 12458)
@@ -339,7 +339,7 @@
 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