#219 show receipt/invoice link only for the new orders

Author: syjer

src/main/java/alfio/controller/InvoiceReceiptController.java

@@ -60,7 +60,7 @@ public InvoiceReceiptController(EventRepository eventRepository,
     }
 
     private ResponseEntity<Void> handleReservationWith(String eventName, String reservationId, HttpServletResponse response, BiFunction<Event, TicketReservation, ResponseEntity<Void>> with) {
-        ResponseEntity<Void> notFound = ResponseEntity.<Void>notFound().build();
+        ResponseEntity<Void> notFound = ResponseEntity.notFound().build();
         return eventRepository.findOptionalByShortName(eventName).map(event -> {
             return ticketReservationManager.findById(reservationId).map(ticketReservation -> {
                 return with.apply(event, ticketReservation);
@@ -93,7 +93,7 @@ public ResponseEntity<Void> getReceipt(@PathVariable("eventName") String eventNa
                                      @PathVariable("reservationId") String reservationId,
                                      HttpServletResponse response) {
         return handleReservationWith(eventName, reservationId, response, (event, reservation) -> {
-            if(reservation.getInvoiceNumber() != null) {
+            if(reservation.getInvoiceNumber() != null || !reservation.getHasInvoiceOrReceiptDocument()) {
                 return ResponseEntity.notFound().build();
             }
 
@@ -108,7 +108,7 @@ public void getInvoice(@PathVariable("eventName") String eventName,
                            @PathVariable("reservationId") String reservationId,
                            HttpServletResponse response) {
         handleReservationWith(eventName, reservationId, response, (event, reservation) -> {
-            if(reservation.getInvoiceNumber() == null) {
+            if(reservation.getInvoiceNumber() == null || !reservation.getHasInvoiceOrReceiptDocument()) {
                 return ResponseEntity.notFound().build();
             }
 

src/main/java/alfio/model/TicketReservation.java

@@ -113,4 +113,8 @@ public String getFullName() {
     public boolean getHasInvoiceNumber() {
         return invoiceNumber != null;
     }
+
+    public boolean getHasInvoiceOrReceiptDocument() {
+        return invoiceModel != null;
+    }
 }

src/main/webapp/WEB-INF/templates/event/reservation-page-complete.ms

@@ -98,6 +98,7 @@
 <div class="text-center">
     {{#i18n}}reservation-page-complete.order-information [{{reservation.id}}] [{{reservation.fullName}}]{{/i18n}}
 </div>
+{{#reservation.hasInvoiceOrReceiptDocument}}
 <div class="text-center">
     {{#reservation.hasInvoiceNumber}}
         <a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/invoice" target="_blank">{{#i18n}}reservation-page-complete.download-your-invoice{{/i18n}}</a>
@@ -106,6 +107,7 @@
         <a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/receipt" target="_blank">{{#i18n}}reservation-page-complete.download-your-receipt{{/i18n}}</a>
     {{/reservation.hasInvoiceNumber}}
 </div>
+{{/reservation.hasInvoiceOrReceiptDocument}}
 <div class="text-center wMarginTop30px">
     <span class="text-muted"><a href="https://alf.io" title="{{#i18n}}alfio.credits{{/i18n}}" target="_blank">{{#i18n}}alfio.credits{{/i18n}}</a></span>
 </div>

src/main/webapp/WEB-INF/templates/event/reservation-waiting-for-payment.ms

@@ -19,6 +19,7 @@
 <div class="text-center wMarginTop">
     <h4>{{#i18n}}reservation-page-waiting.questions [{{emailAddress}}] [{{reservation.id}}]{{/i18n}}</h4>
 </div>
+{{#reservation.hasInvoiceOrReceiptDocument}}
 <div class="text-center">
     <h4>
     {{#reservation.hasInvoiceNumber}}
@@ -29,6 +30,7 @@
     {{/reservation.hasInvoiceNumber}}
     </h4>
 </div>
+{{/reservation.hasInvoiceOrReceiptDocument}}
 <div class="wMarginBottom">&nbsp;</div>
 <div class="container-fluid" id="back-to-event-site">
     <div class="pull-left"><a href="{{event.websiteUrl}}" class="btn btn-default">{{#i18n}}to-event-site{{/i18n}}</a></div>