enable deposit advancement in payment options interface ACDM-1590 #re…

…solve (#1461)
FenixEdu · Feb 7, 2019 · bcb6e8a · bcb6e8a
1 parent 457515e
commit bcb6e8a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...in/java/org/fenixedu/academic/ui/spring/controller/AccountingEventForOwnerController.java b/...in/java/org/fenixedu/academic/ui/spring/controller/AccountingEventForOwnerController.java
@@ -95,6 +95,7 @@ public String doPayment(@PathVariable Event event, Model model, User loggedUser)
             model.addAttribute("fines", fines);
             model.addAttribute("debts", debts);
             model.addAttribute("paymentCodeEntries", paymentCodeEntries);
+            model.addAttribute("availableAdvancements", Event.availableAdvancements(loggedUser.getPerson()));
 
             return view("event-payment-options");
         }

diff --git a/src/main/webapp/WEB-INF/fenixedu-academic/accounting/event-payment-options.jsp b/src/main/webapp/WEB-INF/fenixedu-academic/accounting/event-payment-options.jsp
@@ -121,6 +121,23 @@
                 </div>
             </div>
         </c:if>
+        <div class="row">
+            <h2>
+                <spring:message code="label.payment.methods" text="Payment Methods"/>
+            </h2>
+        </div>
+
+        <c:if test="${not empty availableAdvancements}">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="overall-description">
+                        <spring:url value="owner-accounting-events" var="eventContextPrefix" scope="request"/>
+                        <jsp:include page="event-depositAdvancment.jsp"/>
+                    </div>
+                </div>
+            </div>
+        </c:if>
+
         <c:if test="${not empty paymentCodeEntries}">
             <div class="row">
                 <div class="col-xs-12 col-md-4">