Merge development into master (#773)

* pls fix

* migration for total payment

* * Added total payment to ticket class
    - Displays total payment in ticket view
    - Calculated and stored upon confirmation that participant is ready to pay

* Calculate cost with chosen amount of given item

* add a search and select widget using django-select2 package

* add django-select2 to requirements.txt

---------

Co-authored-by: blyvil <[email protected]>
Co-authored-by: Marmingen <[email protected]>
Co-authored-by: Oskar Rick <[email protected]>

requirements.txt

@@ -38,3 +38,6 @@ django-jsonschema-form==1.0.3
 
 # Improved environment variable handling
 python-decouple==3.7
+
+# Search and select widget
+django-select2==8.1.1

src/events/migrations/0007_ticket_total_payment.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.17 on 2023-03-29 17:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0006_alter_event_raffle_has_been_held'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ticket',
+            name='total_payment',
+            field=models.FloatField(default=0, help_text='Price to be paid by participant(s)', verbose_name='Total payment'),
+        ),
+    ]

src/events/models/participant.py

@@ -48,10 +48,17 @@ def calculate_order_cost(self):
             cost += self.ticket.event.price_per_participant_nonmember
 
         for orderable in price_list.fields:
-            if self.order.get(orderable['Name']):
+            order = self.order.get(orderable['Name'])
+            if order:
                 if is_member:
-                    cost += orderable.get('Price', 0)
+                    if isinstance(order, int):
+                        cost += order * orderable.get('Non-member price', 0)
+                    else:
+                        cost += orderable.get('Price', 0)
                 else:
-                    cost += orderable.get('Non-member price', 0)
+                    if isinstance(order, int):
+                        cost += order * orderable.get('Non-member price', 0)
+                    else:
+                        cost += orderable.get('Non-member price', 0)
 
         return cost

src/events/models/ticket.py

@@ -7,14 +7,7 @@
 import events.models as event_models
 from members.models import Member
 
-
-class OwnerFieldPanel(FieldPanel):
-    def on_form_bound(self):
-        choices = self.model.get_owner_choices(self.model)
-        self.form.fields['owner'].queryset = choices
-        self.form.fields['owner'].empty_label = None
-        super().on_form_bound()
-
+from django_select2.forms import Select2Widget
 
 class Ticket(models.Model):
     """A ticket type determines what allows a user entry to an event"""
@@ -41,7 +34,8 @@ class Ticket(models.Model):
         help_text=_(
             'Dictates the number of participants '
             'in the ticket besides the ticket owner.'),
-        default=0)
+        default=0
+    )
 
     locked = models.BooleanField(
         default=False,
@@ -63,6 +57,12 @@ class Ticket(models.Model):
         default='unpaid',
     )
 
+    total_payment = models.FloatField(
+        verbose_name=('Total payment'),
+        help_text=('Price to be paid by participant(s)'),
+        default=0,
+    )
+
     class Meta:
         verbose_name = _('Ticket')
         verbose_name_plural = _('Tickets')
@@ -81,15 +81,13 @@ def __str__(self) -> str:
             str(self.event),
         )
 
-    def get_owner_choices(self):
-        return Member.objects.all().order_by('email')
-
 # ------ Administrator settings ------
     panels = [
-        OwnerFieldPanel('owner'),
+        FieldPanel('owner', widget=Select2Widget),
         FieldPanel('event'),
         FieldPanel('ticket_number'),
         FieldPanel('locked'),
+        FieldPanel('total_payment'),
         FieldPanel('payment_status'),
     ]
 

src/events/views/ticket_page.py

@@ -48,6 +48,9 @@ def my_ticket(request, event_pk):
                         instance.delete()
                     elif 'lock_for_payment' in request.POST:
                         ticket.locked = True
+                        ticket.total_payment = event.base_price + \
+                        sum([participant.calculate_order_cost()
+            for participant in queryset])
                         instance.save()
                     else:
                         cleaned_data = form.cleaned_data

src/events/wagtail_hooks.py

@@ -148,7 +148,7 @@ class TicketAdmin(ModelAdmin):
     menu_label = _('Tickets')
     menu_icon = 'fa-ticket'
     menu_order = 300
-    list_display = ['owner_person_nr', 'owner_email', 'event', 'ticket_number']
+    list_display = ['owner_person_nr', 'owner_email', 'event', 'ticket_number', 'total_payment']
     list_filter = ('event', 'payment_status')
     list_export = ('event', 'owner_person_nr', 'owner_email',
                    'ticket_number', 'payment_status')

src/moore/settings/base.py

@@ -68,6 +68,7 @@
     'wagtailcaptcha',
     'captcha',
     'jsonschemaform',
+    'django_select2', # Custom select2 widget
 
     'django.contrib.admin',  # Used for wagtail admin filters
     'django.contrib.auth',