#219 initial work for setting the bank instructions in the invoice

Author: syjer

src/main/java/alfio/controller/ReservationController.java

@@ -37,6 +37,7 @@
 import alfio.util.ErrorsCode;
 import alfio.util.TemplateManager;
 import alfio.util.TemplateResource;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +61,7 @@
 
 import static alfio.model.system.ConfigurationKeys.ALLOW_FREE_TICKETS_CANCELLATION;
 import static alfio.model.system.ConfigurationKeys.BANK_ACCOUNT_NR;
+import static alfio.model.system.ConfigurationKeys.BANK_ACCOUNT_OWNER;
 import static java.util.stream.Collectors.toList;
 
 @Controller
@@ -338,6 +340,12 @@ public String showWaitingPaymentPage(@PathVariable("eventName") String eventName
             model.addAttribute("paymentReason", ev.getShortName() + " " + ticketReservationManager.getShortReservationID(ev, reservationId));
             model.addAttribute("pageTitle", "reservation-page-waiting.header.title");
             model.addAttribute("bankAccount", configurationManager.getStringConfigValue(Configuration.from(ev.getOrganizationId(), ev.getId(), BANK_ACCOUNT_NR)).orElse(""));
+
+
+            Optional<String> maybeAccountOwner = configurationManager.getStringConfigValue(Configuration.from(ev.getOrganizationId(), ev.getId(), BANK_ACCOUNT_OWNER));
+            model.addAttribute("hasBankAccountOwnerSet", maybeAccountOwner.isPresent());
+            model.addAttribute("bankAccountOwner", Arrays.asList(maybeAccountOwner.orElse("").split("\n")));
+
             model.addAttribute("expires", ZonedDateTime.ofInstant(ticketReservation.getValidity().toInstant(), ev.getZoneId()));
             model.addAttribute("event", ev);
             return "/event/reservation-waiting-for-payment";

src/main/java/alfio/manager/TicketReservationManager.java

@@ -438,7 +438,9 @@ public Map<String, Object> prepareModelForReservationEmail(Event event, TicketRe
         String reservationUrl = reservationUrl(reservation.getId());
         String reservationShortID = getShortReservationID(event, reservation.getId());
         Optional<String> invoiceAddress = configurationManager.getStringConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), ConfigurationKeys.INVOICE_ADDRESS));
-        return TemplateResource.prepareModelForConfirmationEmail(organization, event, reservation, vat, tickets, summary, reservationUrl, reservationShortID, invoiceAddress);
+        Optional<String> bankAccountNr = configurationManager.getStringConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), ConfigurationKeys.BANK_ACCOUNT_NR));
+        Optional<String> bankAccountOwner = configurationManager.getStringConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), ConfigurationKeys.BANK_ACCOUNT_OWNER));
+        return TemplateResource.prepareModelForConfirmationEmail(organization, event, reservation, vat, tickets, summary, reservationUrl, reservationShortID, invoiceAddress, bankAccountNr, bankAccountOwner);
     }
 
     @Transactional(readOnly = true)

src/main/java/alfio/model/system/ConfigurationKeys.java

@@ -66,6 +66,7 @@ public enum ConfigurationKeys {
     OFFLINE_PAYMENT_DAYS("Maximum number of days allowed to pay an offline ticket", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXT, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), true),
     OFFLINE_REMINDER_HOURS("How many hours before expiration should be sent a reminder e-mail for offline payments?", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXT, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), true),
     BANK_ACCOUNT_NR("Bank Account number", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXT, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), false),
+    BANK_ACCOUNT_OWNER("Bank Account owner", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXTAREA, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), false),
     PARTIAL_RESERVATION_ID_LENGTH("Partial reservationID length", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),
     //
 

src/main/java/alfio/util/TemplateResource.java

@@ -216,7 +216,7 @@ private static Map<String, Object> prepareSampleDataForConfirmationEmail(Organiz
             Collections.singletonList(new SummaryRow("Ticket", "10.00", 1, "10.00", 1000, SummaryRow.SummaryType.TICKET)), false, "10.00", "0.80", false, false, "8");
         String reservationUrl = "http://your-domain.tld/reservation-url/";
         String reservationShortId = "597e7e7b";
-        return prepareModelForConfirmationEmail(organization, event, reservation, vat, tickets, orderSummary, reservationUrl, reservationShortId, Optional.empty());
+        return prepareModelForConfirmationEmail(organization, event, reservation, vat, tickets, orderSummary, reservationUrl, reservationShortId, Optional.of("My Invoice\nAddress"), Optional.empty(), Optional.empty());
     }
 
     //used by multiple enum:
@@ -235,7 +235,9 @@ public static Map<String, Object> prepareModelForConfirmationEmail(Organization
                                                                        OrderSummary orderSummary,
                                                                        String reservationUrl,
                                                                        String reservationShortID,
-                                                                       Optional<String> invoiceAddress) {
+                                                                       Optional<String> invoiceAddress,
+                                                                       Optional<String> bankAccountNr,
+                                                                       Optional<String> bankAccountOwner) {
         Map<String, Object> model = new HashMap<>();
         model.put("organization", organization);
         model.put("event", event);
@@ -261,6 +263,17 @@ public static Map<String, Object> prepareModelForConfirmationEmail(Organization
             model.put("invoiceAddressAsList", Arrays.asList(StringUtils.split(addr, '\n')));
         });
 
+        model.put("hasBankAccountNr", bankAccountNr.isPresent());
+        bankAccountNr.ifPresent(nr -> {
+            model.put("bankAccountNr", nr);
+        });
+
+        model.put("isOfflinePayment", reservation.getStatus() == TicketReservation.TicketReservationStatus.OFFLINE_PAYMENT);
+        model.put("hasBankAccountOnwer", bankAccountOwner.isPresent());
+        bankAccountOwner.ifPresent(owner -> {
+            model.put("bankAccountOnwer", StringUtils.replace(owner, "\n", ", "));
+            model.put("bankAccountOnwerAsList", Arrays.asList(StringUtils.split(owner, '\n')));
+        });
 
         return model;
     }

src/main/resources/alfio/templates/invoice.ms

@@ -37,6 +37,16 @@
             .border-bottom {
                 border-bottom:1px solid black;
             }
+
+            table.summary {
+                border-collapse:collapse;
+            }
+
+            table.summary, table.summary th, table.summary td {
+                border: 1px solid #aaa;
+                padding:0;
+                margin:0;
+            }
 		</style>
 	</head>
 	<body>
@@ -85,7 +95,7 @@
 <p>{{ticketReservation.email}}</p>
 
 <h3  class="border-bottom">{{#i18n}}email-confirmation.reservation-summary{{/i18n}}</h3>
-<table style="width:100%">
+<table style="width:100%" class="summary">
     <thead>
         <tr>
             <th>{{#i18n}}reservation-page.category{{/i18n}}</th>