diff --git a/src/main/jasperreports/ticket/ticket_bg.jrxml b/src/main/jasperreports/ticket/ticket_bg.jrxml index d8fe7d4..c7cad7f 100644 --- a/src/main/jasperreports/ticket/ticket_bg.jrxml +++ b/src/main/jasperreports/ticket/ticket_bg.jrxml @@ -7,13 +7,13 @@ "]]> - + - + @@ -30,10 +30,10 @@ - + - - + + @@ -48,7 +48,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -82,28 +82,28 @@ - + - + - + - + @@ -112,7 +112,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -134,14 +134,14 @@ - + - + @@ -150,7 +150,7 @@ - + @@ -159,21 +159,21 @@ - + - + - + @@ -190,7 +190,7 @@ - + @@ -206,10 +206,10 @@ - - JPrime 2025 entails acceptance of the Conditions for participation. This Ticket allows you to collect only ONE Badge. Lost or forgotten badges are not replaced! The organization does not take back any badges. Wearing an identification badge is mandatory to access the Conference space, as well as the Exhibition space. Anyone without a badge will be denied access to .\n" + -"In the event of excessive attendance, and for security reasons, the organizers reserve the right to prohibit access to the rooms. The internal rules of the venue space apply without reservation to all participants (no smoking in the venue).The organizers reserve the right to definitively exclude any person, without this giving the right to a refund, whose behavior or attitude is deemed unacceptable.\n" + -" is organized in an open spirit that allows everyone to participate. The organizers are vigilant about the smooth running of the conference. The speakers are informed that their presentation should not shock and respect all the participants. Any breach of propriety, or any event likely to disrupt the conference can be reported immediately to the organizers present on the site or by email at "]]> + + + + JPrime 2026 Conference venue! You will not be allowed to enter the conference rooms without a Badge."]]> diff --git a/src/main/jasperreports/ticket/ticket_en.jrxml b/src/main/jasperreports/ticket/ticket_en.jrxml index 8eb8f01..25ec6ab 100644 --- a/src/main/jasperreports/ticket/ticket_en.jrxml +++ b/src/main/jasperreports/ticket/ticket_en.jrxml @@ -7,13 +7,13 @@ "]]> - + - + @@ -209,7 +209,7 @@ - JPrime 2025 Conference venue! You will not be allowed to enter the conference rooms without a Badge."]]> + JPrime 2026 Conference venue! You will not be allowed to enter the conference rooms without a Badge."]]> diff --git a/src/main/java/site/controller/invoice/InvoiceExporter.java b/src/main/java/site/controller/invoice/InvoiceExporter.java index c33003e..364bd00 100644 --- a/src/main/java/site/controller/invoice/InvoiceExporter.java +++ b/src/main/java/site/controller/invoice/InvoiceExporter.java @@ -3,7 +3,6 @@ import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; -import java.math.RoundingMode; import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; @@ -23,7 +22,6 @@ import site.facade.BranchService; import site.model.Branch; -import site.model.TicketPrice; import static org.apache.commons.beanutils.PropertyUtils.getProperty; @@ -96,7 +94,7 @@ public static void main(String[] args) throws Exception { data.setInvoiceType("Проформа"); data.setPaymentType("пеймънт"); - String description = "jPrime 2025 билет за конференция"; + String description = "JPrime 2026 билет за конференция"; BigDecimal singlePriceWithVAT_Student = BigDecimal.valueOf(65.0); BigDecimal singlePriceWithVAT_Regular = BigDecimal.valueOf(170.0); diff --git a/src/main/java/site/controller/ticket/TicketExporter.java b/src/main/java/site/controller/ticket/TicketExporter.java index f69f074..a827141 100644 --- a/src/main/java/site/controller/ticket/TicketExporter.java +++ b/src/main/java/site/controller/ticket/TicketExporter.java @@ -80,7 +80,7 @@ public byte[] exportTicket(TicketData data, InvoiceLanguage language) { throw new RuntimeException(e); } - InputStream logoStream = getClass().getResourceAsStream("/ticket/jprime_ticket_logo_2025.svg"); + InputStream logoStream = getClass().getResourceAsStream("/ticket/jprime_ticket_logo_2026.png"); Map parameters = new HashMap<>(); parameters.put("logoStream", logoStream); @@ -113,13 +113,13 @@ public byte[] exportTicket(TicketData data, InvoiceLanguage language) { } } - //demonstration purposes only! + //for demonstration purposes only! public static void main(String[] args) throws Exception { TicketData data = new TicketData(); data.setOrganizer("JPrime Events"); - data.setEvent("JPrime " + "2025"); + data.setEvent("JPrime " + "2026"); data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Doychin Bondzhev", "Organizer")); - data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Iva Bondzheva", "Volunteer")); + data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Denislava Bondzheva", "Volunteer")); data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Hristo Kolev", "Visitor - Sponsored")); data.addDetail(new TicketDetail(UUID.randomUUID().toString(), "Venkat Subramaniam", "Speaker")); diff --git a/src/main/resources/ticket/jprime_ticket_logo_2026.png b/src/main/resources/ticket/jprime_ticket_logo_2026.png new file mode 100644 index 0000000..6235d5e Binary files /dev/null and b/src/main/resources/ticket/jprime_ticket_logo_2026.png differ diff --git a/src/main/webapp/tickets-register.jsp b/src/main/webapp/tickets-register.jsp index f3dd6b9..642fdc0 100644 --- a/src/main/webapp/tickets-register.jsp +++ b/src/main/webapp/tickets-register.jsp @@ -45,7 +45,6 @@
-

Buy conference tickets

<%--

--%> @@ -120,7 +119,7 @@

- + captcha

@@ -161,7 +160,6 @@ <%----%>

In case of questions, contact us at conference@jprime.io.

-

@@ -228,14 +226,17 @@ case 0: $(this).attr("id", "visitors" + index + ".name"); $(this).attr("name", "visitors[" + index + "].name"); + $(this).val(""); break; case 1: $(this).attr("id", "visitors" + index + ".email"); $(this).attr("name", "visitors[" + index + "].email"); + $(this).val(""); break; case 2: $(this).attr("id", "visitors" + index + ".company"); $(this).attr("name", "visitors[" + index + "].company"); + $(this).val(""); break; } });