Merge branch 'release-2.1' of https://github.com/openlibraryenvironme…

…nt/ole into release-2.1
openlibraryenvironment · Sep 21, 2016 · 09487a4 · 09487a4
2 parents 1155cfa + e7ecc70
commit 09487a4
Show file tree

Hide file tree

Showing 4 changed files with 316 additions and 255 deletions.
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/deliver/PatronBillGenerator.java b/ole-app/olefs/src/main/java/org/kuali/ole/deliver/PatronBillGenerator.java
@@ -97,7 +97,7 @@ public String generatePatronBillPayment(OleLoanDocument oleLoanDocument, String
         }
 
         OleDeliverBatchServiceImpl oleDeliverBatchService = new OleDeliverBatchServiceImpl();
-        contentForSendMail.append(oleDeliverBatchService.generateMailContentFromPatronBill(oleLoanDocument, oleLoanDocument.getOlePatron(), feeTypeName, String.valueOf(fineAmount), patronBillPayment));
+        contentForSendMail.append(oleDeliverBatchService.generateMailContentFromPatronBill(oleLoanDocument, oleLoanDocument.getOlePatron(), feeTypeName, String.valueOf(new KualiDecimal(fineAmount)), patronBillPayment));
         OleMailer oleMail = GlobalResourceLoader.getService("oleMailer");
         String replyToEmail = getCircDeskLocationResolver().getReplyToEmail(oleLoanDocument.getItemLocation());
         if (replyToEmail != null) {

diff --git a/...p/olefs/src/main/java/org/kuali/ole/deliver/controller/checkin/CheckinBaseController.java b/...p/olefs/src/main/java/org/kuali/ole/deliver/controller/checkin/CheckinBaseController.java
@@ -21,6 +21,7 @@
 import org.kuali.ole.deliver.notice.executors.HoldExpirationNoticesExecutor;
 import org.kuali.ole.deliver.notice.executors.MissingPieceNoticesExecutor;
 import org.kuali.ole.deliver.notice.executors.OnHoldNoticesExecutor;
+import org.kuali.ole.deliver.service.OleDeliverRequestDocumentHelperServiceImpl;
 import org.kuali.ole.deliver.service.OleLoanDocumentDaoOjb;
 import org.kuali.ole.deliver.service.ParameterValueResolver;
 import org.kuali.ole.deliver.util.*;
@@ -87,6 +88,7 @@ public abstract class CheckinBaseController extends CircUtilController {
     private MissingPieceNoteHandler missingPieceNoteHandler;
     private OleLoanDocumentsFromSolrBuilder oleLoanDocumentsFromSolrBuilder;
     private OleLoanDocumentDaoOjb loanDaoOjb;
+    private OleDeliverRequestDocumentHelperServiceImpl oleDeliverRequestDocumentHelperService;
 
     public OnHoldCourtesyNoticeUtil getOnHoldCourtesyNoticeUtil() {
         if (null == onHoldCourtesyNoticeUtil) {
@@ -140,7 +142,15 @@ public DroolsResponse checkin(OLEForm oleForm) {
         DroolsResponse droolsResponse = null;
         if (null != itemRecord) {
             OleLoanDocument loanDocument = getLoanDocument(itemBarcode);
-            setDataElements(oleForm, itemRecord, loanDocument);
+
+            try {
+                loanDocument = getOleDeliverRequestDocumentHelperService().getLoanDocumentWithItemInfo(loanDocument, false);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+
+                setDataElements(oleForm, itemRecord, loanDocument);
             droolsResponse = preValidations(itemRecord, oleForm);
             if (null != droolsResponse) {
                 return droolsResponse;
@@ -158,6 +168,13 @@ public DroolsResponse checkin(OLEForm oleForm) {
         return droolsResponse;
     }
 
+    public OleDeliverRequestDocumentHelperServiceImpl getOleDeliverRequestDocumentHelperService() {
+        if (oleDeliverRequestDocumentHelperService == null) {
+            oleDeliverRequestDocumentHelperService = new OleDeliverRequestDocumentHelperServiceImpl();
+        }
+        return oleDeliverRequestDocumentHelperService;
+    }
+
     private void transferExchangeInfoFromDroolsResponseToCheckinForm(OLEForm oleForm, DroolsResponse droolsResponse) {
         for (Iterator<String> iterator = droolsResponse.getDroolsExchange().getContext().keySet().iterator(); iterator.hasNext(); ) {
             String key = iterator.next();