#573 expose new data in ticket reservation

alfio-event · Dec 31, 2018 · 7f20ec4 · 7f20ec4
1 parent 59c3fd0
commit 7f20ec4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/alfio/model/FullTicketInfo.java b/src/main/java/alfio/model/FullTicketInfo.java
@@ -89,6 +89,7 @@ public FullTicketInfo(@Column("t_id") int id,
                           @Column("tr_billing_address_line2") String billingAddressLine2,
                           @Column("tr_billing_address_city") String billingAddressCity,
                           @Column("tr_billing_address_zip") String billingAddressZip,
+                          @Column("tr_invoicing_additional_information") String invoicingAdditionalInfo,
                           //
                           @Column("tc_id") int tcId,
                           @Column("tc_inception") ZonedDateTime tcUtcInception,
@@ -111,7 +112,8 @@ public FullTicketInfo(@Column("t_id") int id,
             lockedAssignment, userLanguage, ticketSrcPriceCts, ticketFinalPriceCts, ticketVatCts, ticketDiscountCts, extReference);
         this.ticketReservation = new TicketReservation(trId, trValidity, trStatus, trFullName, trFirstName, trLastName, trEmail, trBillingAddress,
                 trConfirmationTimestamp, trLatestReminder, trPaymentMethod, trReminderSent, trPromoCodeDiscountId, trAutomatic, resUserLanguage,
-            directAssignment, invoiceNumber, invoiceModel, reservationVatStatus, vatNr, vatCountry, invoiceRequested, usedVatPercent, vatIncluded, reservationCreationTimestamp, customerReference);
+            directAssignment, invoiceNumber, invoiceModel, reservationVatStatus, vatNr, vatCountry, invoiceRequested, usedVatPercent, vatIncluded, reservationCreationTimestamp, customerReference,
+            invoicingAdditionalInfo);
         this.ticketCategory = new TicketCategory(tcId, tcUtcInception, tcUtcExpiration, tcMaxTickets, tcName,
                 tcAccessRestricted, tcStatus, tcEventId, bounded, tcSrcPriceCts, code, validCheckInFrom, validCheckInTo,
                 ticketValidityStart, ticketValidityEnd);

diff --git a/src/main/java/alfio/model/TicketReservation.java b/src/main/java/alfio/model/TicketReservation.java
@@ -62,6 +62,7 @@ public enum TicketReservationStatus {
     private final Boolean vatIncluded;
     private final ZonedDateTime creationTimestamp;
     private final String customerReference;
+    private final TicketReservationInvoicingAdditionalInfo invoicingAdditionalInfo;
 
     public TicketReservation(@Column("id") String id,
                              @Column("validity") Date validity,
@@ -88,7 +89,8 @@ public TicketReservation(@Column("id") String id,
                              @Column("used_vat_percent") BigDecimal usedVatPercent,
                              @Column("vat_included") Boolean vatIncluded,
                              @Column("creation_ts") ZonedDateTime creationTimestamp,
-                             @Column("customer_reference") String customerReference) {
+                             @Column("customer_reference") String customerReference,
+                             @Column("invoicing_additional_information") String invoicingAdditionalInfo) {
         this.id = id;
         this.validity = validity;
         this.status = status;
@@ -115,6 +117,7 @@ public TicketReservation(@Column("id") String id,
         this.vatIncluded = vatIncluded;
         this.creationTimestamp = creationTimestamp;
         this.customerReference = customerReference;
+        this.invoicingAdditionalInfo = invoicingAdditionalInfo == null ? null : Json.fromJson(invoicingAdditionalInfo, TicketReservationInvoicingAdditionalInfo.class);
     }
 
     public boolean isStuck() {

diff --git a/src/main/java/alfio/model/TicketWithReservationAndTransaction.java b/src/main/java/alfio/model/TicketWithReservationAndTransaction.java
@@ -87,6 +87,7 @@ public TicketWithReservationAndTransaction(@Column("t_id") Integer id,
                                                @Column("tr_billing_address_line2") String billingAddressLine2,
                                                @Column("tr_billing_address_city") String billingAddressCity,
                                                @Column("tr_billing_address_zip") String billingAddressZip,
+                                               @Column("tr_invoicing_additional_information") String invoicingAdditionalInfo,
                                                //
                                                @Column("bt_id") Integer btId,
                                                @Column("bt_gtw_tx_id") String transactionId,
@@ -111,7 +112,8 @@ public TicketWithReservationAndTransaction(@Column("t_id") Integer id,
             billingAddress, confirmationTimestamp, latestReminder, paymentMethod,
             reminderSent, promoCodeDiscountId, automatic, trUserLanguage,
             directAssignmentRequested, invoiceNumber, invoiceModel, vatStatus, vatNr, vatCountryCode, invoiceRequested,
-            usedVadPercent, vatIncluded, reservationCreationTimestamp, customerReference);
+            usedVadPercent, vatIncluded, reservationCreationTimestamp, customerReference,
+            invoicingAdditionalInfo);
 
         this.billingDetails = new BillingDetails(billingAddressCompany, billingAddressLine1, billingAddressLine2, billingAddressZip, billingAddressCity, vatCountryCode, vatNr);
 

diff --git a/src/main/java/alfio/util/TemplateResource.java b/src/main/java/alfio/util/TemplateResource.java
@@ -222,7 +222,7 @@ private static TicketReservation sampleTicketReservation() {
             "Firstname Lastname", "FirstName", "Lastname", "email@email.tld", "billing address", ZonedDateTime.now(), ZonedDateTime.now(),
             PaymentProxy.STRIPE, true, null, false, "en", false, null, null, null, "123456",
             "CH", false, new BigDecimal("8.00"), true,
-            ZonedDateTime.now().minusMinutes(1), "PO-1234");
+            ZonedDateTime.now().minusMinutes(1), "PO-1234", null);
     }
 
     private static Map<String, Object> prepareSampleDataForConfirmationEmail(Organization organization, Event event) {

diff --git a/src/main/resources/alfio/db/PGSQL/afterMigrate__006_VIEW_reservation_and_ticket_and_tx.sql b/src/main/resources/alfio/db/PGSQL/afterMigrate__006_VIEW_reservation_and_ticket_and_tx.sql
@@ -49,6 +49,7 @@ create view reservation_and_ticket_and_tx as (select
     tickets_reservation.billing_address_line2 tr_billing_address_line2,
     tickets_reservation.billing_address_city tr_billing_address_city,
     tickets_reservation.billing_address_zip tr_billing_address_zip,
+    tickets_reservation.invoicing_additional_information tr_invoicing_additional_information,
 
     ticket.id t_id,
     ticket.uuid t_uuid,

diff --git a/src/main/webapp/resources/js/admin/feature/reservation/view/reservation-view.js b/src/main/webapp/resources/js/admin/feature/reservation/view/reservation-view.js
@@ -62,7 +62,8 @@
                     userLanguage: src.userLanguage,
                     vatNr: src.vatNr,
                     vatCountryCode: src.vatCountryCode,
-                    invoiceRequested: src.invoiceRequested
+                    invoiceRequested: src.invoiceRequested,
+                    invoicingAdditionalInfo: angular.copy(src.invoicingAdditionalInfo)
                 },
                 language: src.userLanguage
             };