Add new gift card to orderposition relationship (#3291)

src/pretix/control/forms/filter.py

@@ -1338,6 +1338,7 @@ class GiftCardFilterForm(FilterForm):
                 Q(secret__icontains=query)
                 | Q(transactions__text__icontains=query)
                 | Q(transactions__order__code__icontains=query)
+                | Q(owner_ticket__order__code__icontains=query)
             )
         if fdata.get('testmode') == 'yes':
             qs = qs.filter(testmode=True)

src/pretix/control/forms/organizer.py

@@ -186,6 +186,15 @@ class OrganizerUpdateForm(OrganizerForm):
         return instance
 
 
+class SafeOrderPositionChoiceField(forms.ModelChoiceField):
+    def __init__(self, queryset, **kwargs):
+        queryset = queryset.model.all.none()
+        super().__init__(queryset, **kwargs)
+
+    def label_from_instance(self, op):
+        return f'{op.order.code}-{op.positionid} ({str(op.item) + ((" - " + str(op.variation)) if op.variation else "")})'
+
+
 class EventMetaPropertyForm(forms.ModelForm):
     class Meta:
         model = EventMetaProperty
@@ -650,23 +659,32 @@ class GiftCardCreateForm(forms.ModelForm):
 class GiftCardUpdateForm(forms.ModelForm):
     class Meta:
         model = GiftCard
-        fields = ['expires', 'conditions']
+        fields = ['expires', 'conditions', 'owner_ticket']
         field_classes = {
-            'expires': SplitDateTimeField
+            'expires': SplitDateTimeField,
+            'owner_ticket': SafeOrderPositionChoiceField,
         }
         widgets = {
             'expires': SplitDateTimePickerWidget,
             'conditions': forms.Textarea(attrs={"rows": 2})
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        organizer = self.instance.issuer
 
-class SafeOrderPositionChoiceField(forms.ModelChoiceField):
-    def __init__(self, queryset, **kwargs):
-        queryset = queryset.model.all.none()
-        super().__init__(queryset, **kwargs)
-
-    def label_from_instance(self, op):
-        return f'{op.order.code}-{op.positionid} ({str(op.item) + ((" - " + str(op.variation)) if op.variation else "")})'
+        self.fields['owner_ticket'].queryset = OrderPosition.all.filter(order__event__organizer=organizer).all()
+        self.fields['owner_ticket'].widget = Select2(
+            attrs={
+                'data-model-select2': 'generic',
+                'data-select2-url': reverse('control:organizer.ticket_select2', kwargs={
+                    'organizer': organizer.slug,
+                }),
+                'data-placeholder': _('Ticket')
+            }
+        )
+        self.fields['owner_ticket'].widget.choices = self.fields['owner_ticket'].choices
+        self.fields['owner_ticket'].required = False
 
 
 class ReusableMediumUpdateForm(forms.ModelForm):

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -631,6 +631,12 @@
                             </div>
                             <div class="clearfix"></div>
                         </div>
+                        {% for gc in line.owned_gift_cards.all %}
+                            <div class="product-row-giftcard">
+                                <span class="fa fa-credit-card" aria-hidden="true"></span>
+                                <a href="{% url "control:organizer.giftcard" organizer=gc.issuer.slug giftcard=gc.pk %}">{{ gc.secret }}</a>
+                            </div>
+                        {% endfor %}
                     {% endfor %}
                     {% for fee in items.fees %}
                         <div class="row-fluid product-row {% if fee.canceled %}pos-canceled{% endif %}">

src/pretix/control/templates/pretixcontrol/organizers/giftcard.html

@@ -46,6 +46,14 @@
                                     {{ card.issued_in.order.full_code }}</a>-{{ card.issued_in.positionid }}
                             </dd>
                         {% endif %}
+                        {% if card.owner_ticket %}
+                            <dt>{% trans "Owned by ticket holder" %}</dt>
+                            <dd>
+                                <span class="fa fa-ticket fa-fw"></span>
+                                <a href="{% url "control:event.order" event=card.owner_ticket.order.event.slug organizer=request.organizer.slug code=card.owner_ticket.order.code %}">
+                                    {{ card.owner_ticket.order.code }}</a>-{{ card.owner_ticket.positionid }}
+                            </dd>
+                        {% endif %}
                     </dl>
                 </div>
             </div>

src/pretix/control/templates/pretixcontrol/organizers/giftcard_edit.html

@@ -14,6 +14,7 @@
         {% csrf_token %}
         {% bootstrap_form_errors form %}
         {% bootstrap_field form.expires layout="control" %}
+        {% bootstrap_field form.owner_ticket layout="control" %}
         {% bootstrap_field form.conditions layout="control" %}
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">

src/pretix/control/views/orders.py

@@ -367,7 +367,7 @@ class OrderDetail(OrderView):
             'item', 'variation', 'addon_to', 'tax_rule', 'used_membership', 'used_membership__membership_type',
             'discount',
         ).prefetch_related(
-            'item__questions', 'issued_gift_cards', 'linked_media',
+            'item__questions', 'issued_gift_cards', 'owned_gift_cards', 'linked_media',
             Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options').select_related('question')),
             Prefetch('all_checkins', queryset=Checkin.all.select_related('list').order_by('datetime')),
         ).order_by('positionid')

src/pretix/control/views/typeahead.py

@@ -210,7 +210,7 @@ def giftcard_select2(request, **kwargs):
     return JsonResponse(doc)
 
 
-@organizer_permission_required(("can_manage_reusable_media"))
+@organizer_permission_required(("can_manage_reusable_media", "can_manage_gift_cards"))
 def ticket_select2(request, **kwargs):
     query = request.GET.get('query', '')
     try: