[open-ils-commits] r15130 - in trunk: . Open-ILS/web/opac/locale/en-US Open-ILS/xul/staff_client/server/patron (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Dec 9 17:14:45 EST 2009
Author: phasefx
Date: 2009-12-09 17:14:39 -0500 (Wed, 09 Dec 2009)
New Revision: 15130
Modified:
trunk/
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/server/patron/bill_history.js
trunk/Open-ILS/xul/staff_client/server/patron/bill_history.xul
Log:
date filter for payment history
Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2009-12-09 09:34:47.802999973 -0500
committer: Jason Etheridge <jason at esilibrary.com>
properties:
branch-nick: trunk
+ timestamp: 2009-12-09 17:14:38.667999983 -0500
committer: Jason Etheridge <jason at esilibrary.com>
properties:
branch-nick: trunk
Name: bzr:ancestry:v4
- phasefx at batrepo-20091014063314-vwbu74yuns94tzb4
jason at esilibrary.com-20091202233704-ej5adh761jjyc97k
jason at esilibrary.com-20091204160629-ilcxw9t02sqmo1qr
jason at esilibrary.com-20091208134806-0n0h8hf3gieuu5zz
jason at esilibrary.com-20091208155338-qatq3itbybh68tst
jason at esilibrary.com-20091209133349-f98dfqy22fe4lt0m
jason at esilibrary.com-20091209143255-f95jqqpfprksx7x8
+ phasefx at batrepo-20091014063314-vwbu74yuns94tzb4
jason at esilibrary.com-20091202233704-ej5adh761jjyc97k
jason at esilibrary.com-20091204160629-ilcxw9t02sqmo1qr
jason at esilibrary.com-20091208134806-0n0h8hf3gieuu5zz
jason at esilibrary.com-20091208155338-qatq3itbybh68tst
jason at esilibrary.com-20091209133349-f98dfqy22fe4lt0m
jason at esilibrary.com-20091209143255-f95jqqpfprksx7x8
jason at esilibrary.com-20091209221402-nzzmam31s4hyctoz
Name: bzr:file-ids
- Open-ILS/xul/staff_client/server/patron/bill_history.js 14198 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk%2FOpen-ILS%2Fxul%2Fstaff_client%2Fserver%2Fpatron%2Fbill_history.js
Open-ILS/xul/staff_client/server/patron/bill_history.xul 3794 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fxul%2Fstaff_client%2Fserver%2Fpatron%2Fbill_history.xul
+ Open-ILS/web/opac/locale/en-US/lang.dtd 1681 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fweb%2Fopac%2Flocale%2Fen-US%2Flang.dtd
Open-ILS/xul/staff_client/server/patron/bill_history.js 14198 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk%2FOpen-ILS%2Fxul%2Fstaff_client%2Fserver%2Fpatron%2Fbill_history.js
Open-ILS/xul/staff_client/server/patron/bill_history.xul 3794 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fxul%2Fstaff_client%2Fserver%2Fpatron%2Fbill_history.xul
Name: bzr:revision-id:v4
- 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
+ 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
Name: bzr:text-parents
- Open-ILS/xul/staff_client/server/patron/bill_history.js jason at esilibrary.com-20091209142821-c6oyqmuk6unvhtrk svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:15116
Open-ILS/xul/staff_client/server/patron/bill_history.xul jason at esilibrary.com-20091209142821-c6oyqmuk6unvhtrk svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:15116
+ Open-ILS/web/opac/locale/en-US/lang.dtd jason at esilibrary.com-20091209060449-hnm0aa0ds1h2ob5i
Open-ILS/xul/staff_client/server/patron/bill_history.js jason at esilibrary.com-20091209143141-hv8elbdaqgm2vx74
Open-ILS/xul/staff_client/server/patron/bill_history.xul jason at esilibrary.com-20091209143141-hv8elbdaqgm2vx74
Name: bzr:text-revisions
- Open-ILS/xul/staff_client/server/patron/bill_history.js jason at esilibrary.com-20091209143141-hv8elbdaqgm2vx74
Open-ILS/xul/staff_client/server/patron/bill_history.xul jason at esilibrary.com-20091209143141-hv8elbdaqgm2vx74
+ Open-ILS/web/opac/locale/en-US/lang.dtd jason at esilibrary.com-20091209221402-nzzmam31s4hyctoz
Open-ILS/xul/staff_client/server/patron/bill_history.js jason at esilibrary.com-20091209221402-nzzmam31s4hyctoz
Open-ILS/xul/staff_client/server/patron/bill_history.xul jason at esilibrary.com-20091209221402-nzzmam31s4hyctoz
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-12-09 21:32:19 UTC (rev 15129)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-12-09 22:14:39 UTC (rev 15130)
@@ -2536,6 +2536,12 @@
<!ENTITY staff.patron.bill_history.tab.transactions.accesskey "T">
<!ENTITY staff.patron.bill_history.tab.payments.label "Payments">
<!ENTITY staff.patron.bill_history.tab.payments.accesskey "y">
+<!ENTITY staff.patron.bill_history.payments.start_date.label "Start Date">
+<!ENTITY staff.patron.bill_history.payments.start_date.accesskey "S">
+<!ENTITY staff.patron.bill_history.payments.end_date.label "End Date">
+<!ENTITY staff.patron.bill_history.payments.end_date.accesskey "">
+<!ENTITY staff.patron.bill_history.payments.retrieve.label "Retrieve Payments">
+<!ENTITY staff.patron.bill_history.payments.retrieve.accesskey "R">
<!ENTITY staff.patron.bill_interface.total_owed "Total Owed:">
<!ENTITY staff.patron.bill_interface.total_checked "Total Checked:">
Modified: trunk/Open-ILS/xul/staff_client/server/patron/bill_history.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/bill_history.js 2009-12-09 21:32:19 UTC (rev 15129)
+++ trunk/Open-ILS/xul/staff_client/server/patron/bill_history.js 2009-12-09 22:14:39 UTC (rev 15130)
@@ -300,14 +300,37 @@
try {
if (payment_history_fetched) { return; } else { payment_history_fetched = true; }
+ $('payments_date1').year = $('payments_date1').year - 1;
+
+ retrieve_payments();
+
+ } catch(E) {
+ alert('Error in bill_history.js, payment_history_init(): ' + E);
+ }
+}
+
+function retrieve_payments() {
+ try {
+
g.payments_list.clear();
$('payments_meter').hidden = false;
+ var filters = {
+ 'where' : {
+ 'payment_ts' : {
+ 'between' : [
+ $('payments_date1').value,
+ $('payments_date2').value == util.date.formatted_date(new Date(),'%F') ? 'now' : $('payments_date2').value
+ ]
+ }
+ }
+ };
+
fieldmapper.standardRequest(
[ api.FM_MP_RETRIEVE_VIA_USER.app, api.FM_MP_RETRIEVE_VIA_USER.method ],
{ async: true,
- params: [ses(), g.patron_id],
+ params: [ses(), g.patron_id, filters],
onresponse: function(r) {
try {
var result = r.recv().content();
@@ -341,6 +364,6 @@
);
} catch(E) {
- alert('Error in bill_history.js, payment_history_init(): ' + E);
+ alert('Error in bill_history.js, retrieve_payments(): ' + E);
}
}
Modified: trunk/Open-ILS/xul/staff_client/server/patron/bill_history.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/bill_history.xul 2009-12-09 21:32:19 UTC (rev 15129)
+++ trunk/Open-ILS/xul/staff_client/server/patron/bill_history.xul 2009-12-09 22:14:39 UTC (rev 15130)
@@ -63,9 +63,33 @@
</tabpanel>
<tabpanel orient="vertical">
<hbox>
- <spacer flex="1"/>
- <progressmeter id ="payments_meter" mode="undetermined" hidden="true"/>
- <spacer flex="1"/>
+ <toolbox flex="1">
+ <toolbar>
+ <toolbarspring/>
+ <toolbaritem>
+ <progressmeter id="payments_meter" flex="1" hidden="true" mode="undetermined"/>
+ </toolbaritem>
+ <toolbaritem>
+ <vbox pack="center">
+ <label control="payments_date1"
+ value="&staff.patron.bill_history.payments.start_date.label;"
+ accesskey="&staff.patron.bill_history.payments.start_date.accesskey;" />
+ </vbox>
+ <datepicker id="payments_date1" type="popup" />
+ <vbox pack="center">
+ <label control="payments_date2"
+ value="&staff.patron.bill_history.payments.end_date.label;"
+ accesskey="&staff.patron.bill_history.payments.end_date.accesskey;" />
+ </vbox>
+ <datepicker id="payments_date2" type="popup" />
+ </toolbaritem>
+ <toolbarbutton id="payments_retrieve_btn"
+ label="&staff.patron.bill_history.payments.retrieve.label;"
+ accesskey="&staff.patron.bill_history.payments.retrieve.accesskey;"
+ oncommand="retrieve_payments();"
+ style="-moz-user-focus: normal" />
+ </toolbar>
+ </toolbox>
</hbox>
<tree id="payments_tree" flex="1" enableColumnDrag="true" seltype="multiple"/>
<hbox>
More information about the open-ils-commits
mailing list