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

Redesign ticketing #767

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Generated by Django 5.0.4 on 2025-01-02 07:07

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("clubs", "0117_clubapprovalresponsetemplate"),
]

operations = [
migrations.RemoveField(model_name="event", name="ticket_drop_time",),
migrations.RemoveField(model_name="event", name="ticket_order_limit",),
migrations.CreateModel(
name="TicketSettings",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("order_limit", models.IntegerField(blank=True, null=True)),
("drop_time", models.DateTimeField(blank=True, null=True)),
("fee_charged_to_buyer", models.BooleanField(default=False)),
(
"event",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
related_name="ticket_settings",
to="clubs.event",
),
),
],
),
]
18 changes: 18 additions & 0 deletions backend/clubs/migrations/0119_alter_ticketsettings_order_limit.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2025-01-04 01:23

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("clubs", "0118_remove_event_ticket_drop_time_and_more"),
]

operations = [
migrations.AlterField(
model_name="ticketsettings",
name="order_limit",
field=models.IntegerField(blank=True, default=10, null=True),
),
]
18 changes: 18 additions & 0 deletions backend/clubs/migrations/0120_ticketsettings_active.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.0.4 on 2025-01-16 19:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("clubs", "0119_alter_ticketsettings_order_limit"),
]

operations = [
migrations.AddField(
model_name="ticketsettings",
name="active",
field=models.BooleanField(default=True),
),
]
24 changes: 22 additions & 2 deletions backend/clubs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -940,8 +940,6 @@
parent_recurring_event = models.ForeignKey(
RecurringEvent, on_delete=models.CASCADE, blank=True, null=True
)
ticket_order_limit = models.IntegerField(default=10)
ticket_drop_time = models.DateTimeField(null=True, blank=True)

OTHER = 0
RECRUITMENT = 1
Expand Down Expand Up @@ -969,6 +967,10 @@
def create_thumbnail(self, request=None):
return create_thumbnail_helper(self, request, 400)

@property
def has_tickets(self):
return self.tickets.exists()

def __str__(self):
return self.name

Expand Down Expand Up @@ -1821,6 +1823,24 @@
checkout_context = models.CharField(max_length=8297, blank=True, null=True)


class TicketSettings(models.Model):
"""
Configuration settings for events that have tickets.
Only created when an event has associated tickets created.
"""

event = models.OneToOneField(
Event, on_delete=models.CASCADE, related_name="ticket_settings"
)
order_limit = models.IntegerField(default=10, null=True, blank=True)
drop_time = models.DateTimeField(null=True, blank=True)
fee_charged_to_buyer = models.BooleanField(default=False)
active = models.BooleanField(default=True)

def __str__(self):
return f"Ticket settings for {self.event.name}"

Check warning on line 1841 in backend/clubs/models.py

View check run for this annotation

Codecov / codecov/patch

backend/clubs/models.py#L1841

Added line #L1841 was not covered by tests


class TicketQuerySet(models.query.QuerySet):
def delete(self):
if self.filter(transaction_record__isnull=False).exists():
Expand Down
1 change: 1 addition & 0 deletions backend/clubs/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ def has_object_permission(self, request, view, obj):
"create_tickets",
"issue_tickets",
"email_blast",
"toggle_sales",
]:
if not request.user.is_authenticated:
return False
Expand Down
Loading
Loading