diff --git a/manage_events/forms.py b/manage_events/forms.py index 02d2e90..01924b8 100644 --- a/manage_events/forms.py +++ b/manage_events/forms.py @@ -31,7 +31,7 @@ class EventForm(forms.ModelForm): "category", "venue", "venue_capacity", - "video_url", + # "video_url", "entry_type", "entry_fee", "key_guest", @@ -57,7 +57,7 @@ class EventForm(forms.ModelForm): "to_time": forms.TimeInput(attrs={"class": "form-control", "type": "time"}), "venue_capacity": forms.NumberInput(attrs={"class": "form-control"}), "video_url": forms.URLInput(attrs={"class": "form-control"}), - "entry_type": forms.TextInput(attrs={"class": "form-control"}), + "entry_type": forms.Select(attrs={"class": "form-control"}), "entry_fee": forms.NumberInput(attrs={"class": "form-control"}), "key_guest": forms.Textarea(attrs={"class": "form-control", "rows": 3}), "age_group": forms.TextInput(attrs={"class": "form-control"}), diff --git a/manage_events/migrations/0011_alter_event_entry_type.py b/manage_events/migrations/0011_alter_event_entry_type.py new file mode 100644 index 0000000..f5b8390 --- /dev/null +++ b/manage_events/migrations/0011_alter_event_entry_type.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.2 on 2024-06-04 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("manage_events", "0010_event_social_media_shares_count_eventshare"), + ] + + operations = [ + migrations.AlterField( + model_name="event", + name="entry_type", + field=models.CharField( + choices=[("free", "Free"), ("paid", "Paid")], max_length=10 + ), + ), + ] diff --git a/manage_events/models.py b/manage_events/models.py index a961ab5..b9d122b 100644 --- a/manage_events/models.py +++ b/manage_events/models.py @@ -55,6 +55,10 @@ class EventMaster(BaseModel): class Event(BaseModel): + ENTRY_TYPE_CHOICES = [ + ("free", "Free"), + ("paid", "Paid"), + ] title = models.CharField(max_length=255) category = models.ForeignKey(EventCategory, on_delete=models.CASCADE) event_master = models.ForeignKey( @@ -74,9 +78,13 @@ class Event(BaseModel): venue_capacity = models.IntegerField() video_url = models.URLField(max_length=200, blank=True, null=True) + # entry_type = models.CharField( + # max_length=100 + # ) entry_type = models.CharField( - max_length=100 - ) # Assuming entry type is a string (e.g., Free, Ticketed) + max_length=10, + choices=ENTRY_TYPE_CHOICES, + ) entry_fee = models.DecimalField( max_digits=14, decimal_places=2, default=0.00 ) # Assuming it's an integer. Use DecimalField if you need to handle cents. diff --git a/manage_subscriptions/forms.py b/manage_subscriptions/forms.py index 3579fc4..064a35d 100644 --- a/manage_subscriptions/forms.py +++ b/manage_subscriptions/forms.py @@ -28,6 +28,8 @@ class SubscriptionForm(forms.ModelForm): # "image", "principal_types", "referral_percentage", + "active", + "deleted", ] # Include all fields you want from the model diff --git a/manage_subscriptions/views.py b/manage_subscriptions/views.py index 6420e25..480e4e0 100644 --- a/manage_subscriptions/views.py +++ b/manage_subscriptions/views.py @@ -386,7 +386,7 @@ class SubscriptionPageView(TemplateView): if request.user.is_authenticated: print("request.user: ", request.user) subscriptions = Subscription.objects.filter( - principal_types=request.user.principal_type + principal_types=request.user.principal_type, active=True, deleted=False ) if subscriptions.exists(): diff --git a/templates/manage_events/event_list.html b/templates/manage_events/event_list.html index 525db2b..bc3f027 100644 --- a/templates/manage_events/event_list.html +++ b/templates/manage_events/event_list.html @@ -21,7 +21,7 @@ Back --> - + Add Event Event Category