From 8a61d2c1257e3631ee27f3b1d5b187065353b4ae Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 2 Dec 2009 23:39:35 +0000 Subject: [PATCH] merge from my offline repo. Toward a billing interface replacement. Other things including a hopeful fix for a dojo.require race condition in util/date.js git-svn-id: svn://svn.open-ils.org/ILS/trunk@15061 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 20 ++- .../chrome/content/OpenILS/global_util.js | 1 + .../server/OpenILS/util_overlay.xul | 2 + .../server/locale/en-US/common.properties | 1 + .../xul/staff_client/server/patron/bill2.js | 165 +++++++++++++++++- .../xul/staff_client/server/patron/bill2.xul | 41 ++--- .../server/skin/patron_display.css | 2 + 7 files changed, 210 insertions(+), 22 deletions(-) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 24bc5d072d..39f586e904 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2510,7 +2510,20 @@ + + + + + + + + + + + + + @@ -2532,10 +2545,11 @@ - + + @@ -2549,7 +2563,11 @@ + + + + diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js index 3ff228805f..c87036889e 100644 --- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js +++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js @@ -12,6 +12,7 @@ } switch(a) { + case 'staff' : return data.list.au[0]; break; case 'staff_id' : return data.list.au[0].id(); break; case 'staff_usrname' : return data.list.au[0].usrname(); break; case 'ws_ou' : diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul index 5318cd455a..2048b90ada 100644 --- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul +++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul @@ -10,6 +10,8 @@ + +