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.

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

fix-9127: Add the unique ticket code into the downlad CSV file #9134

Merged
merged 6 commits into from Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/api/helpers/csv_jobs_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def get_order_ticket_data(attendee, order, ticket):
ticketId = ''
if order.identifier:
if not attendee.identifier:
ticketId = order.identifier + '-' + attendee.get_new_identifier()
ticketId = order.identifier + '-' + str(attendee.id)
else:
ticketId = order.identifier + '-' + attendee.identifier

Expand Down
7 changes: 1 addition & 6 deletions app/models/ticket_holder.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def qr_code(self):
)
identifier = self.identifier
if not self.identifier:
identifier = get_new_id()
identifier = str(self.id)

qr.add_data(self.order.identifier + "-" + identifier)
qr.make(fit=True)
Expand Down Expand Up @@ -155,8 +155,3 @@ def pdf_url_path(self) -> str:
+ self.order.identifier
+ '.pdf'
)

@staticmethod
def get_new_identifier():
"""Generate a new identifier for the ticket holder."""
return str(binascii.b2a_hex(os.urandom(3)), 'utf-8')
4 changes: 2 additions & 2 deletions app/templates/pdf/attendees_pdf.html
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ <h3 style="text-align:center;">{{ holders[0].event.name }} - {{ ("Attendees List
{{ "Free Ticket" }} <br>
{% endif %}
{% if holder.identifier %}
{{ holder.order.identifier }} - {{ holder.identifier }} <br>
{{ holder.order.identifier }}-{{ holder.identifier }} <br>
{% else %}
{{ holder.order.identifier }} - {{ holder.get_new_identifier()}}<br>
{{ holder.order.identifier }}-{{ holder.id }} <br>
{% endif %}
{{ holder.ticket.name }}<br>
{% if holder.is_checked_in %}
Expand Down