implement: #447, add the possibility to configure the auto-removal of…

… expired offline-payment (#452) * implement: #447, add the possibility to configure the auto-removal of expired offline-payment * update #447 -> change key name * update #447 -> fix condition
alfio-event · May 25, 2018 · a08598f · a08598f
1 parent 9e419bb
commit a08598f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/main/java/alfio/manager/TicketReservationManager.java b/src/main/java/alfio/manager/TicketReservationManager.java
@@ -724,7 +724,13 @@ void cleanupExpiredOfflineReservations(Date expirationDate) {
     private void cleanupOfflinePayment(String reservationId) {
         try {
             requiresNewTransactionTemplate.execute((tc) -> {
-                deleteOfflinePayment(eventRepository.findByReservationId(reservationId), reservationId, true);
+                Event event = eventRepository.findByReservationId(reservationId);
+                boolean enabled = configurationManager.getBooleanConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT), true);
+                if(enabled) {
+                    deleteOfflinePayment(event, reservationId, true);
+                } else {
+                    log.debug("Will not cleanup reservation with id {} because the automatic removal has been disabled", reservationId);
+                }
                 return null;
             });
         } catch (Exception e) {

diff --git a/src/main/java/alfio/model/system/ConfigurationKeys.java b/src/main/java/alfio/model/system/ConfigurationKeys.java
@@ -89,6 +89,7 @@ public enum ConfigurationKeys {
     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), true),
+    AUTOMATIC_REMOVAL_EXPIRED_OFFLINE_PAYMENT("Cancel Reservation automatically when payment is overdue", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.BOOLEAN, false, EnumSet.of(SYSTEM, ORGANIZATION, EVENT), true),
     PARTIAL_RESERVATION_ID_LENGTH("Partial reservationID length", false, SettingCategory.PAYMENT_OFFLINE, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true),
     //
 

diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/event.html
@@ -99,6 +99,20 @@ <h2>Payment</h2>
                 </div>
             </div>
 
+            <div data-ng-if="eventConf.paymentOffline" class="panel panel-default">
+                <div class="panel-heading">
+                    <div class="panel-title"><i class="fa fa-exchange"></i> Offline payment configuration</div>
+                </div>
+                <div class="panel-body">
+                    <div class="alert alert-info">
+                        <p><i class="fa fa-info-circle"></i> In order to be able to accept offline payments, you must fill your <strong>Bank Account</strong> data.</p>
+                    </div>
+                    <div data-ng-repeat="setting in eventConf.paymentOffline.settings">
+                        <setting data-obj="setting" data-display-delete-if-needed="true" data-delete-handler="eventConf.delete(config)"  ></setting>
+                    </div>
+                </div>
+            </div>
+
 
             <div class="page-header">
                 <h2>Internationalization</h2>