From 2463d73a0e157ce7297d7fda347b0cabd8192a0d Mon Sep 17 00:00:00 2001 From: drizea Date: Mon, 13 Aug 2012 23:41:12 +0300 Subject: [PATCH] bug fix on fines application crash on grocery bills --- .../android/accountAccess/fines/FinesRecord.java | 30 +++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java index d27be890b6..bfcabda69e 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java @@ -21,20 +21,38 @@ public class FinesRecord { private Date checkin_time; + // types are grocery and circulation + private int type; + + public static int FINE_GROCERY_TYPE = 1; + public static int FINE_CIRCULATION = 2; + public FinesRecord(OSRFObject circ, OSRFObject mvr_record, OSRFObject mbts_transaction){ - title = mvr_record.getString("title"); - author = mvr_record.getString("author"); + if(mbts_transaction.get("xact_type").toString().equals("circulation")){ - balance_owed = mbts_transaction.getString("total_owed"); + title = mvr_record.getString("title"); + author = mvr_record.getString("author"); + + if(circ.get("checkin_time") != null){ + checkin_time = GlobalConfigs.parseDate(circ.getString("checkin_time")); + } + else + checkin_time = null; - if(circ.get("checkin_time") != null){ - checkin_time = GlobalConfigs.parseDate(circ.getString("checkin_time")); } else - checkin_time = null; + { + //grocery + title = "Grocery billing"; + author = mbts_transaction.getString("last_billing_note"); + + } + balance_owed = mbts_transaction.getString("total_owed"); + + } //if returned or fines still acumulating -- 2.11.0