Skip to content

Commit

Permalink
#573 fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
syjer committed Dec 31, 2018
1 parent 657fae2 commit 59c3fd0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions src/main/java/alfio/controller/ReservationController.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@
import alfio.model.system.Configuration;
import alfio.model.system.ConfigurationKeys;
import alfio.model.transaction.PaymentProxy;
import alfio.model.user.Organization;
import alfio.repository.EventRepository;
import alfio.repository.TicketFieldRepository;
import alfio.repository.TicketReservationRepository;
import alfio.repository.user.OrganizationRepository;
import alfio.util.ErrorsCode;
import alfio.util.TemplateManager;
import alfio.util.TemplateResource;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -270,7 +268,7 @@ public String validateToOverview(@PathVariable("eventName") String eventName, @P
contactAndTicketsForm.getBillingAddressZip(), contactAndTicketsForm.getBillingAddressCity(), contactAndTicketsForm.getVatCountryCode(),
contactAndTicketsForm.getCustomerReference(), contactAndTicketsForm.getVatNr(), contactAndTicketsForm.isInvoiceRequested(),
contactAndTicketsForm.canSkipVatNrCheck(), false);
ticketReservationManager.updateReservationInvoicingAdditionalInformations(reservationId,
ticketReservationManager.updateReservationInvoicingAdditionalInformation(reservationId,
new TicketReservationInvoicingAdditionalInfo(
new BillingDetails.ItalianEInvoicing(contactAndTicketsForm.getItalyEInvoicingFiscalCode(),
contactAndTicketsForm.getItalyEInvoicingReferenceType(),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/alfio/manager/TicketReservationManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -1573,7 +1573,7 @@ public void updateReservation(String reservationId, CustomerName customerName, S
validated);
}

public void updateReservationInvoicingAdditionalInformations(String reservationId, TicketReservationInvoicingAdditionalInfo ticketReservationInvoicingAdditionalInfo) {
ticketReservationRepository.updateInvoicingAdditionalInformations(reservationId, Json.toJson(ticketReservationInvoicingAdditionalInfo));
public void updateReservationInvoicingAdditionalInformation(String reservationId, TicketReservationInvoicingAdditionalInfo ticketReservationInvoicingAdditionalInfo) {
ticketReservationRepository.updateInvoicingAdditionalInformation(reservationId, Json.toJson(ticketReservationInvoicingAdditionalInfo));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ public TicketReservationAdditionalInfo(@Column("billing_address_company") String
@Column("billing_address_city") String billingAddressCity,
@Column("validated_for_overview") Boolean validated,
@Column("skip_vat_nr") Boolean skipVatNr,
@Column("invoicing_additional_informations") String invoicingAdditionalInformations) {
@Column("invoicing_additional_information") String invoicingAdditionalInformation) {
this.billingAddressCompany = billingAddressCompany;
this.billingAddressLine1 = billingAddressLine1;
this.billingAddressLine2 = billingAddressLine2;
this.billingAddressZip = billingAddressZip;
this.billingAddressCity = billingAddressCity;
this.validated = validated;
this.skipVatNr = skipVatNr;
this.invoicingAdditionalInfo = invoicingAdditionalInformations == null ? new TicketReservationInvoicingAdditionalInfo(null) :
Json.fromJson(invoicingAdditionalInformations, TicketReservationInvoicingAdditionalInfo.class);
this.invoicingAdditionalInfo = invoicingAdditionalInformation == null ? new TicketReservationInvoicingAdditionalInfo(null) :
Json.fromJson(invoicingAdditionalInformation, TicketReservationInvoicingAdditionalInfo.class);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ int updateTicketReservationWithValidation(@Bind("reservationId") String reservat


@Query("select billing_address_company, billing_address_line1, billing_address_line2, " +
" billing_address_zip, billing_address_city, validated_for_overview, skip_vat_nr, invoicing_additional_informations from tickets_reservation where id = :id")
" billing_address_zip, billing_address_city, validated_for_overview, skip_vat_nr, invoicing_additional_information from tickets_reservation where id = :id")
TicketReservationAdditionalInfo getAdditionalInfo(@Bind("id") String reservationId);

@Query("update tickets_reservation set validated_for_overview = :validated where id = :reservationId")
Expand Down Expand Up @@ -228,6 +228,6 @@ default Integer countTicketsInReservationForCategories(String reservationId, Col
@Query("select billing_address_company, billing_address_line1, billing_address_line2, billing_address_zip, billing_address_city, vat_nr, vat_country from tickets_reservation where id = :reservationId")
BillingDetails getBillingDetailsForReservation(@Bind("reservationId") String reservationId);

@Query("update tickets_reservation set invoicing_additional_informations = :info::json where id = :id")
int updateInvoicingAdditionalInformations(@Bind("id") String reservationId, @Bind("info") String info);
@Query("update tickets_reservation set invoicing_additional_information = :info::json where id = :id")
int updateInvoicingAdditionalInformation(@Bind("id") String reservationId, @Bind("info") String info);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@


--
alter table tickets_reservation add column invoicing_additional_informations jsonb;
alter table tickets_reservation add column invoicing_additional_information jsonb;

0 comments on commit 59c3fd0

Please sign in to comment.