Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added voucher code in attendees data #1449

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added voucher code in attendees data #1449

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dbb6c6
Added voucher code in attendees data
Dec 1, 2023
3cbe0f1
Merge branch 'alfio-event:master' into master
sergyer Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/alfio/controller/api/admin/EventApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public ResponseEntity<String> rearrangeCategories(@PathVariable("eventName") Str
}

private static final String PAYMENT_METHOD = "Payment Method";
private static final List<String> FIXED_FIELDS = Arrays.asList("ID", "Category", "Event", "Status", "OriginalPrice", "PaidPrice", "Discount", "VAT", "ReservationID", "Full Name", "First Name", "Last Name", "E-Mail", "Locked", "Language", "Confirmation", "Billing Address", "Country Code", "Payment ID", PAYMENT_METHOD);
private static final List<String> FIXED_FIELDS = Arrays.asList("ID", "Category", "Event", "Status", "OriginalPrice", "PaidPrice", "Discount", "VAT", "ReservationID", "Full Name", "First Name", "Last Name", "E-Mail", "Locked", "Language", "Confirmation", "Billing Address", "Country Code", "Voucher Code", "Payment ID", PAYMENT_METHOD);
private static final List<SerializablePair<String, String>> FIXED_PAIRS = FIXED_FIELDS.stream().map(f -> SerializablePair.of(f, f)).toList();
private static final String FISCAL_CODE = "Fiscal Code";
private static final String REFERENCE_TYPE = "Reference Type";
Expand Down Expand Up @@ -415,6 +415,7 @@ private Stream<String[]> exportLines(String eventName, Principal principal, List
if(fields.contains("Confirmation")) {line.add(reservation.getConfirmationTimestamp().withZoneSameInstant(eventZoneId).toString());}
if(fields.contains("Billing Address")) {line.add(reservation.getBillingAddress());}
if(fields.contains("Country Code")) {line.add(reservation.getVatCountryCode());}
if(fields.contains("Voucher Code")) {line.add(trs.getPromoCode());}
boolean paymentIdRequested = fields.contains("Payment ID");
boolean paymentGatewayRequested = fields.contains(PAYMENT_METHOD);
if((paymentIdRequested || paymentGatewayRequested)) {
Expand Down
Loading