#573 add admin modification

alfio-event · Jan 2, 2019 · 36590ef · 36590ef
1 parent d24933d
commit 36590ef
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/main/java/alfio/manager/AdminReservationManager.java b/src/main/java/alfio/manager/AdminReservationManager.java
@@ -218,6 +218,8 @@ private Result<Boolean> performUpdate(String reservationId, Event event, TicketR
                 ticketReservationRepository.updateBillingData(r.getVatStatus(), customerData.getVatNr(), customerData.getVatCountryCode(), r.isInvoiceRequested(), reservationId);
             }
 
+            ticketReservationRepository.updateInvoicingAdditionalInformation(reservationId, Json.toJson(arm.getCustomerData().getInvoicingAdditionalInfo()));
+
         }
         Date d = new Date();
         arm.getTicketsInfo().stream()

diff --git a/src/main/java/alfio/manager/AdminReservationRequestManager.java b/src/main/java/alfio/manager/AdminReservationRequestManager.java
@@ -172,7 +172,7 @@ private Stream<AdminReservationModification> spread(AdminReservationModification
             .map(p -> {
                 AdminReservationModification.Attendee attendee = p.getLeft();
                 String language = StringUtils.defaultIfBlank(attendee.getLanguage(), src.getLanguage());
-                CustomerData cd = new CustomerData(attendee.getFirstName(), attendee.getLastName(), attendee.getEmailAddress(), null, language, null, null, null);
+                CustomerData cd = new CustomerData(attendee.getFirstName(), attendee.getLastName(), attendee.getEmailAddress(), null, language, null, null, null, null);
                 return new AdminReservationModification(src.getExpiration(), cd, singletonList(p.getRight()), language, src.isUpdateContactData(), src.getNotification());
             });
     }

diff --git a/src/main/java/alfio/model/modification/AdminReservationModification.java b/src/main/java/alfio/model/modification/AdminReservationModification.java
@@ -16,6 +16,8 @@
  */
 package alfio.model.modification;
 
+import alfio.model.BillingDetails;
+import alfio.model.TicketReservationInvoicingAdditionalInfo;
 import alfio.util.Json;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -69,6 +71,7 @@ public static class CustomerData {
         private final String customerReference;
         private final String vatNr;
         private final String vatCountryCode;
+        private final TicketReservationInvoicingAdditionalInfo invoicingAdditionalInfo;
 
         @JsonCreator
         public CustomerData(@JsonProperty("firstName") String firstName,
@@ -78,7 +81,8 @@ public CustomerData(@JsonProperty("firstName") String firstName,
                             @JsonProperty("userLanguage") String userLanguage,
                             @JsonProperty("customerReference") String customerReference,
                             @JsonProperty("vatNr") String vatNr,
-                            @JsonProperty("vatCountryCode") String vatCountryCode) {
+                            @JsonProperty("vatCountryCode") String vatCountryCode,
+                            @JsonProperty("invoicingAdditionalInfo") TicketReservationInvoicingAdditionalInfo invoicingAdditionalInfo) {
             this.firstName = trimToEmpty(firstName);
             this.lastName = trimToEmpty(lastName);
             this.emailAddress = trimToEmpty(emailAddress);
@@ -87,6 +91,7 @@ public CustomerData(@JsonProperty("firstName") String firstName,
             this.customerReference = customerReference;
             this.vatNr = vatNr;
             this.vatCountryCode = vatCountryCode;
+            this.invoicingAdditionalInfo = invoicingAdditionalInfo;
         }
 
         public String getFullName() {
@@ -220,7 +225,8 @@ private static CustomerData summaryForCustomerData(CustomerData in) {
                 placeholderIfNotEmpty(in.userLanguage),
                 placeholderIfNotEmpty(in.customerReference),
                 placeholderIfNotEmpty(in.vatNr),
-                placeholderIfNotEmpty(in.vatCountryCode));
+                placeholderIfNotEmpty(in.vatCountryCode),
+                in.invoicingAdditionalInfo);
         }
         else return null;
     }

diff --git a/src/main/webapp/resources/js/admin/feature/reservation/view/reservation-view.html b/src/main/webapp/resources/js/admin/feature/reservation/view/reservation-view.html
@@ -195,19 +195,29 @@ <h3>Contact info</h3>
                             <div class="form-group">
                                 <div class="form-group">
                                     <label>Codice Fiscale</label>
-                                    <div class="form-control-static" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.fiscalCode"></div>
+                                    <div class="form-control-static" ng-if="!$ctrl.reservation.updateContactData" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.fiscalCode"></div>
+                                    <input class="form-control" ng-if="$ctrl.reservation.updateContactData" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.fiscalCode">
                                 </div>
                             </div>
                         </div>
+                        <div class="col-xs-12" ng-if="$ctrl.reservation.updateContactData">
+                            <div class="form-group">
+                                <label><input type="radio" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType" value="ADDRESSEE_CODE"> Codice destinatario</label>
+                                <label><input type="radio" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType" value="PEC"> PEC</label>
+                                <label><input type="radio" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType" value="NONE"> Nessun codice destinatario o PEC</label>
+                            </div>
+                        </div>
                         <div class="col-xs-12 col-sm-6">
                             <div class="form-group">
                                 <div class="form-group" data-ng-if="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType === 'ADDRESSEE_CODE'">
                                     <label>Codice destinatario</label>
-                                    <div class="form-control-static" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.addresseeCode"></div>
+                                    <div class="form-control-static" ng-if="!$ctrl.reservation.updateContactData" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.addresseeCode"></div>
+                                    <input class="form-control" ng-if="$ctrl.reservation.updateContactData" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.addresseeCode">
                                 </div>
                                 <div class="form-group" data-ng-if="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType === 'PEC'">
                                     <label>PEC</label>
-                                    <div class="form-control-static" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.pec"></div>
+                                    <div class="form-control-static" ng-if="!$ctrl.reservation.updateContactData" ng-bind="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.pec"></div>
+                                    <input class="form-control" ng-if="$ctrl.reservation.updateContactData" ng-model="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.pec">
                                 </div>
                                 <div class="form-group" data-ng-if="$ctrl.reservation.customerData.invoicingAdditionalInfo.italianEInvoicing.referenceType === 'NONE'">
                                     <label>Nessun codice destinatario o PEC</label>