Use the new .duedate field for non-cat circs, which avoids closed dates like due...

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

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index fba37d1..dbacc75 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -376,16 +376,7 @@ circ.checkout.prototype = {
                                 checkout.payload.circ.circ_lib( checkout.payload.noncat_circ.circ_lib() );
                                 checkout.payload.circ.circ_staff( checkout.payload.noncat_circ.staff() );
                                 checkout.payload.circ.usr( checkout.payload.noncat_circ.patron() );
-                        
-                                JSAN.use('util.date');
-                                var c = checkout.payload.noncat_circ.circ_time();
-                                var d = c == "now" ? new Date() : util.date.db_date2Date( c );
-                                var t =obj.data.hash.cnct[ checkout.payload.noncat_circ.item_type() ];
-                                var cd = t.circ_duration() || "14 days";
-                                var i = util.date.interval_to_seconds( cd ) * 1000;
-                                d.setTime( Date.parse(d) + i );
-                                checkout.payload.circ.due_date( util.date.formatted_date(d,'%F') );
-            
+                                checkout.payload.circ.due_date( checkout.payload.noncat_circ.duedate() );
                             }
                         }
     

diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 6b5d633..4e3b30c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -210,12 +210,9 @@ patron.items.prototype = {
                     fake_circ.xact_start( nc_circ.circ_time() );
                     fake_circ.renewal_remaining(0);
                     fake_circ.stop_fines('Non-Cataloged');
+                    fake_circ.due_date( nc_circ.duedate() );
                         
-                    JSAN.use('util.date');
-                    var c = nc_circ.circ_time();
-                    var d = c == "now" ? new Date() : util.date.db_date2Date( c );
-                    var t = obj.data.hash.cnct[ nc_circ.item_type() ];
-                    if (!t) {
+                    if (!obj.data.hash.cnct[ nc_circ.item_type() ]) {
                         var robj2 = obj.network.simple_request('FM_CNCT_RETRIEVE',[ nc_circ.circ_lib() ]);
                         if (typeof robj2.ilsevent != 'undefined') throw(robj);
                         obj.data.stash_retrieve();
@@ -226,12 +223,7 @@ patron.items.prototype = {
                             }
                         }
                         obj.data.stash('hash','list');
-                        t = obj.data.hash.cnct[ nc_circ.item_type() ];
                     }
-                    var cd = t.circ_duration() || $("patronStrings").getString('staff.patron.items.show_noncats.14_days');
-                    var i = util.date.interval_to_seconds( cd ) * 1000;
-                    d.setTime( Date.parse(d) + i );
-                    fake_circ.due_date( util.date.formatted_date(d,'%F') );
     
                     var fake_record = new mvr();
                     fake_record.title( obj.data.hash.cnct[ nc_circ.item_type() ].name());